From 0998091683df6074f13ca6599395d212596c3530 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:24:30 +0200 Subject: [PATCH 001/221] chore(main): Release plugins-source-gcp v5.5.0 (#6306) :robot: I have created a release *beep* *boop* --- ## [5.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.4.0...plugins-source-gcp-v5.5.0) (2023-01-05) ### Features * **gcp-resources:** Add Bigtable admin resources ([#6250](https://github.com/cloudquery/cloudquery/issues/6250)) ([3fedb35](https://github.com/cloudquery/cloudquery/commit/3fedb359492e2cec1d9e9347643f256bdaef2e5b)) * **gcp-resources:** Add Billing Budgets ([#6251](https://github.com/cloudquery/cloudquery/issues/6251)) ([8327d51](https://github.com/cloudquery/cloudquery/commit/8327d510634b0b8b335e330ee902ae71825aa4a7)) * **gcp-resources:** Add Binary Authorization ([#6309](https://github.com/cloudquery/cloudquery/issues/6309)) ([ff0713a](https://github.com/cloudquery/cloudquery/commit/ff0713ad97367f83105f1daf6ea08eabd970113c)) * **gcp-resources:** Add Certificate Manager ([#6311](https://github.com/cloudquery/cloudquery/issues/6311)) ([63a5681](https://github.com/cloudquery/cloudquery/commit/63a56814ee40cf389e004e5c4ca68b2415d9c4e1)) * **gcp-resources:** Add Cloud Deploy ([#6321](https://github.com/cloudquery/cloudquery/issues/6321)) ([154d1e9](https://github.com/cloudquery/cloudquery/commit/154d1e966d1a6b5fdca056d8835a8141b3f5e662)) * **gcp-resources:** Add Cloud IoT ([#6355](https://github.com/cloudquery/cloudquery/issues/6355)) ([28d6dcd](https://github.com/cloudquery/cloudquery/commit/28d6dcd24ed35586a98e0e50f4838dcc563abd2d)) * **gcp-resources:** Add Error Reporting ([#6326](https://github.com/cloudquery/cloudquery/issues/6326)) ([1fae862](https://github.com/cloudquery/cloudquery/commit/1fae8624c0ba1b40cb5ef19884bfb9f41e06e124)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/gcp/CHANGELOG.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b0472351a3da6b..14737fa6b53b54 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -9,7 +9,7 @@ "plugins/source/cloudflare+FILLER": "0.0.0", "plugins/source/digitalocean": "4.0.2", "plugins/source/digitalocean+FILLER": "0.0.0", - "plugins/source/gcp": "5.4.0", + "plugins/source/gcp": "5.5.0", "plugins/source/gcp+FILLER": "0.0.0", "plugins/source/github": "2.0.0", "plugins/source/github+FILLER": "0.0.0", diff --git a/plugins/source/gcp/CHANGELOG.md b/plugins/source/gcp/CHANGELOG.md index 4b45746f5bf849..ee515d9bede378 100644 --- a/plugins/source/gcp/CHANGELOG.md +++ b/plugins/source/gcp/CHANGELOG.md @@ -5,6 +5,27 @@ All notable changes to this provider will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.4.0...plugins-source-gcp-v5.5.0) (2023-01-05) + + +### Features + +* **gcp-resources:** Add Bigtable admin resources ([#6250](https://github.com/cloudquery/cloudquery/issues/6250)) ([3fedb35](https://github.com/cloudquery/cloudquery/commit/3fedb359492e2cec1d9e9347643f256bdaef2e5b)) +* **gcp-resources:** Add Billing Budgets ([#6251](https://github.com/cloudquery/cloudquery/issues/6251)) ([8327d51](https://github.com/cloudquery/cloudquery/commit/8327d510634b0b8b335e330ee902ae71825aa4a7)) +* **gcp-resources:** Add Binary Authorization ([#6309](https://github.com/cloudquery/cloudquery/issues/6309)) ([ff0713a](https://github.com/cloudquery/cloudquery/commit/ff0713ad97367f83105f1daf6ea08eabd970113c)) +* **gcp-resources:** Add Certificate Manager ([#6311](https://github.com/cloudquery/cloudquery/issues/6311)) ([63a5681](https://github.com/cloudquery/cloudquery/commit/63a56814ee40cf389e004e5c4ca68b2415d9c4e1)) +* **gcp-resources:** Add Cloud Deploy ([#6321](https://github.com/cloudquery/cloudquery/issues/6321)) ([154d1e9](https://github.com/cloudquery/cloudquery/commit/154d1e966d1a6b5fdca056d8835a8141b3f5e662)) +* **gcp-resources:** Add Cloud IoT ([#6355](https://github.com/cloudquery/cloudquery/issues/6355)) ([28d6dcd](https://github.com/cloudquery/cloudquery/commit/28d6dcd24ed35586a98e0e50f4838dcc563abd2d)) +* **gcp-resources:** Add Error Reporting ([#6326](https://github.com/cloudquery/cloudquery/issues/6326)) ([1fae862](https://github.com/cloudquery/cloudquery/commit/1fae8624c0ba1b40cb5ef19884bfb9f41e06e124)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) + ## [5.4.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.3.1...plugins-source-gcp-v5.4.0) (2023-01-03) From cab6e1e7e85ecf0aee19d6db4547261cdb7c9b19 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 5 Jan 2023 14:26:15 +0000 Subject: [PATCH 002/221] fix(bigquery): Migrations: ignore extra columns in the table (#6370) BigQuery migrations should not fail if there are extra columns present in the table. As long as the columns are not required, it should ignore those columns and add any extra ones required by CloudQuery table schemas. This allows users to add additional columns of their own, and it means that you can upgrade to a new minor version of a source plugin and roll back later without issues. This is tested in the new tests added in https://github.com/cloudquery/plugin-sdk/pull/574 - Fixes https://github.com/cloudquery/cloudquery/issues/6364 --- .../destination/bigquery/client/migrate.go | 85 ++++++++++++++++--- plugins/destination/bigquery/client/read.go | 10 ++- 2 files changed, 79 insertions(+), 16 deletions(-) diff --git a/plugins/destination/bigquery/client/migrate.go b/plugins/destination/bigquery/client/migrate.go index 39d01062ca41fb..1ca331f627c5b6 100644 --- a/plugins/destination/bigquery/client/migrate.go +++ b/plugins/destination/bigquery/client/migrate.go @@ -96,21 +96,14 @@ func (c *Client) waitForTableToExist(ctx context.Context, client *bigquery.Clien func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Client, table *schema.Table) error { c.logger.Debug().Str("table", table.Name).Msg("Waiting for schemas to match") wantSchema := c.bigQuerySchemaForTable(table) - want, err := wantSchema.ToJSONFields() - if err != nil { - return fmt.Errorf("failed to convert schema to JSON: %v", err) - } for i := 0; i < maxTableChecks; i++ { md, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Metadata(ctx) if err != nil { return err } - got, err := md.Schema.ToJSONFields() - if err != nil { - return fmt.Errorf("failed to convert schema to JSON: %v", err) - } - if string(got) == string(want) { - c.logger.Debug().Str("table", table.Name).Msg("Schemas matched") + haveSchema := md.Schema + if schemasMatch(haveSchema, wantSchema) { + c.logger.Debug().Str("table", table.Name).Msg("Schemas match") return nil } c.logger.Debug().Str("table", table.Name).Int("i", i).Msg("Waiting for schemas to match") @@ -120,14 +113,78 @@ func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Clie } func (c *Client) autoMigrateTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { - bqSchema := c.bigQuerySchemaForTable(table) + bqTable := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name) + md, err := bqTable.Metadata(ctx) + if err != nil { + return fmt.Errorf("failed to get table metadata: %w", err) + } + haveSchema := md.Schema + wantSchema := c.bigQuerySchemaForTable(table) + wantSchema, err = mergeSchemas(haveSchema, wantSchema) + if err != nil { + return fmt.Errorf("failed to migrate table schema: %w", err) + } tm := bigquery.TableMetadataToUpdate{ Name: table.Name, Description: table.Description, - Schema: bqSchema, + Schema: wantSchema, + } + _, err = bqTable.Update(ctx, tm, "") + if err != nil { + return fmt.Errorf("failed to update table schema: %w", err) + } + return nil +} + +func schemasMatch(haveSchema, wantSchema bigquery.Schema) bool { + // Schemas are considered a match if everything in the want schema is in the have schema, + // and they have the same types. + // We don't mind if there are extra fields in the have schema. + haveMap := make(map[string]*bigquery.FieldSchema) + for _, f := range haveSchema { + haveMap[f.Name] = f + } + for _, wf := range wantSchema { + if hf, ok := haveMap[wf.Name]; !ok { + return false + } else if hf.Type != wf.Type { + return false + } + } + return true +} + +// mergeSchemas merges the schema we want with the schema we have, to avoid +// losing any existing data +func mergeSchemas(haveSchema, wantSchema bigquery.Schema) (bigquery.Schema, error) { + haveMap := make(map[string]*bigquery.FieldSchema) + for _, f := range haveSchema { + haveMap[f.Name] = f + } + wantMap := make(map[string]*bigquery.FieldSchema) + for _, f := range wantSchema { + wantMap[f.Name] = f + } + merged := make(bigquery.Schema, 0, len(wantSchema)) + // keep everything in the schema we have, as long as the types didn't change + // or an unknown column isn't required + for _, f := range haveSchema { + if want, ok := wantMap[f.Name]; ok { + if want.Type != f.Type { + return nil, fmt.Errorf("field %v changed type from %v to %v", f.Name, f.Type, want.Type) + } + } else if f.Required { + return nil, fmt.Errorf("field %v is required but not in new schema", f.Name) + } + merged = append(merged, f) + } + // add anything new + for _, f := range wantSchema { + if _, ok := haveMap[f.Name]; !ok { + merged = append(merged, f) + } } - _, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Update(ctx, tm, "") - return err + return merged, nil } func (c *Client) createTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { diff --git a/plugins/destination/bigquery/client/read.go b/plugins/destination/bigquery/client/read.go index 3ce2b9995c0669..a362afe15a3477 100644 --- a/plugins/destination/bigquery/client/read.go +++ b/plugins/destination/bigquery/client/read.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "fmt" + "strings" "time" "cloud.google.com/go/bigquery" @@ -12,7 +13,7 @@ import ( ) const ( - readSQL = "SELECT * FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" + readSQL = "SELECT %s FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" ) func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { @@ -78,7 +79,12 @@ func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - stmt := fmt.Sprintf(readSQL, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, col.Name) + } + cols := "`" + strings.Join(colNames, "`, `") + "`" + stmt := fmt.Sprintf(readSQL, cols, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) q := c.client.Query(stmt) q.Parameters = []bigquery.QueryParameter{ { From 491941a0c165ee18ce96d71c2e6aecf3d7830d50 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 5 Jan 2023 14:28:53 +0000 Subject: [PATCH 003/221] fix(tests): Postgresql: Read only columns defined in the schema (#6371) The PostgreSQL read test should only read and return the columns defined in our schema. This will allow https://github.com/cloudquery/plugin-sdk/pull/574/files to pass. --- plugins/destination/postgresql/client/read.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/destination/postgresql/client/read.go b/plugins/destination/postgresql/client/read.go index fba1f6a02d624d..fa3b33e8fc2b8c 100644 --- a/plugins/destination/postgresql/client/read.go +++ b/plugins/destination/postgresql/client/read.go @@ -3,17 +3,23 @@ package client import ( "context" "fmt" + "strings" "github.com/cloudquery/plugin-sdk/schema" "github.com/jackc/pgx/v5" ) const ( - readSQL = "SELECT * FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" + readSQL = "SELECT %s FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" ) func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - sql := fmt.Sprintf(readSQL, pgx.Identifier{table.Name}.Sanitize()) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, pgx.Identifier{col.Name}.Sanitize()) + } + cols := strings.Join(colNames, ",") + sql := fmt.Sprintf(readSQL, cols, pgx.Identifier{table.Name}.Sanitize()) rows, err := c.conn.Query(ctx, sql, sourceName) if err != nil { return err From 5f8a1973482a3e9cfcd0b7cb4720f727731ba15e Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 5 Jan 2023 14:32:26 +0000 Subject: [PATCH 004/221] fix: Fix SQLite migration logic (#6372) There was a bug in the query that checks whether a table exists - it always found the table to not exist because `?` was being quoted. We also now select only the columns defined in the table schema, rather than all columns. This will allow https://github.com/cloudquery/plugin-sdk/pull/574/files to pass. --- plugins/destination/sqlite/client/migrate.go | 2 +- plugins/destination/sqlite/client/read.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/destination/sqlite/client/migrate.go b/plugins/destination/sqlite/client/migrate.go index 4aa55b7623c437..f7629ecca649b6 100644 --- a/plugins/destination/sqlite/client/migrate.go +++ b/plugins/destination/sqlite/client/migrate.go @@ -10,7 +10,7 @@ import ( ) const ( - isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name='?';" + isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name=?;" // https://wiki.postgresql.org/wiki/Retrieve_primary_key_columns sqlTableInfo = "PRAGMA table_info('%s');" diff --git a/plugins/destination/sqlite/client/read.go b/plugins/destination/sqlite/client/read.go index 7bf7712d589c8d..ba2fbf0a6a3bc0 100644 --- a/plugins/destination/sqlite/client/read.go +++ b/plugins/destination/sqlite/client/read.go @@ -4,12 +4,13 @@ import ( "context" "database/sql" "fmt" + "strings" "github.com/cloudquery/plugin-sdk/schema" ) const ( - readSQL = `SELECT * FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` + readSQL = `SELECT %s FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` ) func (*Client) createResultsArray(table *schema.Table) []any { @@ -73,7 +74,12 @@ func (*Client) createResultsArray(table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - rows, err := c.db.Query(fmt.Sprintf(readSQL, table.Name), sourceName) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, `"`+col.Name+`"`) + } + cols := strings.Join(colNames, ", ") + rows, err := c.db.Query(fmt.Sprintf(readSQL, cols, table.Name), sourceName) if err != nil { return err } From 0c334f539674a901703bb8ad499adf7a4bcf438e Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 5 Jan 2023 14:36:00 +0000 Subject: [PATCH 005/221] fix(tests): Fix Snowflake read test (#6373) This changes the Read query to only select the columns defined in the table schema, so that user-defined columns are ignored. Since Read is only used in tests, this only affects testing right now. This change should allow the new test in https://github.com/cloudquery/plugin-sdk/pull/574 to pass --- plugins/destination/snowflake/client/read.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/destination/snowflake/client/read.go b/plugins/destination/snowflake/client/read.go index 81a8da8149bc50..a517164c54d3c1 100644 --- a/plugins/destination/snowflake/client/read.go +++ b/plugins/destination/snowflake/client/read.go @@ -10,7 +10,7 @@ import ( ) const ( - readSQL = "SELECT * FROM %s WHERE \"_cq_source_name\" = ?" + readSQL = "SELECT %s FROM %s WHERE \"_cq_source_name\" = ?" ) // https://github.com/snowflakedb/gosnowflake/issues/674 @@ -98,7 +98,12 @@ func (*Client) createResultsArray(values []any, table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - stmt := fmt.Sprintf(readSQL, table.Name) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, `"`+col.Name+`"`) + } + cols := strings.Join(colNames, ", ") + stmt := fmt.Sprintf(readSQL, cols, table.Name) rows, err := c.db.Query(stmt, sourceName) if err != nil { return err From 19c84e02042f13c56002d3bc3936372083d0f772 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:37:22 +0200 Subject: [PATCH 006/221] chore: Update CLI version to v2.0.31 (#6378) Updates the CLI latest version to v2.0.31 --- website/versions/cli.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/cli.json b/website/versions/cli.json index 83277f324dd770..e22fbace607fe7 100644 --- a/website/versions/cli.json +++ b/website/versions/cli.json @@ -1 +1 @@ -{ "latest": "cli-v2.0.30" } +{ "latest": "cli-v2.0.31" } From 876cc163d6dff277bb09a5147162a8646fcd98de Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:41:32 +0200 Subject: [PATCH 007/221] chore: Update plugin `source-gcp` version to v5.5.0 (#6379) Updates the `source-gcp` plugin latest version to v5.5.0 --- website/versions/source-gcp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gcp.json b/website/versions/source-gcp.json index 36d0277035d0bb..1835a804c3ae08 100644 --- a/website/versions/source-gcp.json +++ b/website/versions/source-gcp.json @@ -1 +1 @@ -{ "latest": "plugins-source-gcp-v5.4.0" } +{ "latest": "plugins-source-gcp-v5.5.0" } From 5baea40d2aec4e807db839c928be2e037d572bef Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:17:53 +0200 Subject: [PATCH 008/221] fix(deps): Update module github.com/cloudquery/plugin-sdk to v1.21.0 (#6382) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/plugin-sdk](https://togithub.com/cloudquery/plugin-sdk) | require | minor | `v1.20.0` -> `v1.21.0` | --- ### Release Notes
cloudquery/plugin-sdk ### [`v1.21.0`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v1.21.0) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v1.20.0...v1.21.0) ##### Features - **testing:** Add test for migrations ([#​574](https://togithub.com/cloudquery/plugin-sdk/issues/574)) ([071a4e5](https://togithub.com/cloudquery/plugin-sdk/commit/071a4e5d4f91110345c69a1b787c4712ee2e7009))
--- ### 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/go.mod | 2 +- cli/go.sum | 4 +- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 +- .../destination/bigquery/client/migrate.go | 85 +++---------------- plugins/destination/bigquery/client/read.go | 10 +-- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 4 +- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 +- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 4 +- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 +- plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 4 +- plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/go.sum | 4 +- plugins/destination/postgresql/client/read.go | 10 +-- plugins/destination/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 4 +- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 +- plugins/destination/snowflake/client/read.go | 9 +- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 4 +- plugins/destination/sqlite/client/migrate.go | 2 +- plugins/destination/sqlite/client/read.go | 10 +-- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 4 +- plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 4 +- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 +- plugins/source/azure/go.mod | 2 +- plugins/source/azure/go.sum | 4 +- plugins/source/azuredevops/go.mod | 2 +- plugins/source/azuredevops/go.sum | 4 +- plugins/source/cloudflare/go.mod | 2 +- plugins/source/cloudflare/go.sum | 4 +- plugins/source/crowdstrike/go.mod | 2 +- plugins/source/crowdstrike/go.sum | 4 +- plugins/source/datadog/go.mod | 2 +- plugins/source/datadog/go.sum | 4 +- plugins/source/digitalocean/go.mod | 2 +- plugins/source/digitalocean/go.sum | 4 +- plugins/source/fastly/go.mod | 2 +- plugins/source/fastly/go.sum | 4 +- plugins/source/gandi/go.mod | 2 +- plugins/source/gandi/go.sum | 4 +- plugins/source/gcp/go.mod | 2 +- plugins/source/gcp/go.sum | 4 +- plugins/source/github/go.mod | 2 +- plugins/source/github/go.sum | 4 +- plugins/source/gitlab/go.mod | 2 +- plugins/source/gitlab/go.sum | 4 +- plugins/source/heroku/go.mod | 2 +- plugins/source/heroku/go.sum | 4 +- plugins/source/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 +- plugins/source/okta/go.mod | 2 +- plugins/source/okta/go.sum | 4 +- plugins/source/pagerduty/go.mod | 2 +- plugins/source/pagerduty/go.sum | 4 +- plugins/source/salesforce/go.mod | 2 +- plugins/source/salesforce/go.sum | 4 +- plugins/source/shopify/go.mod | 2 +- plugins/source/shopify/go.sum | 4 +- plugins/source/slack/go.mod | 2 +- plugins/source/slack/go.sum | 4 +- plugins/source/snyk/go.mod | 2 +- plugins/source/snyk/go.sum | 4 +- plugins/source/tailscale/go.mod | 2 +- plugins/source/tailscale/go.sum | 4 +- plugins/source/terraform/go.mod | 2 +- plugins/source/terraform/go.sum | 4 +- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 +- plugins/source/vercel/go.mod | 2 +- plugins/source/vercel/go.sum | 4 +- 80 files changed, 134 insertions(+), 214 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index df3da02e22ba8a..657340f5f00c6c 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/getsentry/sentry-go v0.16.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/cli/go.sum b/cli/go.sum index 402b02ef93c569..a5b484bca81a05 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,8 +1,8 @@ github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE= github.com/avast/retry-go/v4 v4.3.1/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index c4b2c30bc74b48..210f175cbc59e3 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 5da1e35c15b805..3a20bf32a5da95 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -52,8 +52,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/bigquery/client/migrate.go b/plugins/destination/bigquery/client/migrate.go index 1ca331f627c5b6..39d01062ca41fb 100644 --- a/plugins/destination/bigquery/client/migrate.go +++ b/plugins/destination/bigquery/client/migrate.go @@ -96,14 +96,21 @@ func (c *Client) waitForTableToExist(ctx context.Context, client *bigquery.Clien func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Client, table *schema.Table) error { c.logger.Debug().Str("table", table.Name).Msg("Waiting for schemas to match") wantSchema := c.bigQuerySchemaForTable(table) + want, err := wantSchema.ToJSONFields() + if err != nil { + return fmt.Errorf("failed to convert schema to JSON: %v", err) + } for i := 0; i < maxTableChecks; i++ { md, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Metadata(ctx) if err != nil { return err } - haveSchema := md.Schema - if schemasMatch(haveSchema, wantSchema) { - c.logger.Debug().Str("table", table.Name).Msg("Schemas match") + got, err := md.Schema.ToJSONFields() + if err != nil { + return fmt.Errorf("failed to convert schema to JSON: %v", err) + } + if string(got) == string(want) { + c.logger.Debug().Str("table", table.Name).Msg("Schemas matched") return nil } c.logger.Debug().Str("table", table.Name).Int("i", i).Msg("Waiting for schemas to match") @@ -113,78 +120,14 @@ func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Clie } func (c *Client) autoMigrateTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { - bqTable := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name) - md, err := bqTable.Metadata(ctx) - if err != nil { - return fmt.Errorf("failed to get table metadata: %w", err) - } - haveSchema := md.Schema - wantSchema := c.bigQuerySchemaForTable(table) - wantSchema, err = mergeSchemas(haveSchema, wantSchema) - if err != nil { - return fmt.Errorf("failed to migrate table schema: %w", err) - } + bqSchema := c.bigQuerySchemaForTable(table) tm := bigquery.TableMetadataToUpdate{ Name: table.Name, Description: table.Description, - Schema: wantSchema, - } - _, err = bqTable.Update(ctx, tm, "") - if err != nil { - return fmt.Errorf("failed to update table schema: %w", err) - } - return nil -} - -func schemasMatch(haveSchema, wantSchema bigquery.Schema) bool { - // Schemas are considered a match if everything in the want schema is in the have schema, - // and they have the same types. - // We don't mind if there are extra fields in the have schema. - haveMap := make(map[string]*bigquery.FieldSchema) - for _, f := range haveSchema { - haveMap[f.Name] = f - } - for _, wf := range wantSchema { - if hf, ok := haveMap[wf.Name]; !ok { - return false - } else if hf.Type != wf.Type { - return false - } - } - return true -} - -// mergeSchemas merges the schema we want with the schema we have, to avoid -// losing any existing data -func mergeSchemas(haveSchema, wantSchema bigquery.Schema) (bigquery.Schema, error) { - haveMap := make(map[string]*bigquery.FieldSchema) - for _, f := range haveSchema { - haveMap[f.Name] = f - } - wantMap := make(map[string]*bigquery.FieldSchema) - for _, f := range wantSchema { - wantMap[f.Name] = f - } - merged := make(bigquery.Schema, 0, len(wantSchema)) - // keep everything in the schema we have, as long as the types didn't change - // or an unknown column isn't required - for _, f := range haveSchema { - if want, ok := wantMap[f.Name]; ok { - if want.Type != f.Type { - return nil, fmt.Errorf("field %v changed type from %v to %v", f.Name, f.Type, want.Type) - } - } else if f.Required { - return nil, fmt.Errorf("field %v is required but not in new schema", f.Name) - } - merged = append(merged, f) - } - // add anything new - for _, f := range wantSchema { - if _, ok := haveMap[f.Name]; !ok { - merged = append(merged, f) - } + Schema: bqSchema, } - return merged, nil + _, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Update(ctx, tm, "") + return err } func (c *Client) createTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { diff --git a/plugins/destination/bigquery/client/read.go b/plugins/destination/bigquery/client/read.go index a362afe15a3477..3ce2b9995c0669 100644 --- a/plugins/destination/bigquery/client/read.go +++ b/plugins/destination/bigquery/client/read.go @@ -4,7 +4,6 @@ import ( "context" "database/sql" "fmt" - "strings" "time" "cloud.google.com/go/bigquery" @@ -13,7 +12,7 @@ import ( ) const ( - readSQL = "SELECT %s FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" + readSQL = "SELECT * FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" ) func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { @@ -79,12 +78,7 @@ func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - colNames := make([]string, 0, len(table.Columns)) - for _, col := range table.Columns { - colNames = append(colNames, col.Name) - } - cols := "`" + strings.Join(colNames, "`, `") + "`" - stmt := fmt.Sprintf(readSQL, cols, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) + stmt := fmt.Sprintf(readSQL, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) q := c.client.Query(stmt) q.Parameters = []bigquery.QueryParameter{ { diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index c5dc11b862a927..ea4ac4347d5501 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/rs/zerolog v1.28.0 golang.org/x/sync v0.1.0 google.golang.org/api v0.103.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 052cdfebed03a8..7dbca95224b2f9 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 5f85e2ad558b81..b4765ff43d44c3 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 69d0cd7327ff83..594bf75a92a852 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 50ca88cf7f845e..dc0c80c4da20fa 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 22764a71e39c3f..543b1242377e7d 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index a9b5f9121d5003..28b365f757ef30 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 145be1093d4deb..62518b018629bc 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -45,8 +45,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 9b7cba52dc2958..aa25a050603df4 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/rs/zerolog v1.28.0 go.mongodb.org/mongo-driver v1.11.1 ) diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 360757c181f188..3f643694ec10f7 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 7362f8b884cc21..dbc77b3c5eb709 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/neo4j/neo4j-go-driver/v5 v5.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 6831ec84a3355e..6044b27f692d70 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/postgresql/client/read.go b/plugins/destination/postgresql/client/read.go index fa3b33e8fc2b8c..fba1f6a02d624d 100644 --- a/plugins/destination/postgresql/client/read.go +++ b/plugins/destination/postgresql/client/read.go @@ -3,23 +3,17 @@ package client import ( "context" "fmt" - "strings" "github.com/cloudquery/plugin-sdk/schema" "github.com/jackc/pgx/v5" ) const ( - readSQL = "SELECT %s FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" + readSQL = "SELECT * FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" ) func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - colNames := make([]string, 0, len(table.Columns)) - for _, col := range table.Columns { - colNames = append(colNames, pgx.Identifier{col.Name}.Sanitize()) - } - cols := strings.Join(colNames, ",") - sql := fmt.Sprintf(readSQL, cols, pgx.Identifier{table.Name}.Sanitize()) + sql := fmt.Sprintf(readSQL, pgx.Identifier{table.Name}.Sanitize()) rows, err := c.conn.Query(ctx, sql, sourceName) if err != nil { return err diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 090d9d3f6ea8ed..487a9f0e79de13 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.18.0 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v5 v5.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 02e4f700ef21bc..f22b35a723a8e5 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.18.0 h1:8n78JWjqeunEaIT2WNTE/jMbAFvDxhX4f8TnwgUX48I= +github.com/cloudquery/plugin-sdk v1.18.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 565d0f5aef7d5f..30e805d0634025 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index d5c6a6f97f201f..52312a03bae68f 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -80,8 +80,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/snowflake/client/read.go b/plugins/destination/snowflake/client/read.go index a517164c54d3c1..81a8da8149bc50 100644 --- a/plugins/destination/snowflake/client/read.go +++ b/plugins/destination/snowflake/client/read.go @@ -10,7 +10,7 @@ import ( ) const ( - readSQL = "SELECT %s FROM %s WHERE \"_cq_source_name\" = ?" + readSQL = "SELECT * FROM %s WHERE \"_cq_source_name\" = ?" ) // https://github.com/snowflakedb/gosnowflake/issues/674 @@ -98,12 +98,7 @@ func (*Client) createResultsArray(values []any, table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - colNames := make([]string, 0, len(table.Columns)) - for _, col := range table.Columns { - colNames = append(colNames, `"`+col.Name+`"`) - } - cols := strings.Join(colNames, ", ") - stmt := fmt.Sprintf(readSQL, cols, table.Name) + stmt := fmt.Sprintf(readSQL, table.Name) rows, err := c.db.Query(stmt, sourceName) if err != nil { return err diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index e86dffc58d2fed..b20f19f31a5434 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/rs/zerolog v1.28.0 github.com/snowflakedb/gosnowflake v1.6.16 ) diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 39f2f3f9f4b3cc..c0a796f7f0a273 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -113,8 +113,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/sqlite/client/migrate.go b/plugins/destination/sqlite/client/migrate.go index f7629ecca649b6..4aa55b7623c437 100644 --- a/plugins/destination/sqlite/client/migrate.go +++ b/plugins/destination/sqlite/client/migrate.go @@ -10,7 +10,7 @@ import ( ) const ( - isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name=?;" + isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name='?';" // https://wiki.postgresql.org/wiki/Retrieve_primary_key_columns sqlTableInfo = "PRAGMA table_info('%s');" diff --git a/plugins/destination/sqlite/client/read.go b/plugins/destination/sqlite/client/read.go index ba2fbf0a6a3bc0..7bf7712d589c8d 100644 --- a/plugins/destination/sqlite/client/read.go +++ b/plugins/destination/sqlite/client/read.go @@ -4,13 +4,12 @@ import ( "context" "database/sql" "fmt" - "strings" "github.com/cloudquery/plugin-sdk/schema" ) const ( - readSQL = `SELECT %s FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` + readSQL = `SELECT * FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` ) func (*Client) createResultsArray(table *schema.Table) []any { @@ -74,12 +73,7 @@ func (*Client) createResultsArray(table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - colNames := make([]string, 0, len(table.Columns)) - for _, col := range table.Columns { - colNames = append(colNames, `"`+col.Name+`"`) - } - cols := strings.Join(colNames, ", ") - rows, err := c.db.Query(fmt.Sprintf(readSQL, cols, table.Name), sourceName) + rows, err := c.db.Query(fmt.Sprintf(readSQL, table.Name), sourceName) if err != nil { return err } diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 8ae98b21fdc1f3..f6b23c02969830 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index e6ab90373c5a9a..460b47ced520ea 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index d934f8159c15fd..c655fde940215a 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.19.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index 3189223a43f7ac..abeab45e886571 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= +github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2fd385a2d3ab29..30f99cf6011ef4 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/xray v1.15.3 github.com/aws/smithy-go v1.13.5 github.com/basgys/goxml2json v1.1.0 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index f737d24056d44b..52571b655c1505 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -270,8 +270,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azure/go.mod b/plugins/source/azure/go.mod index be3cdc4b7913ba..073b672e7be04f 100644 --- a/plugins/source/azure/go.mod +++ b/plugins/source/azure/go.mod @@ -96,7 +96,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsesu/armwindowsesu v0.5.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsiot/armwindowsiot v1.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/workloads/armworkloads v0.2.0 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gorilla/mux v1.8.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/azure/go.sum b/plugins/source/azure/go.sum index c5547589756c44..b9058d04ef5dab 100644 --- a/plugins/source/azure/go.sum +++ b/plugins/source/azure/go.sum @@ -231,8 +231,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azuredevops/go.mod b/plugins/source/azuredevops/go.mod index 2a3d4fa60f5619..87857c9e8f1707 100644 --- a/plugins/source/azuredevops/go.mod +++ b/plugins/source/azuredevops/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/azuredevops go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/iancoleman/strcase v0.2.0 github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1 diff --git a/plugins/source/azuredevops/go.sum b/plugins/source/azuredevops/go.sum index 3b3870a9b97745..239cdeb6d25bbf 100644 --- a/plugins/source/azuredevops/go.sum +++ b/plugins/source/azuredevops/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 068bde4b19e718..3bb60811b86a0e 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudflare/cloudflare-go v0.57.1 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index d0773c323e556d..421ed590fa0dd1 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.57.1 h1:c9OhL/WusagBirP+CIJeCqS7OjT9kiWjtJv4lwxp3ZM= github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVHwHqgXJofb1ya210GQ= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/crowdstrike/go.mod b/plugins/source/crowdstrike/go.mod index db99dc0a1ce950..1b2b0f5e3dc4f1 100644 --- a/plugins/source/crowdstrike/go.mod +++ b/plugins/source/crowdstrike/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/crowdstrike go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/crowdstrike/gofalcon v0.2.32 github.com/go-openapi/runtime v0.25.0 github.com/golang/mock v1.6.0 diff --git a/plugins/source/crowdstrike/go.sum b/plugins/source/crowdstrike/go.sum index 1f6b691f80101d..629a8cf2246fee 100644 --- a/plugins/source/crowdstrike/go.sum +++ b/plugins/source/crowdstrike/go.sum @@ -74,8 +74,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index e8e9e90286e494..21dc031adb4a55 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-api-client-go/v2 v2.6.1 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 6e8e0161e8c025..de9c528c0be9d5 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index e651339305f2f9..cc530bd7aedaa7 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.7 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/aws/smithy-go v1.13.5 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/digitalocean/godo v1.93.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 2cc35f8af400a0..44cf49add86b2a 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -77,8 +77,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/fastly/go.mod b/plugins/source/fastly/go.mod index b01fca807b01a3..8ba4e683857fc0 100644 --- a/plugins/source/fastly/go.mod +++ b/plugins/source/fastly/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/fastly go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/fastly/go-fastly/v7 v7.0.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/fastly/go.sum b/plugins/source/fastly/go.sum index 288d2db09e035b..363f19540e57d8 100644 --- a/plugins/source/fastly/go.sum +++ b/plugins/source/fastly/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gandi/go.mod b/plugins/source/gandi/go.mod index 0270f460080c7c..d947dec707fd6c 100644 --- a/plugins/source/gandi/go.mod +++ b/plugins/source/gandi/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gandi go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/go-gandi/go-gandi v0.5.1-0.20221118201059-f69b292fa399 github.com/golang/mock v1.6.0 diff --git a/plugins/source/gandi/go.sum b/plugins/source/gandi/go.sum index f957d3ce7a5f5f..5df56db7b03200 100644 --- a/plugins/source/gandi/go.sum +++ b/plugins/source/gandi/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gcp/go.mod b/plugins/source/gcp/go.mod index a9dd7208c8aa28..6ad4f25c4d981d 100644 --- a/plugins/source/gcp/go.mod +++ b/plugins/source/gcp/go.mod @@ -34,7 +34,7 @@ require ( cloud.google.com/go/secretmanager v1.9.0 cloud.google.com/go/serviceusage v1.4.0 cloud.google.com/go/storage v1.28.0 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/googleapis/gax-go/v2 v2.7.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 diff --git a/plugins/source/gcp/go.sum b/plugins/source/gcp/go.sum index 90284d75924089..f7ffb4baeae93e 100644 --- a/plugins/source/gcp/go.sum +++ b/plugins/source/gcp/go.sum @@ -110,8 +110,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index 21933443f1062a..bce217c0303beb 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/github go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/google/go-github/v48 v48.2.0 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 9602aa50d5cc2b..007a183a24bd9a 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index eba31959e6fba5..401fb4263100d8 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gitlab go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index c1bb2b818423c3..441908f917b1b7 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/heroku/go.mod b/plugins/source/heroku/go.mod index 21a83a9964020a..a80a6f65c33857 100644 --- a/plugins/source/heroku/go.mod +++ b/plugins/source/heroku/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/heroku go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/go-cmp v0.5.9 github.com/googleapis/gax-go/v2 v2.7.0 github.com/heroku/heroku-go/v5 v5.5.0 diff --git a/plugins/source/heroku/go.sum b/plugins/source/heroku/go.sum index b0b07fac9f4a9d..e760076d09bbe3 100644 --- a/plugins/source/heroku/go.sum +++ b/plugins/source/heroku/go.sum @@ -49,8 +49,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 85b7ff81d63bb6..ea2755314334c8 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/k8s go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/google/gnostic v0.6.9 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 2fd9f68fd1b7b4..9e29ae0d1d1300 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index c38bede6b85707..0670cb9712168f 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/okta go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.1 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 5599be1029839e..04311bf752b2a1 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index d654aae8b47b9c..89241afe4423e9 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/PagerDuty/go-pagerduty v1.6.0 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 274bde8b52a165..62154630513986 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/salesforce/go.mod b/plugins/source/salesforce/go.mod index b5603444311636..84051836756252 100644 --- a/plugins/source/salesforce/go.mod +++ b/plugins/source/salesforce/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/salesforce go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/salesforce/go.sum b/plugins/source/salesforce/go.sum index e324ea66ef9a92..b9c4cd22345483 100644 --- a/plugins/source/salesforce/go.sum +++ b/plugins/source/salesforce/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/shopify/go.mod b/plugins/source/shopify/go.mod index 3063d411003dee..0d81ff276ddc29 100644 --- a/plugins/source/shopify/go.mod +++ b/plugins/source/shopify/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/shopify go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/shopify/go.sum b/plugins/source/shopify/go.sum index 6384ac43cad8e3..d6d4b76941cb8f 100644 --- a/plugins/source/shopify/go.sum +++ b/plugins/source/shopify/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/slack/go.mod b/plugins/source/slack/go.mod index 0aee3d5f1c394f..8e422d15d16ec4 100644 --- a/plugins/source/slack/go.mod +++ b/plugins/source/slack/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/slack go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/slack/go.sum b/plugins/source/slack/go.sum index a1b07f19cc6cbf..e55ccc47c78037 100644 --- a/plugins/source/slack/go.sum +++ b/plugins/source/slack/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/snyk/go.mod b/plugins/source/snyk/go.mod index 550c805781b1f7..f40d1c4696663a 100644 --- a/plugins/source/snyk/go.mod +++ b/plugins/source/snyk/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/snyk go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 diff --git a/plugins/source/snyk/go.sum b/plugins/source/snyk/go.sum index 906366e1781029..82dba464cdc1f9 100644 --- a/plugins/source/snyk/go.sum +++ b/plugins/source/snyk/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cloudquery/snyk-sdk-go v0.1.0 h1:lJ/3EhLwUAdcR/sukSA+EzAnRE1jRRxm8ewLESCNW5Q= github.com/cloudquery/snyk-sdk-go v0.1.0/go.mod h1:LRL1TRuuM925gnyGp54WtS9p8S4yJMd0oS4JpLg+n7Y= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/source/tailscale/go.mod b/plugins/source/tailscale/go.mod index 583996ef56f9e6..3af42d45b5fe0e 100644 --- a/plugins/source/tailscale/go.mod +++ b/plugins/source/tailscale/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/tailscale go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/tailscale/go.sum b/plugins/source/tailscale/go.sum index 4b0dca00386b57..1e85e5221a436f 100644 --- a/plugins/source/tailscale/go.sum +++ b/plugins/source/tailscale/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 00776c50283317..329b7b642ee36b 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index 364ec19105a691..d79e4800455bbb 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -78,8 +78,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index f6c9e70859d62a..7dec16b1c146af 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 3189223a43f7ac..9fc1c38d6009d0 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/vercel/go.mod b/plugins/source/vercel/go.mod index 1a95c673a26f2f..5a1704b99d2cf9 100644 --- a/plugins/source/vercel/go.mod +++ b/plugins/source/vercel/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/vercel go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.20.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/vercel/go.sum b/plugins/source/vercel/go.sum index 89bbcd98b7726c..fb5576ac1d394a 100644 --- a/plugins/source/vercel/go.sum +++ b/plugins/source/vercel/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.20.0 h1:hp6F/TrQWY5qpKDfEgsk2RZyaeynBhMiCj9QdAQuDos= -github.com/cloudquery/plugin-sdk v1.20.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From d78d2ae0bd5c500692114177d835a60db3ab1985 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 20:33:45 +0200 Subject: [PATCH 009/221] chore(main): Release plugins-destination-bigquery v2.0.2 (#6342) :robot: I have created a release *beep* *boop* --- ## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.1...plugins-destination-bigquery-v2.0.2) (2023-01-05) ### Bug Fixes * **bigquery:** Migrations: ignore extra columns in the table ([#6370](https://github.com/cloudquery/cloudquery/issues/6370)) ([cab6e1e](https://github.com/cloudquery/cloudquery/commit/cab6e1e7e85ecf0aee19d6db4547261cdb7c9b19)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/destination/bigquery/CHANGELOG.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 14737fa6b53b54..6b6585159e6167 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -37,7 +37,7 @@ "plugins/source/gandi+FILLER": "0.0.0", "plugins/source/datadog": "1.0.5", "plugins/source/datadog+FILLER": "0.0.0", - "plugins/destination/bigquery": "2.0.1", + "plugins/destination/bigquery": "2.0.2", "plugins/destination/bigquery+FILLER": "0.0.0", "plugins/source/tailscale": "1.1.0", "plugins/source/tailscale+FILLER": "0.0.0", diff --git a/plugins/destination/bigquery/CHANGELOG.md b/plugins/destination/bigquery/CHANGELOG.md index 0819130ed2c75b..db193784ef07d9 100644 --- a/plugins/destination/bigquery/CHANGELOG.md +++ b/plugins/destination/bigquery/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.1...plugins-destination-bigquery-v2.0.2) (2023-01-05) + + +### Bug Fixes + +* **bigquery:** Migrations: ignore extra columns in the table ([#6370](https://github.com/cloudquery/cloudquery/issues/6370)) ([cab6e1e](https://github.com/cloudquery/cloudquery/commit/cab6e1e7e85ecf0aee19d6db4547261cdb7c9b19)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) + ## [2.0.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.0...plugins-destination-bigquery-v2.0.1) (2023-01-03) From 992cc00d9f07b33c37c950452e8068d155f39c9e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 5 Jan 2023 20:38:57 +0200 Subject: [PATCH 010/221] chore: Update plugin `destination-bigquery` version to v2.0.2 (#6389) Updates the `destination-bigquery` plugin latest version to v2.0.2 --- website/versions/destination-bigquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-bigquery.json b/website/versions/destination-bigquery.json index c6a16512a9d4db..3397240702f756 100644 --- a/website/versions/destination-bigquery.json +++ b/website/versions/destination-bigquery.json @@ -1 +1 @@ -{ "latest": "plugins-destination-bigquery-v2.0.1" } +{ "latest": "plugins-destination-bigquery-v2.0.2" } From 11073d20c212c65e88d031dc20386da0eb614d8c Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 5 Jan 2023 18:42:46 +0000 Subject: [PATCH 011/221] chore(docs): Add docs about scheduler option and document round-robin (#6383) --- .../advanced-topics/performance-tuning.md | 29 +++++++++++++++++-- website/pages/docs/reference/source-spec.md | 6 ++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/website/pages/docs/advanced-topics/performance-tuning.md b/website/pages/docs/advanced-topics/performance-tuning.md index 36a2ea66e3c5a1..0ab8cbcea6e643 100644 --- a/website/pages/docs/advanced-topics/performance-tuning.md +++ b/website/pages/docs/advanced-topics/performance-tuning.md @@ -6,7 +6,32 @@ title: Performance Tuning This page contains a number of tips and tricks for improving the performance of `cloudquery sync` for large cloud estates. -## Wildcard Matching +## Tune Concurrency + +The `concurrency` setting, available for all source plugins as part of the [source spec](/docs/reference/source-spec#concurrency), controls the approximate number of concurrent requests that will be made while performing a sync. Setting this to a low number will reduce the number of concurrent requests, reducing the memory used and making the sync less likely to hit rate limits. The trade-off is that syncs will take longer to complete. + +## Use a Different Scheduler + +By default, CloudQuery syncs will fetch all tables in parallel, writing data to the destination(s) as they come in. However, the `concurrency` setting, mentioned above, places a limit on how many **table-clients** can be synced at a time. What "table-client" means depends on the source plugin and the table. In AWS, for example, a client is usually a combination of account and region. Get all the combinations of accounts and regions for all tables, and you have all the table-clients for a sync. For the GCP source plugin, clients generally map to projects. + +The default CloudQuery scheduler, known as `dfs`, will sync up to `concurrency / 100` table-clients at a time (we are ignoring child relations for the purposes of this discussion). Let's take an example GCP cloud estate with 5000 projects, syncing 100 tables. This makes for approximately 500,000 table-client pairs, and a concurrency of 10,000 will allow 100 table-client pairs to be synced at a time. The `dfs` scheduler will start with the first table and its first 100 projects, and then move on to finish all projects for that table before moving on to the next table. This means, in practice, only one table is really being synced at a time! + +Usually this works out fine, as long as the cloud platform's rate limits are aligned with the clients. But if rate limits are applied per-table, rather than per-project, `dfs` can be suboptimal. A better strategy in this case would be to choose the first client for every table before moving on to the next client. This is what the `round-robin` scheduler does. Note that this scheduler is currently **experimental**. + +The following example config enables `round-robin` scheduling for the GCP source plugin, with a concurrency of 100000: + +```yaml +kind: source +spec: + name: "gcp" + path: "cloudquery/gcp" + version: "VERSION_SOURCE_GCP" + destinations: ["postgresql"] + concurrency: 100000 + scheduler: "round-robin" # experimental +``` + +## Use Wildcard Matching import { Callout } from 'nextra-theme-docs' @@ -34,7 +59,7 @@ The CloudQuery CLI will warn if a wildcard pattern does not match any known tabl -## Improving Performance by Skipping Relations +## Improve Performance by Skipping Relations Some tables require many API calls to sync. This is especially true of tables that depend on other tables, because often multiple API calls need to be made for every row in the parent table. This can lead to thousands of API calls, increasing the time it takes to sync. If you know that some child tables are not strictly necessary, you can improve sync performance by skipping them with the `skip_tables` setting. diff --git a/website/pages/docs/reference/source-spec.md b/website/pages/docs/reference/source-spec.md index 7ec8e4e189c284..34716df2b357b7 100644 --- a/website/pages/docs/reference/source-spec.md +++ b/website/pages/docs/reference/source-spec.md @@ -78,6 +78,12 @@ Specify the names of the destinations to sync the data of the source plugin to. A best effort maximum number of Go routines to use. Lower this number to reduce memory usage. +### scheduler + +(`string`, optional, default: `dfs`, introduced in CLI `v2.0.31`, **EXPERIMENTAL**) + +The scheduler to use when determining the priority of resources to sync. Currently, the only supported values are `dfs` (depth-first search) and `round-robin`. This is an experimental feature, and may be removed in the future. For more information about this, see [performance tuning](/docs/advanced-topics/performance-tuning). + ### spec (`object`, optional) From ffba44f1318eb401d2b7ce2fa91c155d8925d90d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 02:35:58 +0200 Subject: [PATCH 012/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/config to v1.18.8 (#6393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.18.7` -> `v1.18.8` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.8`](https://togithub.com/aws/aws-sdk-go-v2/compare/config/v1.18.7...config/v1.18.8) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/config/v1.18.7...config/v1.18.8)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/s3/go.mod | 10 +++++----- plugins/destination/s3/go.sum | 15 ++++++++++----- plugins/source/aws/go.mod | 10 +++++----- plugins/source/aws/go.sum | 15 ++++++++++----- plugins/source/digitalocean/go.mod | 10 +++++----- plugins/source/digitalocean/go.sum | 20 ++++++++++---------- plugins/source/terraform/go.mod | 10 +++++----- plugins/source/terraform/go.sum | 15 ++++++++++----- 8 files changed, 60 insertions(+), 45 deletions(-) diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 30e805d0634025..95033393faabb6 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.17.3 - github.com/aws/aws-sdk-go-v2/config v1.18.7 + github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/cloudquery/filetypes v1.0.2 @@ -15,7 +15,7 @@ require ( require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect @@ -25,9 +25,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/getsentry/sentry-go v0.16.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 52312a03bae68f..672fcd31806ff2 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -38,10 +38,12 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7 h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E= github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7 h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck= +github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= +github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= @@ -64,12 +66,15 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrO github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA= github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 30f99cf6011ef4..434c2946f482a5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.17.3 - github.com/aws/aws-sdk-go-v2/config v1.18.7 - github.com/aws/aws-sdk-go-v2/credentials v1.13.7 + github.com/aws/aws-sdk-go-v2/config v1.18.8 + github.com/aws/aws-sdk-go-v2/credentials v1.13.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.2 github.com/aws/aws-sdk-go-v2/service/account v1.7.13 @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17 github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.16 - github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 + github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.14.8 github.com/aws/aws-sdk-go-v2/service/waf v1.11.21 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.23.4 @@ -112,7 +112,7 @@ require ( require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect github.com/bitly/go-simplejson v0.5.0 // indirect github.com/getsentry/sentry-go v0.16.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect @@ -138,7 +138,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect github.com/aws/aws-sdk-go-v2/service/shield v1.17.13 - github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect github.com/aws/aws-sdk-go-v2/service/transfer v1.27.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.12.22 github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 52571b655c1505..2a3b9d9bd87805 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -38,10 +38,12 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7 h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E= github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7 h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck= +github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= +github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= @@ -236,14 +238,17 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17 h1:bTr3F70BsgeJZW5QU0O4pVapJbg github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17/go.mod h1:jQhN5f4p3PALMNlUtfb/0wGIFlV7vGtJlPDVfxfNfPY= github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0 h1:uAUjT+Np+B5sWwpcGd3V9xpBwEid8qYYfgmg0CsWTNM= github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0/go.mod h1:Hf7wSogKP1XCJ9GgW8erZDL6IZ1NLwLN7bYdV/Gn/LI= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA= github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.16 h1:l6aWoI8UnGII7yPEHdvAF84O0upQxPum6TFycIYtKkE= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.16/go.mod h1:xH7hHxhm765Db3QuS51w9DNgN3iMpcth0o1mMmYh6eY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.14.8 h1:1FPvcg1m3K7bip7WLscELLF4RKZR0Ys1iUbomhtDYJY= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.14.8/go.mod h1:CrQFb3Pn8vnj3GDpjKlv9ANunOJx75Km6JkP6pxc2b8= github.com/aws/aws-sdk-go-v2/service/transfer v1.27.0 h1:E8EpFslyukXM9gQAmmiJC8lvlGWbzPmzZv69FLv9UBg= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index cc530bd7aedaa7..6a9a53017f9870 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/avast/retry-go/v4 v4.3.1 github.com/aws/aws-sdk-go-v2 v1.17.3 - github.com/aws/aws-sdk-go-v2/config v1.18.7 + github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/aws/smithy-go v1.13.5 github.com/cloudquery/plugin-sdk v1.21.0 @@ -19,7 +19,7 @@ require ( require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect @@ -29,9 +29,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 // indirect github.com/getsentry/sentry-go v0.16.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 44cf49add86b2a..d836edc8259eda 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -39,10 +39,10 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7 h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E= -github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7 h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= +github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= +github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= @@ -63,12 +63,12 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrO github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 329b7b642ee36b..14e1be6ec2630a 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.17.3 - github.com/aws/aws-sdk-go-v2/config v1.18.7 - github.com/aws/aws-sdk-go-v2/credentials v1.13.7 + github.com/aws/aws-sdk-go-v2/config v1.18.8 + github.com/aws/aws-sdk-go-v2/credentials v1.13.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 - github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 + github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 @@ -25,8 +25,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/getsentry/sentry-go v0.16.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index d79e4800455bbb..b0e53f301e0fa4 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -38,10 +38,12 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7 h1:V94lTcix6jouwmAsgQMAEBozVAGJMFhVj+6/++xfe3E= github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7 h1:qUUcNS5Z1092XBFT66IJM7mYkMwgZ8fcC8YDIbEwXck= +github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= +github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= @@ -64,12 +66,15 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrO github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28 h1:gItLq3zBYyRDPmqAClgzTH8PBjDQGeyptYGHIwtYYNA= github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11 h1:KCacyVSs/wlcPGx37hcbT3IGYO8P8Jx+TgSDhAXtQMY= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7 h1:9Mtq1KM6nD8/+HStvWcvYnixJ5N85DX+P+OY3kI3W2k= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= From f19a34cc0fa7897379d3d7e80432b26a0ad73f9e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 03:02:19 +0200 Subject: [PATCH 013/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/accessanalyzer to v1.19.0 (#6396) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/accessanalyzer](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.2` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/accessanalyzer/v1.18.2...service/accessanalyzer/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/accessanalyzer/v1.18.2...service/accessanalyzer/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 434c2946f482a5..366d0c526acb52 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/credentials v1.13.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.2 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 github.com/aws/aws-sdk-go-v2/service/account v1.7.13 github.com/aws/aws-sdk-go-v2/service/acm v1.16.5 github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2a3b9d9bd87805..4e194fed8686e3 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -56,8 +56,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 h1:KeTxcGdNnQudb46oOl4d90f2I33 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 h1:H/mF2LNWwX00lD6FlYfKpLLZgUW7oIzCBkig78x4Xok= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18/go.mod h1:T2Ku+STrYQ1zIkL1wMvj8P3wWQaaCMKNdz70MT2FLfE= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.2 h1:haR6P2pCAJ63bApOWlrL8JNUFRbedS0+N2qp/OZSD90= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.2/go.mod h1:4HIMZDtg3VxhzthCkA4i42VihH58ORUO/O9BNMN9+Bo= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 h1:1F8zUy/DB/jYbV7+Vr/a1bTtK6X6XtQE4qAGcvH2Sew= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0/go.mod h1:4HIMZDtg3VxhzthCkA4i42VihH58ORUO/O9BNMN9+Bo= github.com/aws/aws-sdk-go-v2/service/account v1.7.13 h1:FsQ+ZcQ/XDyDOZEEtZk7fargzverqqGi/tjY0eiVfMQ= github.com/aws/aws-sdk-go-v2/service/account v1.7.13/go.mod h1:X9I4bZToo2mokeLkZsZA4deP7KEmr2+BpchQNff39hU= github.com/aws/aws-sdk-go-v2/service/acm v1.16.5 h1:soL2O7WWjedCgm5olvSkhl5n/l//lqJfrqf7Yw9ODI0= From f59f6bda99e6fce0209d106db7b6389d9ec21700 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 03:25:18 +0200 Subject: [PATCH 014/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/acm to v1.17.0 (#6398) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/acm](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.5` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.5...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.5...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 366d0c526acb52..378ddc90fa11bc 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 github.com/aws/aws-sdk-go-v2/service/account v1.7.13 - github.com/aws/aws-sdk-go-v2/service/acm v1.16.5 + github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.28 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 4e194fed8686e3..2e65115fa745ed 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -60,8 +60,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 h1:1F8zUy/DB/jYbV7+V github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0/go.mod h1:4HIMZDtg3VxhzthCkA4i42VihH58ORUO/O9BNMN9+Bo= github.com/aws/aws-sdk-go-v2/service/account v1.7.13 h1:FsQ+ZcQ/XDyDOZEEtZk7fargzverqqGi/tjY0eiVfMQ= github.com/aws/aws-sdk-go-v2/service/account v1.7.13/go.mod h1:X9I4bZToo2mokeLkZsZA4deP7KEmr2+BpchQNff39hU= -github.com/aws/aws-sdk-go-v2/service/acm v1.16.5 h1:soL2O7WWjedCgm5olvSkhl5n/l//lqJfrqf7Yw9ODI0= -github.com/aws/aws-sdk-go-v2/service/acm v1.16.5/go.mod h1:Wa9L0MGV8nzgqv0cvS0ju7hqEDv+yGikspSXVBUpnJQ= +github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 h1:LRNV4MYo3nJFUkfc088Eb5/AH/oUYrFuww+0XaDqk5o= +github.com/aws/aws-sdk-go-v2/service/acm v1.17.0/go.mod h1:Wa9L0MGV8nzgqv0cvS0ju7hqEDv+yGikspSXVBUpnJQ= github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 h1:qdr0dkHrVADizKxgkynGoNGRr9Bn77ECjkhF7v6EF+Y= github.com/aws/aws-sdk-go-v2/service/amp v1.15.9/go.mod h1:1h/HEqqBDBtTr+J2KuZCl8XtwpZzBoiQXma3WaOKYKk= github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.28 h1:tzsVFhPi6VCp8eaY2BoYbaWsthrNIya2VyD28Bj2v7s= From 4570f15b08f46c6a2b3e8b258bb17abb2a8b688f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 03:42:19 +0200 Subject: [PATCH 015/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/apigateway to v1.16.0 (#6400) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/apigateway](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.28` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/amp/v1.15.9...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/apigateway/v1.15.28...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 378ddc90fa11bc..3bc7d5c86665fd 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -11,7 +11,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.7.13 github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.28 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.16.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2e65115fa745ed..0274674b1d8d12 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -64,8 +64,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 h1:LRNV4MYo3nJFUkfc088Eb5/AH/oU github.com/aws/aws-sdk-go-v2/service/acm v1.17.0/go.mod h1:Wa9L0MGV8nzgqv0cvS0ju7hqEDv+yGikspSXVBUpnJQ= github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 h1:qdr0dkHrVADizKxgkynGoNGRr9Bn77ECjkhF7v6EF+Y= github.com/aws/aws-sdk-go-v2/service/amp v1.15.9/go.mod h1:1h/HEqqBDBtTr+J2KuZCl8XtwpZzBoiQXma3WaOKYKk= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.28 h1:tzsVFhPi6VCp8eaY2BoYbaWsthrNIya2VyD28Bj2v7s= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.28/go.mod h1:6UIKOkbI/NjVEszKrlgWDrlEPkpd2X+BBrzj0N/XTM4= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 h1:INMBcLcEY29u2ZHMnva693HZNCwzO6v42d92HOCk5DA= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0/go.mod h1:6UIKOkbI/NjVEszKrlgWDrlEPkpd2X+BBrzj0N/XTM4= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 h1:Q2fPOHnGq3xnBarRAq6x+lvmY7XdHAMg65Jr9aThX8A= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25/go.mod h1:Pyu5xH3gZR/XjaroZL9CF3aBMiYkn+fyZ+Rr0TNUp7I= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.16.0 h1:ydt3AquMx5Nb6fgp6kp98yARQkf8qdii3zKSkOx8DJk= From 5c239ed5b1294aa1356e45fcc74382eaad970a0c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 03:58:54 +0200 Subject: [PATCH 016/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.17.0 (#6402) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/applicationautoscaling](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.0` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.0...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.0...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 3bc7d5c86665fd..a37d2e4eff5b6e 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -13,7 +13,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.16.0 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.18.3 github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0274674b1d8d12..b993a9f29cf577 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -68,8 +68,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 h1:INMBcLcEY29u2ZHMnva69 github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0/go.mod h1:6UIKOkbI/NjVEszKrlgWDrlEPkpd2X+BBrzj0N/XTM4= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 h1:Q2fPOHnGq3xnBarRAq6x+lvmY7XdHAMg65Jr9aThX8A= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25/go.mod h1:Pyu5xH3gZR/XjaroZL9CF3aBMiYkn+fyZ+Rr0TNUp7I= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.16.0 h1:ydt3AquMx5Nb6fgp6kp98yARQkf8qdii3zKSkOx8DJk= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.16.0/go.mod h1:oqEDtKHiPWc+ALMoT40ACfUPspOT0Rl5+NhyXTwWokE= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 h1:m+ust0oz1uaZq/NV21yn+tuTqGYyGeghWoxd4fYsfEE= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0/go.mod h1:oqEDtKHiPWc+ALMoT40ACfUPspOT0Rl5+NhyXTwWokE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 h1:AEn+xJPNHYUZrhzpgBtld2IeLJQzk8Hw51Kd6ZI7Zf4= github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2/go.mod h1:SZzq5PuLlmDBHFMf5Fvlq5nDWdfQI4H5o4gSWnN2wFk= github.com/aws/aws-sdk-go-v2/service/appstream v1.18.3 h1:HHCGjUom8ccK5jcvNKWr58OvPlVG9sTcIteqUDheulc= From 1cd08e1591674c78ce3f688bd8b601ba4994cd96 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 04:18:59 +0200 Subject: [PATCH 017/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/appstream to v1.19.0 (#6404) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/appstream](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.3` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/appstream/v1.18.3...service/appstream/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/appstream/v1.18.3...service/appstream/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index a37d2e4eff5b6e..86891daa3c091d 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 - github.com/aws/aws-sdk-go-v2/service/appstream v1.18.3 + github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index b993a9f29cf577..d022bad81f5ed8 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -72,8 +72,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 h1:m+ust0oz1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0/go.mod h1:oqEDtKHiPWc+ALMoT40ACfUPspOT0Rl5+NhyXTwWokE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 h1:AEn+xJPNHYUZrhzpgBtld2IeLJQzk8Hw51Kd6ZI7Zf4= github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2/go.mod h1:SZzq5PuLlmDBHFMf5Fvlq5nDWdfQI4H5o4gSWnN2wFk= -github.com/aws/aws-sdk-go-v2/service/appstream v1.18.3 h1:HHCGjUom8ccK5jcvNKWr58OvPlVG9sTcIteqUDheulc= -github.com/aws/aws-sdk-go-v2/service/appstream v1.18.3/go.mod h1:WOydO3isH+DqvIE/CTt7btvc8ibivOB3r+fis+58Fq4= +github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 h1:T+Hq+2hgbvHyTAswcbOHqS4UuHR/ooOVymRpD+PEisc= +github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0/go.mod h1:WOydO3isH+DqvIE/CTt7btvc8ibivOB3r+fis+58Fq4= github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 h1:6aDV3YIeCUAGOjo4BCh8E0FebVPPCgkLqgkWxeVgVPQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1/go.mod h1:EDtnjzmK/qkbgcMl4KbpEW6NueYhWzFsrM52eLKkW4o= github.com/aws/aws-sdk-go-v2/service/athena v1.21.0 h1:6a0f+lVebLAjv96HaXOxzxbg1/1/x4LvEPHxd2gMZk8= From 815a0f9a5cff400f4e8cc23ba53584b115817bac Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 04:38:22 +0200 Subject: [PATCH 018/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/athena to v1.22.0 (#6406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/athena](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.21.0` -> `v1.22.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.22.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/athena/v1.21.0...service/athena/v1.22.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/athena/v1.21.0...service/athena/v1.22.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 86891daa3c091d..ebae11fce778cb 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -130,7 +130,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.21.0 + github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 github.com/aws/aws-sdk-go-v2/service/backup v1.18.2 github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index d022bad81f5ed8..7451a5ad1f7501 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -76,8 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 h1:T+Hq+2hgbvHyTAswcbOHqS github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0/go.mod h1:WOydO3isH+DqvIE/CTt7btvc8ibivOB3r+fis+58Fq4= github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 h1:6aDV3YIeCUAGOjo4BCh8E0FebVPPCgkLqgkWxeVgVPQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1/go.mod h1:EDtnjzmK/qkbgcMl4KbpEW6NueYhWzFsrM52eLKkW4o= -github.com/aws/aws-sdk-go-v2/service/athena v1.21.0 h1:6a0f+lVebLAjv96HaXOxzxbg1/1/x4LvEPHxd2gMZk8= -github.com/aws/aws-sdk-go-v2/service/athena v1.21.0/go.mod h1:qM3rq1ZYD0NJSrjMnETmtmvfMGjyJZrttQehKYEwgko= +github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 h1:A5ff2DgymMq9nQOfoP+ewHm/Rgmb3F6hxw3M22VTkHc= +github.com/aws/aws-sdk-go-v2/service/athena v1.22.0/go.mod h1:qM3rq1ZYD0NJSrjMnETmtmvfMGjyJZrttQehKYEwgko= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 h1:yl6177p8gl3yyJopLVyssg6SNEtfxGpRP8VWA14SqTs= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1/go.mod h1:zN3msBQ5/t4e3nvQvz8AM1cj++DWIekyYTatsBrcsZs= github.com/aws/aws-sdk-go-v2/service/backup v1.18.2 h1:c/Q5sRZrSeHD50p+Ek13+7KamZ9411ywjJlOTA7obqw= From 89ffac690b18edb055cc892ab341907d7c8b27d4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 04:55:46 +0200 Subject: [PATCH 019/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudformation to v1.25.0 (#6409) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudformation](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.24.3` -> `v1.25.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.25.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudformation/v1.24.3...service/cloudformation/v1.25.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudformation/v1.24.3...service/cloudformation/v1.25.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index ebae11fce778cb..adfc9eff39b0e4 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.3 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.24 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 7451a5ad1f7501..336df98a82917a 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -82,8 +82,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 h1:yl6177p8gl3yyJopLVys github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1/go.mod h1:zN3msBQ5/t4e3nvQvz8AM1cj++DWIekyYTatsBrcsZs= github.com/aws/aws-sdk-go-v2/service/backup v1.18.2 h1:c/Q5sRZrSeHD50p+Ek13+7KamZ9411ywjJlOTA7obqw= github.com/aws/aws-sdk-go-v2/service/backup v1.18.2/go.mod h1:m3jiAtnpDj6PjnzUdK7uM3hCfDG3uvQ5TTOGfxNZCe4= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.3 h1:EgvLj8D2G8gHSPbFPTd/kTHKgHWR/TKh+cAhnhk4AbA= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.3/go.mod h1:Apg7QSWLW1AGekfjYItJXemDl8GEeQYoUFlnw8WwBD8= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 h1:Ti8Dyuz6Te5IhC9jcm0NnL2iM0eCf0Zi7Aw/trGeBqA= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0/go.mod h1:Apg7QSWLW1AGekfjYItJXemDl8GEeQYoUFlnw8WwBD8= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 h1:+isnazsCv87gmSUp97TNlRToz/K+8fncTo7nMh1qcYM= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0/go.mod h1:xUOmvPrMKmH94stXswKsGSkL02vMpNU+rTG+eIzFfNQ= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.24 h1:n6SGGOXYQ2f6PSgtiQfZ1Lax0Xyg77eFb1McR8cethA= From d12e25cadf8e37d9a33269241c4a5ed14c04be83 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 05:13:48 +0200 Subject: [PATCH 020/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 to v1.14.0 (#6411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudhsmv2](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.24` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudhsmv2/v1.13.24...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudhsmv2/v1.13.24...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index adfc9eff39b0e4..b301a3d5119a8a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.24 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.4 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 336df98a82917a..752087a0dd6adf 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -86,8 +86,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 h1:Ti8Dyuz6Te5IhC9jc github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0/go.mod h1:Apg7QSWLW1AGekfjYItJXemDl8GEeQYoUFlnw8WwBD8= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 h1:+isnazsCv87gmSUp97TNlRToz/K+8fncTo7nMh1qcYM= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0/go.mod h1:xUOmvPrMKmH94stXswKsGSkL02vMpNU+rTG+eIzFfNQ= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.24 h1:n6SGGOXYQ2f6PSgtiQfZ1Lax0Xyg77eFb1McR8cethA= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.24/go.mod h1:PUzxtyO8Pgq2MljHs4G/Zm4Z0+hIuVyZMjtXTC6JEzQ= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 h1:GMfZiWjkSnGJOTNwa57pZrVG2HkHaPVW4xrZsq0rJtc= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0/go.mod h1:PUzxtyO8Pgq2MljHs4G/Zm4Z0+hIuVyZMjtXTC6JEzQ= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 h1:4Yfx+qKzAUc0JEWfPIbua2vavgSnoiqa+NTm5eN60M0= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1/go.mod h1:1Li52ZBEvcubmtUtUFUjamRTQt4EoFzZpHDINdQ4Xso= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 h1:6VwY6q6RZwxZTTTXjDmS8qbeBKvWwp8ugMKCEBjdgWA= From 71ec9b99328ae4b7b0739a0c22258a805b586948 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 05:35:31 +0200 Subject: [PATCH 021/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.47 (#6395) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.11.46` -> `v1.11.47` | | [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.11.33` -> `v1.11.47` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.11.47`](https://togithub.com/aws/aws-sdk-go-v2/compare/feature/s3/manager/v1.11.46...feature/s3/manager/v1.11.47) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/feature/s3/manager/v1.11.46...feature/s3/manager/v1.11.47)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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 these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/s3/go.mod | 4 +-- plugins/destination/s3/go.sum | 13 +++----- plugins/destination/snowflake/go.mod | 6 ++-- plugins/destination/snowflake/go.sum | 46 +++++++++++----------------- plugins/source/aws/go.mod | 4 +-- plugins/source/aws/go.sum | 13 +++----- plugins/source/terraform/go.mod | 4 +-- plugins/source/terraform/go.sum | 13 +++----- 8 files changed, 39 insertions(+), 64 deletions(-) diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 95033393faabb6..3b627e4e701d06 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -5,8 +5,8 @@ go 1.19 require ( github.com/aws/aws-sdk-go-v2 v1.17.3 github.com/aws/aws-sdk-go-v2/config v1.18.8 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 - github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 + github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/cloudquery/filetypes v1.0.2 github.com/cloudquery/plugin-sdk v1.19.0 github.com/google/uuid v1.3.0 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 672fcd31806ff2..3fd494ab030b5d 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -38,16 +38,14 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46/go.mod h1:MxCBOcyNXGJRvfpPiH+L6n/BF9zbowthGSUZdDvQF/c= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 h1:E884ndKWVGt8IhtUuGhXbEsmaCvdAAkTTUDu7uAok1g= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47/go.mod h1:KybsEsmXLO0u75FyS3F0sY4OQ97syDe8z+ISq8oEczA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= @@ -64,15 +62,12 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViS github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index b20f19f31a5434..5d1445af2e7eec 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -16,8 +16,8 @@ require ( github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect; indirect // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.12.20 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.8 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 // indirect; indirect // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect; indirect // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect; indirect // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 // indirect; indirect // indirect @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect; indirect // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect; indirect // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect; indirect // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index c0a796f7f0a273..b94288e95baade 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -58,52 +58,42 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ= github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs= github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE= -github.com/aws/aws-sdk-go-v2 v1.16.16/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k= github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/PgrhY= github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8/go.mod h1:JTnlBSot91steJeti4ryyu/tLd4Sk84O5W22L7O2EQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.17.7 h1:odVM52tFHhpqZBKNjVW5h+Zt1tKHbhdTQRb+0WHrNtw= -github.com/aws/aws-sdk-go-v2/config v1.17.7/go.mod h1:dN2gja/QXxFF15hQreyrqYhLBaQo1d9ZKe/v/uplQoI= -github.com/aws/aws-sdk-go-v2/credentials v1.12.20 h1:9+ZhlDY7N9dPnUmf7CDfW9In4sW5Ff3bh7oy4DzS1IE= -github.com/aws/aws-sdk-go-v2/credentials v1.12.20/go.mod h1:UKY5HyIux08bbNA7Blv4PcXQ8cTkGh7ghHMFklaviR4= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 h1:r08j4sbZu/RVi+BNxkBJwPMUYY3P8mgSDuKkZ/ZN1lE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17/go.mod h1:yIkQcCDYNsZfXpd5UX2Cy+sWA1jPgIhGTw9cOBzfVnQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 h1:fAoVmNGhir6BR+RU0/EI+6+D7abM+MCwWf8v4ip5jNI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33/go.mod h1:84XgODVR8uRhmOnUkKGUZKqIMxmjmLOR8Uyp7G/TPwc= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23/go.mod h1:2DFxAQ9pfIRy0imBCJv+vZ2X6RKxves6fbnEuSry6b4= +github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= +github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= +github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 h1:E884ndKWVGt8IhtUuGhXbEsmaCvdAAkTTUDu7uAok1g= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47/go.mod h1:KybsEsmXLO0u75FyS3F0sY4OQ97syDe8z+ISq8oEczA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17/go.mod h1:pRwaTYCJemADaqCbUAxltMoHKata7hmB5PjEXeu0kfg= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21/go.mod h1:+Gxn8jYn5k9ebfHEqlhrMirFjSW0v0C9fI+KN5vk2kE= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 h1:wj5Rwc05hvUSvKuOF29IYb9QrCLjU+rHAy/x/o0DK2c= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24/go.mod h1:jULHjqqjDlbyTa7pfM7WICATnOv+iOhjletM3N0Xbu8= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.14/go.mod h1:AyGgqiKv9ECM6IZeNQtdT8NnMvUb3/2wokeq2Fgryto= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 h1:KeTxcGdNnQudb46oOl4d90f2I33DF/c6q3RnZAmvQdQ= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 h1:H/mF2LNWwX00lD6FlYfKpLLZgUW7oIzCBkig78x4Xok= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18/go.mod h1:T2Ku+STrYQ1zIkL1wMvj8P3wWQaaCMKNdz70MT2FLfE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9/go.mod h1:a9j48l6yL5XINLHLcOKInjdvknN+vWqPBxqeIDw7ktw= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.18/go.mod h1:NS55eQ4YixUJPTC+INxi2/jCqe1y2Uw3rnh9wEOVJxY= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 h1:kv5vRAl00tozRxSnI0IszPWGXsJOyA7hmEUHFYqsyvw= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22/go.mod h1:Od+GU5+Yx41gryN/ZGZzAJMZ9R1yn6lgA0fD5Lo5SkQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17/go.mod h1:4nYOrY41Lrbk2170/BGkcJKBhws9Pfn8MG3aGqjjeFI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17/go.mod h1:YqMdV+gEKCQ59NrB7rzrJdALeBIsYiVi8Inj3+KcqHI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 h1:3/gm/JTX9bX8CpzTgIlrtYpB3EVBDxyg/GY/QdcIEZw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11/go.mod h1:fmgDANqTUCxciViKl9hb/zD5LFbvPINFRgWhDbR+vZo= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 h1:pwvCchFUEnlceKIgPUouBJwK81aCkQ8UDMORfeFtW10= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.23/go.mod h1:/w0eg9IhFGjGyyncHIQrXtU8wvNsTJOP0R6PPj0wf80= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5 h1:GUnZ62TevLqIoDyHeiWj2P7EqaosgakBKVvWriIdLQY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5/go.mod h1:csZuQY65DAdFBt1oIjO5hhBR49kQqop4+lcuCjf2arA= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 h1:9pPi0PsFNAGILFfPCk8Y0iyEBGc6lu6OQ97U7hmdesg= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.19/go.mod h1:h4J3oPZQbxLhzGnk+j9dfYHi5qIOVJ5kczZd658/ydM= -github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= +github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index b301a3d5119a8a..6142bc8bd16436 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.17.3 github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/credentials v1.13.8 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 github.com/aws/aws-sdk-go-v2/service/account v1.7.13 github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 - github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 + github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 752087a0dd6adf..f56f678b3cde28 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -38,16 +38,14 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46/go.mod h1:MxCBOcyNXGJRvfpPiH+L6n/BF9zbowthGSUZdDvQF/c= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 h1:E884ndKWVGt8IhtUuGhXbEsmaCvdAAkTTUDu7uAok1g= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47/go.mod h1:KybsEsmXLO0u75FyS3F0sY4OQ97syDe8z+ISq8oEczA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= @@ -208,8 +206,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/ github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 h1:0isIvtqn8syj503AEQSdu56dMtuEeu0h5LJ7sgpR8CY= github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 h1:HILTJewyveEWszPKAN3C3gALrs2x13tCIN3BZZrUgkE= github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2/go.mod h1:4DfdtJVYJj82pZdBoOwyA87ocrDYfQgAgbW6e17Xr2U= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 h1:yQjFY8oQcFVXkCNNoQdolB/Rbq1KMtB64NxlfteaM/s= @@ -238,15 +236,12 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17 h1:bTr3F70BsgeJZW5QU0O4pVapJbg github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17/go.mod h1:jQhN5f4p3PALMNlUtfb/0wGIFlV7vGtJlPDVfxfNfPY= github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0 h1:uAUjT+Np+B5sWwpcGd3V9xpBwEid8qYYfgmg0CsWTNM= github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0/go.mod h1:Hf7wSogKP1XCJ9GgW8erZDL6IZ1NLwLN7bYdV/Gn/LI= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.16 h1:l6aWoI8UnGII7yPEHdvAF84O0upQxPum6TFycIYtKkE= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.16/go.mod h1:xH7hHxhm765Db3QuS51w9DNgN3iMpcth0o1mMmYh6eY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.14.8 h1:1FPvcg1m3K7bip7WLscELLF4RKZR0Ys1iUbomhtDYJY= diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 14e1be6ec2630a..91ac6519bd444d 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go-v2 v1.17.3 github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/credentials v1.13.8 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 - github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 + github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 github.com/cloudquery/plugin-sdk v1.21.0 github.com/golang/mock v1.6.0 diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index b0e53f301e0fa4..9268a0dac6bc96 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -38,16 +38,14 @@ github.com/aws/aws-sdk-go-v2 v1.17.3 h1:shN7NlnVzvDUgPQ+1rLMSxY8OWRNDRYtiqe0p/Pg github.com/aws/aws-sdk-go-v2 v1.17.3/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.7/go.mod h1:OZYsyHFL5PB9UpyS78NElgKs11qI/B5KJau2XOJDXHA= github.com/aws/aws-sdk-go-v2/config v1.18.8 h1:lDpy0WM8AHsywOnVrOHaSMfpaiV2igOw8D7svkFkXVA= github.com/aws/aws-sdk-go-v2/config v1.18.8/go.mod h1:5XCmmyutmzzgkpk/6NYTjeWb6lgo9N170m1j6pQkIBs= -github.com/aws/aws-sdk-go-v2/credentials v1.13.7/go.mod h1:AdCcbZXHQCjJh6NaH3pFaw8LUeBFn5+88BZGMVGuBT8= github.com/aws/aws-sdk-go-v2/credentials v1.13.8 h1:vTrwTvv5qAwjWIGhZDSBH/oQHuIQjGmD232k01FUh6A= github.com/aws/aws-sdk-go-v2/credentials v1.13.8/go.mod h1:lVa4OHbvgjVot4gmh1uouF1ubgexSCN92P6CJQpT0t8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 h1:j9wi1kQ8b+e0FBVHxCqCGo4kxDU175hoDHcWAi0sauU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21/go.mod h1:ugwW57Z5Z48bpvUyZuaPy4Kv+vEfJWnIrky7RmkBvJg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46 h1:OCX1pQ4pcqhsDV7B92HzdLWjHWOQsILvjLinpaUWhcc= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.46/go.mod h1:MxCBOcyNXGJRvfpPiH+L6n/BF9zbowthGSUZdDvQF/c= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 h1:E884ndKWVGt8IhtUuGhXbEsmaCvdAAkTTUDu7uAok1g= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47/go.mod h1:KybsEsmXLO0u75FyS3F0sY4OQ97syDe8z+ISq8oEczA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 h1:I3cakv2Uy1vNmmhRQmFptYDxOvBnwCdNwyw63N0RaRU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27/go.mod h1:a1/UpzeyBBerajpnP5nGZa9mGzsBn5cOKxm6NWQsvoI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAle6mgrH5m9cOvMLRGL7pnG8tRE= @@ -64,15 +62,12 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViS github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.28/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.11/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0/go.mod h1:TZSH7xLO7+phDtViY/KUp9WGCJMQkLJ/VpgkTFd5gh8= -github.com/aws/aws-sdk-go-v2/service/sts v1.17.7/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 h1:kOO++CYo50RcTFISESluhWEi5Prhg+gaSs4whWabiZU= github.com/aws/aws-sdk-go-v2/service/sts v1.18.0/go.mod h1:+lGbb3+1ugwKrNTWcf2RT05Xmp543B06zDFTwiTLp7I= github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= From 98a76815f1d1b98dd2278dfc0d57b775345ea46a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 05:52:17 +0200 Subject: [PATCH 022/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/account to v1.8.0 (#6397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/account](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.7.13` -> `v1.8.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.8.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/account/v1.7.13...v1.8.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/account/v1.7.13...v1.8.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 6142bc8bd16436..61657f3c420408 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 - github.com/aws/aws-sdk-go-v2/service/account v1.7.13 + github.com/aws/aws-sdk-go-v2/service/account v1.8.0 github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index f56f678b3cde28..8cb94cdaddd612 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -56,8 +56,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 h1:H/mF2LNWwX00lD6FlYfKpLLZgUW github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18/go.mod h1:T2Ku+STrYQ1zIkL1wMvj8P3wWQaaCMKNdz70MT2FLfE= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 h1:1F8zUy/DB/jYbV7+Vr/a1bTtK6X6XtQE4qAGcvH2Sew= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0/go.mod h1:4HIMZDtg3VxhzthCkA4i42VihH58ORUO/O9BNMN9+Bo= -github.com/aws/aws-sdk-go-v2/service/account v1.7.13 h1:FsQ+ZcQ/XDyDOZEEtZk7fargzverqqGi/tjY0eiVfMQ= -github.com/aws/aws-sdk-go-v2/service/account v1.7.13/go.mod h1:X9I4bZToo2mokeLkZsZA4deP7KEmr2+BpchQNff39hU= +github.com/aws/aws-sdk-go-v2/service/account v1.8.0 h1:65ZBTrmfs3KUGdopbP8sreXOdaj4yxB5kgvNFNT8A3E= +github.com/aws/aws-sdk-go-v2/service/account v1.8.0/go.mod h1:X9I4bZToo2mokeLkZsZA4deP7KEmr2+BpchQNff39hU= github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 h1:LRNV4MYo3nJFUkfc088Eb5/AH/oUYrFuww+0XaDqk5o= github.com/aws/aws-sdk-go-v2/service/acm v1.17.0/go.mod h1:Wa9L0MGV8nzgqv0cvS0ju7hqEDv+yGikspSXVBUpnJQ= github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 h1:qdr0dkHrVADizKxgkynGoNGRr9Bn77ECjkhF7v6EF+Y= From 35b62acbc10ee60318260e06a3ef74445ec14772 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 06:25:10 +0200 Subject: [PATCH 023/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.18.0 (#6414) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.4` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.1...service/appsync/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudwatchlogs/v1.17.4...service/cloudwatchlogs/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 61657f3c420408..8e99f0dd34fbce 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -23,7 +23,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.4 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 8cb94cdaddd612..bd4863031c44e4 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -90,8 +90,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 h1:4Yfx+qKzAUc0JEWfPIbua github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1/go.mod h1:1Li52ZBEvcubmtUtUFUjamRTQt4EoFzZpHDINdQ4Xso= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 h1:6VwY6q6RZwxZTTTXjDmS8qbeBKvWwp8ugMKCEBjdgWA= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1/go.mod h1:th8fks2kW4FFCUKUQenuEG9TEzMLVxeL0ckdJn/QVbI= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.4 h1:r4CE7r/3u70wTkNP8/YuAN4dgQq2CHkTTdduBX4T2gA= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.4/go.mod h1:xHK1ta0bQEa5jL6rahKRJvsibjzDO7NTIs5itzsF4w8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 h1:Ai+CjJw+5/s3r6k5pggzDuFhWor2U3iwtsrmvN0Hczc= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0/go.mod h1:xHK1ta0bQEa5jL6rahKRJvsibjzDO7NTIs5itzsF4w8= github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21 h1:UQ6xFsV/IyOg+0on4vsna3qTsEBHr35tpR0ZTXSSdZI= github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21/go.mod h1:8qcyoqQjYm4jOQApmG43LtHG9ZehKXyCzAq2n+B/v2s= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 h1:yqd0C0Zrgu8y9CeDW3YUyELa5BH8e8Q5FBERzxRCWGQ= From 128ae76a9cd921c9b63e9a02c9d5261077e814b8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 06:45:37 +0200 Subject: [PATCH 024/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/amp to v1.16.0 (#6399) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/amp](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.9` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/amp/v1.15.9...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/amp/v1.15.9...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 8e99f0dd34fbce..b4287a1c0a5d9f 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.0 github.com/aws/aws-sdk-go-v2/service/account v1.8.0 github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 - github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 + github.com/aws/aws-sdk-go-v2/service/amp v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index bd4863031c44e4..c3a5edf3c92e68 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -60,8 +60,8 @@ github.com/aws/aws-sdk-go-v2/service/account v1.8.0 h1:65ZBTrmfs3KUGdopbP8sreXOd github.com/aws/aws-sdk-go-v2/service/account v1.8.0/go.mod h1:X9I4bZToo2mokeLkZsZA4deP7KEmr2+BpchQNff39hU= github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 h1:LRNV4MYo3nJFUkfc088Eb5/AH/oUYrFuww+0XaDqk5o= github.com/aws/aws-sdk-go-v2/service/acm v1.17.0/go.mod h1:Wa9L0MGV8nzgqv0cvS0ju7hqEDv+yGikspSXVBUpnJQ= -github.com/aws/aws-sdk-go-v2/service/amp v1.15.9 h1:qdr0dkHrVADizKxgkynGoNGRr9Bn77ECjkhF7v6EF+Y= -github.com/aws/aws-sdk-go-v2/service/amp v1.15.9/go.mod h1:1h/HEqqBDBtTr+J2KuZCl8XtwpZzBoiQXma3WaOKYKk= +github.com/aws/aws-sdk-go-v2/service/amp v1.16.0 h1:Hg9zZgAXfCB4QzgPWpTX/23bky+jnWg8apkNONMO/sA= +github.com/aws/aws-sdk-go-v2/service/amp v1.16.0/go.mod h1:1h/HEqqBDBtTr+J2KuZCl8XtwpZzBoiQXma3WaOKYKk= github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 h1:INMBcLcEY29u2ZHMnva693HZNCwzO6v42d92HOCk5DA= github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0/go.mod h1:6UIKOkbI/NjVEszKrlgWDrlEPkpd2X+BBrzj0N/XTM4= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 h1:Q2fPOHnGq3xnBarRAq6x+lvmY7XdHAMg65Jr9aThX8A= From ca3b1565fe5800637c03dfe892b56fea36418451 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 07:05:23 +0200 Subject: [PATCH 025/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/apigatewayv2 to v1.13.0 (#6401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/apigatewayv2](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.12.25` -> `v1.13.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.13.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/apigatewayv2/v1.12.25...v1.13.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/apigatewayv2/v1.12.25...v1.13.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index b4287a1c0a5d9f..c868617912a038 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.17.0 github.com/aws/aws-sdk-go-v2/service/amp v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c3a5edf3c92e68..2cbebaf3559661 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -64,8 +64,8 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.16.0 h1:Hg9zZgAXfCB4QzgPWpTX/23bky+j github.com/aws/aws-sdk-go-v2/service/amp v1.16.0/go.mod h1:1h/HEqqBDBtTr+J2KuZCl8XtwpZzBoiQXma3WaOKYKk= github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 h1:INMBcLcEY29u2ZHMnva693HZNCwzO6v42d92HOCk5DA= github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0/go.mod h1:6UIKOkbI/NjVEszKrlgWDrlEPkpd2X+BBrzj0N/XTM4= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25 h1:Q2fPOHnGq3xnBarRAq6x+lvmY7XdHAMg65Jr9aThX8A= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.25/go.mod h1:Pyu5xH3gZR/XjaroZL9CF3aBMiYkn+fyZ+Rr0TNUp7I= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0 h1:02l9EzvhTNWnunGQtifP15px5Vr5MQeonKbAbpMk/YM= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0/go.mod h1:Pyu5xH3gZR/XjaroZL9CF3aBMiYkn+fyZ+Rr0TNUp7I= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 h1:m+ust0oz1uaZq/NV21yn+tuTqGYyGeghWoxd4fYsfEE= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0/go.mod h1:oqEDtKHiPWc+ALMoT40ACfUPspOT0Rl5+NhyXTwWokE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 h1:AEn+xJPNHYUZrhzpgBtld2IeLJQzk8Hw51Kd6ZI7Zf4= From a312c4b03bca32f9c158e08d4c19984859a0a546 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 07:26:25 +0200 Subject: [PATCH 026/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/apprunner to v1.16.0 (#6403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/apprunner](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.2` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/apprunner/v1.15.2...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/apprunner/v1.15.2...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index c868617912a038..0a0d67584efc48 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -14,7 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigateway v1.16.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2cbebaf3559661..cfa9078e691a9b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -68,8 +68,8 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0 h1:02l9EzvhTNWnunGQtif github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.13.0/go.mod h1:Pyu5xH3gZR/XjaroZL9CF3aBMiYkn+fyZ+Rr0TNUp7I= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 h1:m+ust0oz1uaZq/NV21yn+tuTqGYyGeghWoxd4fYsfEE= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0/go.mod h1:oqEDtKHiPWc+ALMoT40ACfUPspOT0Rl5+NhyXTwWokE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2 h1:AEn+xJPNHYUZrhzpgBtld2IeLJQzk8Hw51Kd6ZI7Zf4= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.2/go.mod h1:SZzq5PuLlmDBHFMf5Fvlq5nDWdfQI4H5o4gSWnN2wFk= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0 h1:fSPxcaOHOsqQlXMRq+p43koBU/2yI/H+KjQVKbKeZS0= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0/go.mod h1:SZzq5PuLlmDBHFMf5Fvlq5nDWdfQI4H5o4gSWnN2wFk= github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 h1:T+Hq+2hgbvHyTAswcbOHqS4UuHR/ooOVymRpD+PEisc= github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0/go.mod h1:WOydO3isH+DqvIE/CTt7btvc8ibivOB3r+fis+58Fq4= github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 h1:6aDV3YIeCUAGOjo4BCh8E0FebVPPCgkLqgkWxeVgVPQ= From 76d4df52517fcac585b9759045b3a1f650e6af7c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 07:45:11 +0200 Subject: [PATCH 027/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/appsync to v1.18.0 (#6405) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/appsync](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.1` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.1...service/appsync/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.1...service/appsync/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 0a0d67584efc48..4557eff8567415 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.17.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 - github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 + github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index cfa9078e691a9b..b87f8261f18ad9 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -72,8 +72,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0 h1:fSPxcaOHOsqQlXMRq+p43k github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0/go.mod h1:SZzq5PuLlmDBHFMf5Fvlq5nDWdfQI4H5o4gSWnN2wFk= github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 h1:T+Hq+2hgbvHyTAswcbOHqS4UuHR/ooOVymRpD+PEisc= github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0/go.mod h1:WOydO3isH+DqvIE/CTt7btvc8ibivOB3r+fis+58Fq4= -github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1 h1:6aDV3YIeCUAGOjo4BCh8E0FebVPPCgkLqgkWxeVgVPQ= -github.com/aws/aws-sdk-go-v2/service/appsync v1.17.1/go.mod h1:EDtnjzmK/qkbgcMl4KbpEW6NueYhWzFsrM52eLKkW4o= +github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0 h1:0G22Dp2IGbnQAeXV9gEK7jE0vJJxIHIMFzMK5s620Lc= +github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0/go.mod h1:EDtnjzmK/qkbgcMl4KbpEW6NueYhWzFsrM52eLKkW4o= github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 h1:A5ff2DgymMq9nQOfoP+ewHm/Rgmb3F6hxw3M22VTkHc= github.com/aws/aws-sdk-go-v2/service/athena v1.22.0/go.mod h1:qM3rq1ZYD0NJSrjMnETmtmvfMGjyJZrttQehKYEwgko= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 h1:yl6177p8gl3yyJopLVyssg6SNEtfxGpRP8VWA14SqTs= From 01accc866a6f3020883ac50edf7bf979a73149df Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:01:49 +0200 Subject: [PATCH 028/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/backup to v1.19.0 (#6408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/backup](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.2` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/backup/v1.18.2...service/backup/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/backup/v1.18.2...service/backup/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 4557eff8567415..d932bd59c6fbda 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -131,7 +131,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 - github.com/aws/aws-sdk-go-v2/service/backup v1.18.2 + github.com/aws/aws-sdk-go-v2/service/backup v1.19.0 github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.21 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index b87f8261f18ad9..2df47cc7c9b795 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -78,8 +78,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 h1:A5ff2DgymMq9nQOfoP+ewHm/R github.com/aws/aws-sdk-go-v2/service/athena v1.22.0/go.mod h1:qM3rq1ZYD0NJSrjMnETmtmvfMGjyJZrttQehKYEwgko= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 h1:yl6177p8gl3yyJopLVyssg6SNEtfxGpRP8VWA14SqTs= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1/go.mod h1:zN3msBQ5/t4e3nvQvz8AM1cj++DWIekyYTatsBrcsZs= -github.com/aws/aws-sdk-go-v2/service/backup v1.18.2 h1:c/Q5sRZrSeHD50p+Ek13+7KamZ9411ywjJlOTA7obqw= -github.com/aws/aws-sdk-go-v2/service/backup v1.18.2/go.mod h1:m3jiAtnpDj6PjnzUdK7uM3hCfDG3uvQ5TTOGfxNZCe4= +github.com/aws/aws-sdk-go-v2/service/backup v1.19.0 h1:MLR1keST/6ueXuVZnNSUtgh40+yei2UYMhO/z6neboc= +github.com/aws/aws-sdk-go-v2/service/backup v1.19.0/go.mod h1:m3jiAtnpDj6PjnzUdK7uM3hCfDG3uvQ5TTOGfxNZCe4= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 h1:Ti8Dyuz6Te5IhC9jcm0NnL2iM0eCf0Zi7Aw/trGeBqA= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0/go.mod h1:Apg7QSWLW1AGekfjYItJXemDl8GEeQYoUFlnw8WwBD8= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 h1:+isnazsCv87gmSUp97TNlRToz/K+8fncTo7nMh1qcYM= From 74a96fb2e34202369d357b51c8d44aa130e2ad95 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:18:52 +0200 Subject: [PATCH 029/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudfront to v1.24.0 (#6410) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudfront](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.23.0` -> `v1.24.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.24.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudfront/v1.23.0...service/cloudfront/v1.24.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudfront/v1.23.0...service/cloudfront/v1.24.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index d932bd59c6fbda..d9c5b3d1a8c6a8 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2df47cc7c9b795..c95f2775de1f40 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -82,8 +82,8 @@ github.com/aws/aws-sdk-go-v2/service/backup v1.19.0 h1:MLR1keST/6ueXuVZnNSUtgh40 github.com/aws/aws-sdk-go-v2/service/backup v1.19.0/go.mod h1:m3jiAtnpDj6PjnzUdK7uM3hCfDG3uvQ5TTOGfxNZCe4= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 h1:Ti8Dyuz6Te5IhC9jcm0NnL2iM0eCf0Zi7Aw/trGeBqA= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0/go.mod h1:Apg7QSWLW1AGekfjYItJXemDl8GEeQYoUFlnw8WwBD8= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0 h1:+isnazsCv87gmSUp97TNlRToz/K+8fncTo7nMh1qcYM= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.23.0/go.mod h1:xUOmvPrMKmH94stXswKsGSkL02vMpNU+rTG+eIzFfNQ= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 h1:k1RJsiyqnUm5u+jrYOls9MoP9xgqsVUOrfsYy9mxCro= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0/go.mod h1:xUOmvPrMKmH94stXswKsGSkL02vMpNU+rTG+eIzFfNQ= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 h1:GMfZiWjkSnGJOTNwa57pZrVG2HkHaPVW4xrZsq0rJtc= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0/go.mod h1:PUzxtyO8Pgq2MljHs4G/Zm4Z0+hIuVyZMjtXTC6JEzQ= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 h1:4Yfx+qKzAUc0JEWfPIbua2vavgSnoiqa+NTm5eN60M0= From c1765b859c644487b035ca52077f9764ccf80a2a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:36:39 +0200 Subject: [PATCH 030/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudtrail to v1.22.0 (#6412) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudtrail](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.21.1` -> `v1.22.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.22.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudtrail/v1.21.1...service/cloudtrail/v1.22.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudtrail/v1.21.1...service/cloudtrail/v1.22.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index d9c5b3d1a8c6a8..30e604a2c015a9 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -21,7 +21,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c95f2775de1f40..b82043788fca30 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -86,8 +86,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 h1:k1RJsiyqnUm5u+jrYOls9 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0/go.mod h1:xUOmvPrMKmH94stXswKsGSkL02vMpNU+rTG+eIzFfNQ= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 h1:GMfZiWjkSnGJOTNwa57pZrVG2HkHaPVW4xrZsq0rJtc= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0/go.mod h1:PUzxtyO8Pgq2MljHs4G/Zm4Z0+hIuVyZMjtXTC6JEzQ= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1 h1:4Yfx+qKzAUc0JEWfPIbua2vavgSnoiqa+NTm5eN60M0= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.21.1/go.mod h1:1Li52ZBEvcubmtUtUFUjamRTQt4EoFzZpHDINdQ4Xso= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0 h1:Hdql8h9SancrQPqJoDcaJQT01zwaSP4gYbe8rmrQRrw= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0/go.mod h1:1Li52ZBEvcubmtUtUFUjamRTQt4EoFzZpHDINdQ4Xso= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 h1:6VwY6q6RZwxZTTTXjDmS8qbeBKvWwp8ugMKCEBjdgWA= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1/go.mod h1:th8fks2kW4FFCUKUQenuEG9TEzMLVxeL0ckdJn/QVbI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 h1:Ai+CjJw+5/s3r6k5pggzDuFhWor2U3iwtsrmvN0Hczc= From 26e995cbdbe73a7e42926b62e4f85e9689cf67a8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 08:55:30 +0200 Subject: [PATCH 031/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/autoscaling to v1.26.0 (#6407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.25.1` -> `v1.26.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.26.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/autoscaling/v1.25.1...service/autoscaling/v1.26.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/autoscaling/v1.25.1...service/autoscaling/v1.26.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 30e604a2c015a9..6f0b5453b280da 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -17,7 +17,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.16.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.19.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.26.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index b82043788fca30..df2e92273a5ab2 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -76,8 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0 h1:0G22Dp2IGbnQAeXV9gEK7jE0 github.com/aws/aws-sdk-go-v2/service/appsync v1.18.0/go.mod h1:EDtnjzmK/qkbgcMl4KbpEW6NueYhWzFsrM52eLKkW4o= github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 h1:A5ff2DgymMq9nQOfoP+ewHm/Rgmb3F6hxw3M22VTkHc= github.com/aws/aws-sdk-go-v2/service/athena v1.22.0/go.mod h1:qM3rq1ZYD0NJSrjMnETmtmvfMGjyJZrttQehKYEwgko= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1 h1:yl6177p8gl3yyJopLVyssg6SNEtfxGpRP8VWA14SqTs= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.25.1/go.mod h1:zN3msBQ5/t4e3nvQvz8AM1cj++DWIekyYTatsBrcsZs= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.26.0 h1:dK659zI1MaYa0hF7JuRSbZvx9mP2OH7UyssUFRJzIH4= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.26.0/go.mod h1:zN3msBQ5/t4e3nvQvz8AM1cj++DWIekyYTatsBrcsZs= github.com/aws/aws-sdk-go-v2/service/backup v1.19.0 h1:MLR1keST/6ueXuVZnNSUtgh40+yei2UYMhO/z6neboc= github.com/aws/aws-sdk-go-v2/service/backup v1.19.0/go.mod h1:m3jiAtnpDj6PjnzUdK7uM3hCfDG3uvQ5TTOGfxNZCe4= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.25.0 h1:Ti8Dyuz6Te5IhC9jcm0NnL2iM0eCf0Zi7Aw/trGeBqA= From f3b989f7cbe335481dc01ad2a56cf7eff48e01d5 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Fri, 6 Jan 2023 11:55:05 +0000 Subject: [PATCH 032/221] fix(deps): Update plugin-sdk to v1.21.0 for destinations (#6419) This updates plugin-sdk to v1.21.0 for all destinations, and ensures that the new migration test either passes or gets skipped for all of them. This also restores some code that was accidentally removed in https://github.com/cloudquery/cloudquery/pull/6382 --- .../destination/azblob/client/client_test.go | 14 +-- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 2 + .../destination/bigquery/client/migrate.go | 85 ++++++++++++++++--- plugins/destination/bigquery/client/read.go | 10 ++- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 2 + plugins/destination/csv/client/client_test.go | 5 +- plugins/destination/csv/go.mod | 2 +- plugins/destination/csv/go.sum | 2 + .../destination/file/client/client_test.go | 5 +- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 2 + plugins/destination/gcs/client/client_test.go | 14 +-- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 2 + .../destination/kafka/client/client_test.go | 3 +- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 2 + plugins/destination/mongodb/client/read.go | 4 + plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 2 + plugins/destination/neo4j/client/read.go | 4 + plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/go.sum | 2 + plugins/destination/postgresql/client/read.go | 10 ++- plugins/destination/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 2 + plugins/destination/s3/client/client_test.go | 14 +-- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 2 + .../snowflake/client/client_test.go | 3 +- plugins/destination/snowflake/client/read.go | 13 ++- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 2 + plugins/destination/sqlite/client/migrate.go | 2 +- plugins/destination/sqlite/client/read.go | 28 +++--- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 2 + plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 2 + 41 files changed, 197 insertions(+), 69 deletions(-) diff --git a/plugins/destination/azblob/client/client_test.go b/plugins/destination/azblob/client/client_test.go index 96525f6973c84d..b104136733c11f 100644 --- a/plugins/destination/azblob/client/client_test.go +++ b/plugins/destination/azblob/client/client_test.go @@ -21,9 +21,10 @@ func TestPluginCSV(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } @@ -40,9 +41,10 @@ func TestPluginJSON(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 210f175cbc59e3..14feff2ad4f055 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 3a20bf32a5da95..2324d5edd54e19 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -54,6 +54,8 @@ github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/bigquery/client/migrate.go b/plugins/destination/bigquery/client/migrate.go index 39d01062ca41fb..1ca331f627c5b6 100644 --- a/plugins/destination/bigquery/client/migrate.go +++ b/plugins/destination/bigquery/client/migrate.go @@ -96,21 +96,14 @@ func (c *Client) waitForTableToExist(ctx context.Context, client *bigquery.Clien func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Client, table *schema.Table) error { c.logger.Debug().Str("table", table.Name).Msg("Waiting for schemas to match") wantSchema := c.bigQuerySchemaForTable(table) - want, err := wantSchema.ToJSONFields() - if err != nil { - return fmt.Errorf("failed to convert schema to JSON: %v", err) - } for i := 0; i < maxTableChecks; i++ { md, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Metadata(ctx) if err != nil { return err } - got, err := md.Schema.ToJSONFields() - if err != nil { - return fmt.Errorf("failed to convert schema to JSON: %v", err) - } - if string(got) == string(want) { - c.logger.Debug().Str("table", table.Name).Msg("Schemas matched") + haveSchema := md.Schema + if schemasMatch(haveSchema, wantSchema) { + c.logger.Debug().Str("table", table.Name).Msg("Schemas match") return nil } c.logger.Debug().Str("table", table.Name).Int("i", i).Msg("Waiting for schemas to match") @@ -120,14 +113,78 @@ func (c *Client) waitForSchemaToMatch(ctx context.Context, client *bigquery.Clie } func (c *Client) autoMigrateTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { - bqSchema := c.bigQuerySchemaForTable(table) + bqTable := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name) + md, err := bqTable.Metadata(ctx) + if err != nil { + return fmt.Errorf("failed to get table metadata: %w", err) + } + haveSchema := md.Schema + wantSchema := c.bigQuerySchemaForTable(table) + wantSchema, err = mergeSchemas(haveSchema, wantSchema) + if err != nil { + return fmt.Errorf("failed to migrate table schema: %w", err) + } tm := bigquery.TableMetadataToUpdate{ Name: table.Name, Description: table.Description, - Schema: bqSchema, + Schema: wantSchema, + } + _, err = bqTable.Update(ctx, tm, "") + if err != nil { + return fmt.Errorf("failed to update table schema: %w", err) + } + return nil +} + +func schemasMatch(haveSchema, wantSchema bigquery.Schema) bool { + // Schemas are considered a match if everything in the want schema is in the have schema, + // and they have the same types. + // We don't mind if there are extra fields in the have schema. + haveMap := make(map[string]*bigquery.FieldSchema) + for _, f := range haveSchema { + haveMap[f.Name] = f + } + for _, wf := range wantSchema { + if hf, ok := haveMap[wf.Name]; !ok { + return false + } else if hf.Type != wf.Type { + return false + } + } + return true +} + +// mergeSchemas merges the schema we want with the schema we have, to avoid +// losing any existing data +func mergeSchemas(haveSchema, wantSchema bigquery.Schema) (bigquery.Schema, error) { + haveMap := make(map[string]*bigquery.FieldSchema) + for _, f := range haveSchema { + haveMap[f.Name] = f + } + wantMap := make(map[string]*bigquery.FieldSchema) + for _, f := range wantSchema { + wantMap[f.Name] = f + } + merged := make(bigquery.Schema, 0, len(wantSchema)) + // keep everything in the schema we have, as long as the types didn't change + // or an unknown column isn't required + for _, f := range haveSchema { + if want, ok := wantMap[f.Name]; ok { + if want.Type != f.Type { + return nil, fmt.Errorf("field %v changed type from %v to %v", f.Name, f.Type, want.Type) + } + } else if f.Required { + return nil, fmt.Errorf("field %v is required but not in new schema", f.Name) + } + merged = append(merged, f) + } + // add anything new + for _, f := range wantSchema { + if _, ok := haveMap[f.Name]; !ok { + merged = append(merged, f) + } } - _, err := client.Dataset(c.pluginSpec.DatasetID).Table(table.Name).Update(ctx, tm, "") - return err + return merged, nil } func (c *Client) createTable(ctx context.Context, client *bigquery.Client, table *schema.Table) error { diff --git a/plugins/destination/bigquery/client/read.go b/plugins/destination/bigquery/client/read.go index 3ce2b9995c0669..a362afe15a3477 100644 --- a/plugins/destination/bigquery/client/read.go +++ b/plugins/destination/bigquery/client/read.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "fmt" + "strings" "time" "cloud.google.com/go/bigquery" @@ -12,7 +13,7 @@ import ( ) const ( - readSQL = "SELECT * FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" + readSQL = "SELECT %s FROM `%s.%s.%s` WHERE `_cq_source_name` = @cq_source_name order by _cq_sync_time asc" ) func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { @@ -78,7 +79,12 @@ func (*Client) createResultsArray(table *schema.Table) []bigquery.Value { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - stmt := fmt.Sprintf(readSQL, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, col.Name) + } + cols := "`" + strings.Join(colNames, "`, `") + "`" + stmt := fmt.Sprintf(readSQL, cols, c.pluginSpec.ProjectID, c.pluginSpec.DatasetID, table.Name) q := c.client.Query(stmt) q.Parameters = []bigquery.QueryParameter{ { diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index ea4ac4347d5501..b7b9481b67a9e0 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 golang.org/x/sync v0.1.0 google.golang.org/api v0.103.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 7dbca95224b2f9..3e6877fa62ef57 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -55,6 +55,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/csv/client/client_test.go b/plugins/destination/csv/client/client_test.go index f4e839ba8a5074..090f6f55a4e75f 100644 --- a/plugins/destination/csv/client/client_test.go +++ b/plugins/destination/csv/client/client_test.go @@ -49,8 +49,9 @@ func TestPlugin(t *testing.T) { Directory: t.TempDir(), }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipMigrateAppend: true, }, ) } diff --git a/plugins/destination/csv/go.mod b/plugins/destination/csv/go.mod index 7af9e2e74b4715..77ba0cc5e5fa13 100644 --- a/plugins/destination/csv/go.mod +++ b/plugins/destination/csv/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/csv go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.16.1 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/csv/go.sum b/plugins/destination/csv/go.sum index 1e58fd0fea1e28..4d51f4e70caff9 100644 --- a/plugins/destination/csv/go.sum +++ b/plugins/destination/csv/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.16.1 h1:FstBNQkdAFZRh5F3Y0ugL/pLTg/tPAzljxnpjNda4po= github.com/cloudquery/plugin-sdk v1.16.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/file/client/client_test.go b/plugins/destination/file/client/client_test.go index 40225bfba4d7de..faa7ff4124ab3a 100644 --- a/plugins/destination/file/client/client_test.go +++ b/plugins/destination/file/client/client_test.go @@ -16,8 +16,9 @@ func TestPluginCSV(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipMigrateAppend: true, }, ) } diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index b4765ff43d44c3..bee66f36777b24 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 594bf75a92a852..48096ddf913ef2 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -44,6 +44,8 @@ github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/gcs/client/client_test.go b/plugins/destination/gcs/client/client_test.go index d7a63b1e145d87..702a31bf84252a 100644 --- a/plugins/destination/gcs/client/client_test.go +++ b/plugins/destination/gcs/client/client_test.go @@ -19,9 +19,10 @@ func TestPluginCSV(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } @@ -37,9 +38,10 @@ func TestPluginJSON(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index dc0c80c4da20fa..616bbef0e6d54c 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 543b1242377e7d..0893ddd6f8d255 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -55,6 +55,8 @@ github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/kafka/client/client_test.go b/plugins/destination/kafka/client/client_test.go index de0e6f619bd825..518d65c5311063 100644 --- a/plugins/destination/kafka/client/client_test.go +++ b/plugins/destination/kafka/client/client_test.go @@ -32,6 +32,7 @@ func TestPgPlugin(t *testing.T) { MaxMetadataRetries: 15, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, + SkipOverwrite: true, + SkipMigrateAppend: true, }) } diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 28b365f757ef30..2b0410dea5c13d 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 62518b018629bc..f5e4b884ff4a90 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -47,6 +47,8 @@ github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/mongodb/client/read.go b/plugins/destination/mongodb/client/read.go index 64b5c52de634e4..68d80131de812f 100644 --- a/plugins/destination/mongodb/client/read.go +++ b/plugins/destination/mongodb/client/read.go @@ -14,6 +14,10 @@ func (*Client) createResultsArray(res bson.M, table *schema.Table) []any { results := make([]any, 0, len(table.Columns)) for _, col := range table.Columns { val := res[col.Name] + if val == nil { + results = append(results, nil) + continue + } switch col.Type { case schema.TypeBool: r := (val).(bool) diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index aa25a050603df4..69f511638aaa70 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 go.mongodb.org/mongo-driver v1.11.1 ) diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 3f643694ec10f7..ea6a8ad966fb16 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/neo4j/client/read.go b/plugins/destination/neo4j/client/read.go index 41c5b9f324c39b..9edc82add9096b 100644 --- a/plugins/destination/neo4j/client/read.go +++ b/plugins/destination/neo4j/client/read.go @@ -17,6 +17,10 @@ const ( func (*Client) createResultsArray(table *schema.Table, node *neo4j.Node) []any { results := make([]any, 0, len(table.Columns)) for _, col := range table.Columns { + if node.Props[col.Name] == nil { + results = append(results, nil) + continue + } switch col.Type { case schema.TypeBool: r := node.Props[col.Name].(bool) diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index dbc77b3c5eb709..80567a7f9bfb49 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/neo4j/neo4j-go-driver/v5 v5.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 6044b27f692d70..ddafb98f5aa2ca 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/postgresql/client/read.go b/plugins/destination/postgresql/client/read.go index fba1f6a02d624d..fa3b33e8fc2b8c 100644 --- a/plugins/destination/postgresql/client/read.go +++ b/plugins/destination/postgresql/client/read.go @@ -3,17 +3,23 @@ package client import ( "context" "fmt" + "strings" "github.com/cloudquery/plugin-sdk/schema" "github.com/jackc/pgx/v5" ) const ( - readSQL = "SELECT * FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" + readSQL = "SELECT %s FROM %s WHERE _cq_source_name = $1 order by _cq_sync_time asc" ) func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - sql := fmt.Sprintf(readSQL, pgx.Identifier{table.Name}.Sanitize()) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, pgx.Identifier{col.Name}.Sanitize()) + } + cols := strings.Join(colNames, ",") + sql := fmt.Sprintf(readSQL, cols, pgx.Identifier{table.Name}.Sanitize()) rows, err := c.conn.Query(ctx, sql, sourceName) if err != nil { return err diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 487a9f0e79de13..2298aafd8bfd9b 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.18.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v5 v5.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index f22b35a723a8e5..e7af5618587aab 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.18.0 h1:8n78JWjqeunEaIT2WNTE/jMbAFvDxhX4f8TnwgUX48I= github.com/cloudquery/plugin-sdk v1.18.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/s3/client/client_test.go b/plugins/destination/s3/client/client_test.go index 4fac6c77c94e72..b6ad3b154f2955 100644 --- a/plugins/destination/s3/client/client_test.go +++ b/plugins/destination/s3/client/client_test.go @@ -19,9 +19,10 @@ func TestPluginCSV(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } @@ -37,9 +38,10 @@ func TestPluginJSON(t *testing.T) { NoRotate: true, }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, - SkipDeleteStale: true, - SkipSecondAppend: true, + SkipOverwrite: true, + SkipDeleteStale: true, + SkipSecondAppend: true, + SkipMigrateAppend: true, }, ) } diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 3b627e4e701d06..40576e6b26565d 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 3fd494ab030b5d..3796295df5b94f 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -82,6 +82,8 @@ github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/snowflake/client/client_test.go b/plugins/destination/snowflake/client/client_test.go index 8529e306ce75bd..00ec32ad400a09 100644 --- a/plugins/destination/snowflake/client/client_test.go +++ b/plugins/destination/snowflake/client/client_test.go @@ -14,6 +14,7 @@ func TestPlugin(t *testing.T) { ConnectionString: os.Getenv("SNOW_TEST_DSN"), }, destination.PluginTestSuiteTests{ - SkipOverwrite: true, + SkipOverwrite: true, + SkipMigrateAppend: true, // fails with `invalid identifier '"new_column"'`, maybe because delays in schema propagation? }) } diff --git a/plugins/destination/snowflake/client/read.go b/plugins/destination/snowflake/client/read.go index 81a8da8149bc50..b3342696b365f6 100644 --- a/plugins/destination/snowflake/client/read.go +++ b/plugins/destination/snowflake/client/read.go @@ -10,7 +10,7 @@ import ( ) const ( - readSQL = "SELECT * FROM %s WHERE \"_cq_source_name\" = ?" + readSQL = "SELECT %s FROM %s WHERE \"_cq_source_name\" = ?" ) // https://github.com/snowflakedb/gosnowflake/issues/674 @@ -40,6 +40,10 @@ func snowflakeStrToArray(val string) []string { func (*Client) createResultsArray(values []any, table *schema.Table) []any { results := make([]any, 0, len(table.Columns)) for i, col := range table.Columns { + if values[i] == nil { + results = append(results, nil) + continue + } switch col.Type { case schema.TypeBool: r := (*values[i].(*any)).(bool) @@ -98,7 +102,12 @@ func (*Client) createResultsArray(values []any, table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - stmt := fmt.Sprintf(readSQL, table.Name) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, `"`+col.Name+`"`) + } + cols := strings.Join(colNames, ", ") + stmt := fmt.Sprintf(readSQL, cols, table.Name) rows, err := c.db.Query(stmt, sourceName) if err != nil { return err diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index 5d1445af2e7eec..fffb723089537a 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 github.com/snowflakedb/gosnowflake v1.6.16 ) diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index b94288e95baade..f4b2a846239783 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -105,6 +105,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/sqlite/client/migrate.go b/plugins/destination/sqlite/client/migrate.go index 4aa55b7623c437..f7629ecca649b6 100644 --- a/plugins/destination/sqlite/client/migrate.go +++ b/plugins/destination/sqlite/client/migrate.go @@ -10,7 +10,7 @@ import ( ) const ( - isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name='?';" + isTableExistSQL = "SELECT count(name) FROM sqlite_master WHERE type='table' AND name=?;" // https://wiki.postgresql.org/wiki/Retrieve_primary_key_columns sqlTableInfo = "PRAGMA table_info('%s');" diff --git a/plugins/destination/sqlite/client/read.go b/plugins/destination/sqlite/client/read.go index 7bf7712d589c8d..7a0c62065da7ae 100644 --- a/plugins/destination/sqlite/client/read.go +++ b/plugins/destination/sqlite/client/read.go @@ -4,12 +4,13 @@ import ( "context" "database/sql" "fmt" + "strings" "github.com/cloudquery/plugin-sdk/schema" ) const ( - readSQL = `SELECT * FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` + readSQL = `SELECT %s FROM "%s" WHERE _cq_source_name = $1 order by _cq_sync_time asc` ) func (*Client) createResultsArray(table *schema.Table) []any { @@ -17,19 +18,19 @@ func (*Client) createResultsArray(table *schema.Table) []any { for _, col := range table.Columns { switch col.Type { case schema.TypeBool: - var r bool + var r *bool results = append(results, &r) case schema.TypeInt: - var r int + var r *int results = append(results, &r) case schema.TypeFloat: - var r float64 + var r *float64 results = append(results, &r) case schema.TypeUUID: - var r string + var r *string results = append(results, &r) case schema.TypeString: - var r string + var r *string results = append(results, &r) case schema.TypeByteArray: var r sql.RawBytes @@ -38,7 +39,7 @@ func (*Client) createResultsArray(table *schema.Table) []any { var r string results = append(results, &r) case schema.TypeTimestamp: - var r string + var r *string results = append(results, &r) case schema.TypeJSON: var r string @@ -47,19 +48,19 @@ func (*Client) createResultsArray(table *schema.Table) []any { var r string results = append(results, &r) case schema.TypeCIDR: - var r string + var r *string results = append(results, &r) case schema.TypeCIDRArray: var r string results = append(results, &r) case schema.TypeMacAddr: - var r string + var r *string results = append(results, &r) case schema.TypeMacAddrArray: var r string results = append(results, &r) case schema.TypeInet: - var r string + var r *string results = append(results, &r) case schema.TypeInetArray: var r string @@ -73,7 +74,12 @@ func (*Client) createResultsArray(table *schema.Table) []any { } func (c *Client) Read(ctx context.Context, table *schema.Table, sourceName string, res chan<- []any) error { - rows, err := c.db.Query(fmt.Sprintf(readSQL, table.Name), sourceName) + colNames := make([]string, 0, len(table.Columns)) + for _, col := range table.Columns { + colNames = append(colNames, `"`+col.Name+`"`) + } + cols := strings.Join(colNames, ", ") + rows, err := c.db.Query(fmt.Sprintf(readSQL, cols, table.Name), sourceName) if err != nil { return err } diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index f6b23c02969830..a916b82bf065ab 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index 460b47ced520ea..40aed11f80ce56 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index c655fde940215a..0052c9e8d2cc60 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.19.0 + github.com/cloudquery/plugin-sdk v1.21.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index abeab45e886571..3132c7ad1b3059 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= +github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From 0d1393cd2c10ac3c9c2eb30779761e1454c94e50 Mon Sep 17 00:00:00 2001 From: Liu Shaohui Date: Fri, 6 Jan 2023 19:59:11 +0800 Subject: [PATCH 033/221] fix(k8s): Fix a typo in source/k8s/views/resource.sql: cq_table -> _cq_table (#6415) #### Summary The column name "cq_table" of k8s_resources view created by source/k8s/views/resource.sql is inconsistent with the dashboard config in source/k8s/grafana/asset_inventory.json which use column "_cq_table" Fix a typo by change: cq_table -> _cq_table in source/k8s/views/resource.sql If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/test/policy_cq_config.yml | 2 +- plugins/source/azure/test/policy_cq_config.yml | 2 +- plugins/source/gcp/test/policy_cq_config.yml | 2 +- plugins/source/k8s/test/policy_cq_config.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/aws/test/policy_cq_config.yml b/plugins/source/aws/test/policy_cq_config.yml index cd2316fee33975..f10d28593f803f 100644 --- a/plugins/source/aws/test/policy_cq_config.yml +++ b/plugins/source/aws/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.1" # latest version of postgresql plugin + version: "v2.0.2" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/azure/test/policy_cq_config.yml b/plugins/source/azure/test/policy_cq_config.yml index 67f43088ad2f8d..fbb8d20dcb8cd5 100644 --- a/plugins/source/azure/test/policy_cq_config.yml +++ b/plugins/source/azure/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.1" # latest version of postgresql plugin + version: "v2.0.2" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/gcp/test/policy_cq_config.yml b/plugins/source/gcp/test/policy_cq_config.yml index ee7b01ea92eacc..dae99a21f08b9b 100644 --- a/plugins/source/gcp/test/policy_cq_config.yml +++ b/plugins/source/gcp/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.1" # latest version of postgresql plugin + version: "v2.0.2" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index 72ca9d3b01223f..0f15345fd274a4 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.1" # latest version of postgresql plugin + version: "v2.0.2" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From 499f421fa96b2d3c63f0679b32e00f98cc0da4b3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 21:54:03 +0200 Subject: [PATCH 046/221] fix: Update endpoints (#6440) This PR was created by a scheduled workflow to sync endpoint changes --- plugins/source/aws/client/data/partition_service_region.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/source/aws/client/data/partition_service_region.json b/plugins/source/aws/client/data/partition_service_region.json index 40acc5a6acb195..3c87c013e4285b 100644 --- a/plugins/source/aws/client/data/partition_service_region.json +++ b/plugins/source/aws/client/data/partition_service_region.json @@ -6744,6 +6744,11 @@ "cn-northwest-1": {} } }, + "kinesisvideo": { + "regions": { + "cn-north-1": {} + } + }, "kms": { "regions": { "cn-north-1": {}, From 0643132b9368af003bedc3fc605211b7f7288a2a Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Fri, 6 Jan 2023 15:55:10 -0500 Subject: [PATCH 047/221] feat(snyk): Migrate codegen to transformations (#6442) --- plugins/source/snyk/Makefile | 7 +- plugins/source/snyk/codegen/main.go | 15 --- .../source/snyk/codegen/resources/columns.go | 12 --- .../snyk/codegen/resources/description.go | 10 -- .../source/snyk/codegen/resources/fetch.go | 9 -- .../source/snyk/codegen/resources/generate.go | 97 ------------------- .../source/snyk/codegen/resources/recipes.go | 47 --------- .../source/snyk/codegen/resources/resource.go | 50 ---------- .../source/snyk/codegen/resources/schema.go | 22 ----- .../source/snyk/codegen/resources/tables.go | 35 ------- .../source/snyk/codegen/resources/template.go | 25 ----- .../resources/templates/resource.go.tpl | 18 ---- .../codegen/resources/templates/tables.go.tpl | 18 ---- .../snyk/codegen/resources/transformers.go | 21 ---- .../source/snyk/codegen/resources/write.go | 22 ----- .../snyk/docs/tables/snyk_integrations.md | 2 +- .../snyk/docs/tables/snyk_organizations.md | 2 +- .../services/dependency/dependencies.go | 85 +--------------- .../services/integration/integrations.go | 15 +-- .../services/organization/organizations.go | 25 +---- .../resources/services/project/projects.go | 15 +-- 21 files changed, 15 insertions(+), 537 deletions(-) delete mode 100644 plugins/source/snyk/codegen/main.go delete mode 100644 plugins/source/snyk/codegen/resources/columns.go delete mode 100644 plugins/source/snyk/codegen/resources/description.go delete mode 100644 plugins/source/snyk/codegen/resources/fetch.go delete mode 100644 plugins/source/snyk/codegen/resources/generate.go delete mode 100644 plugins/source/snyk/codegen/resources/recipes.go delete mode 100644 plugins/source/snyk/codegen/resources/resource.go delete mode 100644 plugins/source/snyk/codegen/resources/schema.go delete mode 100644 plugins/source/snyk/codegen/resources/tables.go delete mode 100644 plugins/source/snyk/codegen/resources/template.go delete mode 100644 plugins/source/snyk/codegen/resources/templates/resource.go.tpl delete mode 100644 plugins/source/snyk/codegen/resources/templates/tables.go.tpl delete mode 100644 plugins/source/snyk/codegen/resources/transformers.go delete mode 100644 plugins/source/snyk/codegen/resources/write.go diff --git a/plugins/source/snyk/Makefile b/plugins/source/snyk/Makefile index feca6cee4433a2..a00d68cfdab2c2 100644 --- a/plugins/source/snyk/Makefile +++ b/plugins/source/snyk/Makefile @@ -7,11 +7,6 @@ test: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - .PHONY: gen-docs gen-docs: rm -rf ./docs/tables/* @@ -20,4 +15,4 @@ gen-docs: # All gen targets .PHONY: gen -gen: gen-code gen-docs +gen: gen-docs diff --git a/plugins/source/snyk/codegen/main.go b/plugins/source/snyk/codegen/main.go deleted file mode 100644 index bdf0d081b2beec..00000000000000 --- a/plugins/source/snyk/codegen/main.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -import ( - "context" - "log" - - "github.com/cloudquery/cloudquery/plugins/source/snyk/codegen/resources" -) - -func main() { - err := resources.Generate(context.Background()) - if err != nil { - log.Fatal(err) - } -} diff --git a/plugins/source/snyk/codegen/resources/columns.go b/plugins/source/snyk/codegen/resources/columns.go deleted file mode 100644 index 60df30d7983165..00000000000000 --- a/plugins/source/snyk/codegen/resources/columns.go +++ /dev/null @@ -1,12 +0,0 @@ -package resources - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -var organizationIDCol = codegen.ColumnDefinition{ - Name: "organization_id", - Type: schema.TypeString, - Resolver: "client.ResolveOrganizationID", -} diff --git a/plugins/source/snyk/codegen/resources/description.go b/plugins/source/snyk/codegen/resources/description.go deleted file mode 100644 index 236ce7185f8bd8..00000000000000 --- a/plugins/source/snyk/codegen/resources/description.go +++ /dev/null @@ -1,10 +0,0 @@ -package resources - -import ( - "reflect" -) - -func (r *Resource) description() string { - typ := reflect.TypeOf(r.Struct).Elem() - return "https://pkg.go.dev/" + typ.PkgPath() + "#" + typ.Name() -} diff --git a/plugins/source/snyk/codegen/resources/fetch.go b/plugins/source/snyk/codegen/resources/fetch.go deleted file mode 100644 index 81ceca478774b2..00000000000000 --- a/plugins/source/snyk/codegen/resources/fetch.go +++ /dev/null @@ -1,9 +0,0 @@ -package resources - -import ( - "github.com/iancoleman/strcase" -) - -func (r *Resource) fetcherName() string { - return "fetch" + strcase.ToCamel(r.SubService) -} diff --git a/plugins/source/snyk/codegen/resources/generate.go b/plugins/source/snyk/codegen/resources/generate.go deleted file mode 100644 index 64a99e99d1ede2..00000000000000 --- a/plugins/source/snyk/codegen/resources/generate.go +++ /dev/null @@ -1,97 +0,0 @@ -package resources - -import ( - "context" - "fmt" - "os" - "path" - "runtime" - "strings" - - "github.com/cloudquery/plugin-sdk/codegen" - "golang.org/x/exp/slices" - "golang.org/x/sync/errgroup" -) - -func Generate(ctx context.Context) error { - resources := recipes() - - grp, _ := errgroup.WithContext(ctx) - for _, resource := range resources { - grp.Go(resource.generate) - } - - if err := grp.Wait(); err != nil { - return err - } - - return tables(resources) -} - -func (r *Resource) generate() error { - r.sanitize() - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - - dir := path.Dir(filename) - dir = path.Join(dir, "../../resources/services", r.Service) - if err := os.MkdirAll(dir, os.ModePerm); err != nil { - return fmt.Errorf("failed to create directory %s: %w", dir, err) - } - - name := fmt.Sprintf("snyk_%s_%s", r.Service, r.SubService) - if r.Name != "" { - name = r.Name - } - - fmt.Println("generate", name) - for _, child := range r.Children { - if err := child.generate(); err != nil { - return err - } - } - - var err error - opts := []codegen.TableOption{ - codegen.WithExtraColumns(r.ExtraColumns), - codegen.WithPKColumns("id"), - // codegen.WithNameTransformer(nameTransformer), - } - - // All table names must be plural - if !strings.HasSuffix(name, "s") { - return fmt.Errorf("invalid table name: %s. must be plural", name) - } - - r.table, err = codegen.NewTableFromStruct( - name, - r.Struct, - opts..., - ) - if err != nil { - return fmt.Errorf("error generating %s: %w", name, err) - } - r.table.Description = r.description() - r.table.Resolver = r.fetcherName() - if len(r.PreResolver) > 0 { - r.table.PreResourceResolver = r.PreResolver - } - if len(r.PostResolver) > 0 { - r.table.PostResourceResolver = r.PostResolver - } - if len(r.Multiplex) > 0 { - r.table.Multiplex = r.Multiplex - } - for _, child := range r.Children { - r.table.Relations = append(r.table.Relations, csr.ToCamel(child.SubService)+"()") - } - slices.Sort(r.table.Relations) - - if err := r.generateSchema(dir); err != nil { - return err - } - - return nil -} diff --git a/plugins/source/snyk/codegen/resources/recipes.go b/plugins/source/snyk/codegen/resources/recipes.go deleted file mode 100644 index 0fd1c707a45f9d..00000000000000 --- a/plugins/source/snyk/codegen/resources/recipes.go +++ /dev/null @@ -1,47 +0,0 @@ -package resources - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/pavel-snyk/snyk-sdk-go/snyk" -) - -func recipes() []*Resource { - return []*Resource{ - { - Name: "snyk_dependencies", - Struct: new(snyk.Dependency), - Service: "dependency", - SubService: "dependencies", - Multiplex: "client.ByOrganization", - }, - { - Name: "snyk_organizations", - Struct: new(snyk.Organization), - Service: "organization", - Multiplex: "client.SingleOrganization", - }, - { - Name: "snyk_integrations", - Struct: new(snyk.Integration), - Service: "integration", - ExtraColumns: codegen.ColumnDefinitions{ - organizationIDCol, - codegen.ColumnDefinition{ - Name: "settings", - Type: schema.TypeJSON, - Resolver: "getIntegrationSettings", - }, - }, - Multiplex: "client.ByOrganization", - PreResolver: "getIntegration", - }, - { - Name: "snyk_projects", - Struct: new(snyk.Project), - Service: "project", - ExtraColumns: codegen.ColumnDefinitions{organizationIDCol}, - Multiplex: "client.ByOrganization", - }, - } -} diff --git a/plugins/source/snyk/codegen/resources/resource.go b/plugins/source/snyk/codegen/resources/resource.go deleted file mode 100644 index dda8c8593aa0eb..00000000000000 --- a/plugins/source/snyk/codegen/resources/resource.go +++ /dev/null @@ -1,50 +0,0 @@ -package resources - -import ( - "reflect" - "strings" - - "github.com/cloudquery/plugin-sdk/codegen" -) - -type Resource struct { - Name string - Struct any - Service string - SubService string - - Multiplex string - ExtraColumns codegen.ColumnDefinitions - - Children []*Resource - parent *Resource - - PreResolver string - PostResolver string - - table *codegen.TableDefinition -} - -func (r *Resource) sanitize() { - for _, child := range r.Children { - child.parent = r - if len(child.Service) == 0 { - child.Service = r.Service - } - } - - if len(r.SubService) == 0 { - r.SubService = csr.ToSnake(reflect.TypeOf(r.Struct).Elem().Name()) - if !strings.HasSuffix(r.SubService, "s") { - r.SubService += "s" - } - } -} - -func (r *Resource) Table() *codegen.TableDefinition { - return r.table -} - -func (r *Resource) Parent() *Resource { - return r.parent -} diff --git a/plugins/source/snyk/codegen/resources/schema.go b/plugins/source/snyk/codegen/resources/schema.go deleted file mode 100644 index 624d4db0859764..00000000000000 --- a/plugins/source/snyk/codegen/resources/schema.go +++ /dev/null @@ -1,22 +0,0 @@ -package resources - -import ( - "bytes" - "fmt" - "path" -) - -func (r *Resource) generateSchema(dir string) error { - tpl, err := parse("resource") - if err != nil { - return fmt.Errorf("failed to parse templates: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - - filePath := path.Join(dir, r.SubService+".go") - return write(filePath, buff.Bytes()) -} diff --git a/plugins/source/snyk/codegen/resources/tables.go b/plugins/source/snyk/codegen/resources/tables.go deleted file mode 100644 index ed9aedf46f92a4..00000000000000 --- a/plugins/source/snyk/codegen/resources/tables.go +++ /dev/null @@ -1,35 +0,0 @@ -package resources - -import ( - "bytes" - "fmt" - "path" - "runtime" - - "golang.org/x/exp/slices" -) - -func tables(resources []*Resource) error { - tpl, err := parse("tables") - if err != nil { - return err - } - - sorted := make([]*Resource, len(resources)) - copy(sorted, resources) - slices.SortFunc(sorted, func(a, b *Resource) bool { return a.Name < b.Name }) - - var buff bytes.Buffer - if err := tpl.Execute(&buff, sorted); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - - filePath := path.Join(path.Dir(filename), "../../resources/plugin/tables.go") - - return write(filePath, buff.Bytes()) -} diff --git a/plugins/source/snyk/codegen/resources/template.go b/plugins/source/snyk/codegen/resources/template.go deleted file mode 100644 index 29349c3d2ec1f1..00000000000000 --- a/plugins/source/snyk/codegen/resources/template.go +++ /dev/null @@ -1,25 +0,0 @@ -package resources - -import ( - "embed" - "strings" - "text/template" - - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/iancoleman/strcase" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func parse(name string) (*template.Template, error) { - tpl, err := template.New(name+".go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToLower": strings.ToLower, - "ToLowerCamel": strcase.ToLowerCamel, - }).ParseFS(templatesFS, "templates/*.go.tpl") - if err != nil { - return nil, err - } - return tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") -} diff --git a/plugins/source/snyk/codegen/resources/templates/resource.go.tpl b/plugins/source/snyk/codegen/resources/templates/resource.go.tpl deleted file mode 100644 index 82bd8595f1f8e9..00000000000000 --- a/plugins/source/snyk/codegen/resources/templates/resource.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{ .Service }} - -import ( - "github.com/cloudquery/plugin-sdk/schema" - {{- if or .ExtraColumns .Multiplex }} - "github.com/cloudquery/cloudquery/plugins/source/snyk/client" - {{- end }} -) - -{{- if .Parent }} -func {{.SubService | ToLowerCamel}}() *schema.Table { -{{- else }} -func {{.SubService | ToCamel}}() *schema.Table { -{{- end }} - return &schema.Table{{template "table.go.tpl" .Table}} -} \ No newline at end of file diff --git a/plugins/source/snyk/codegen/resources/templates/tables.go.tpl b/plugins/source/snyk/codegen/resources/templates/tables.go.tpl deleted file mode 100644 index 2eb17f25e1c3ef..00000000000000 --- a/plugins/source/snyk/codegen/resources/templates/tables.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package plugin - -import ( - "github.com/cloudquery/plugin-sdk/schema" -{{- range . }} - "github.com/cloudquery/cloudquery/plugins/source/snyk/resources/services/{{ .Service }}" -{{- end }} -) - -func tables() []*schema.Table { - return []*schema.Table{ - {{- range . }} - {{ .Service }}.{{ .SubService | ToCamel }}(), - {{- end }} - } -} diff --git a/plugins/source/snyk/codegen/resources/transformers.go b/plugins/source/snyk/codegen/resources/transformers.go deleted file mode 100644 index d775f27b9245be..00000000000000 --- a/plugins/source/snyk/codegen/resources/transformers.go +++ /dev/null @@ -1,21 +0,0 @@ -package resources - -import ( - "reflect" - - "github.com/cloudquery/plugin-sdk/caser" -) - -var csr = caser.New( - caser.WithCustomInitialisms( - map[string]bool{ - "ACL": true, - "DERP": true, - "SSH": true, - }, - ), -) - -func nameTransformer(f reflect.StructField) (string, error) { - return csr.ToSnake(f.Name), nil -} diff --git a/plugins/source/snyk/codegen/resources/write.go b/plugins/source/snyk/codegen/resources/write.go deleted file mode 100644 index 80d9421f55ae7a..00000000000000 --- a/plugins/source/snyk/codegen/resources/write.go +++ /dev/null @@ -1,22 +0,0 @@ -package resources - -import ( - "fmt" - "go/format" - "os" -) - -// write will format data as Go code & write it fo file -func write(path string, data []byte) error { - formatted, err := format.Source(data) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", path, err) - } else { - data = formatted - } - - if err := os.WriteFile(path, data, 0o644); err != nil { - return fmt.Errorf("failed to write file %s: %w", path, err) - } - return nil -} diff --git a/plugins/source/snyk/docs/tables/snyk_integrations.md b/plugins/source/snyk/docs/tables/snyk_integrations.md index 61cfcdeac15250..4c8f7eaa017877 100644 --- a/plugins/source/snyk/docs/tables/snyk_integrations.md +++ b/plugins/source/snyk/docs/tables/snyk_integrations.md @@ -14,6 +14,6 @@ The primary key for this table is **id**. |_cq_parent_id|UUID| |organization_id|String| |settings|JSON| -|credentials|JSON| |id (PK)|String| +|credentials|JSON| |type|String| \ No newline at end of file diff --git a/plugins/source/snyk/docs/tables/snyk_organizations.md b/plugins/source/snyk/docs/tables/snyk_organizations.md index 7d99bfa4e9716e..3bcf0e7a81b9a4 100644 --- a/plugins/source/snyk/docs/tables/snyk_organizations.md +++ b/plugins/source/snyk/docs/tables/snyk_organizations.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|group|JSON| |id (PK)|String| +|group|JSON| |name|String| |slug|String| |url|String| \ No newline at end of file diff --git a/plugins/source/snyk/resources/services/dependency/dependencies.go b/plugins/source/snyk/resources/services/dependency/dependencies.go index 5e39a22a75e970..3fe6456a724a66 100644 --- a/plugins/source/snyk/resources/services/dependency/dependencies.go +++ b/plugins/source/snyk/resources/services/dependency/dependencies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dependency import ( "github.com/cloudquery/cloudquery/plugins/source/snyk/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/pavel-snyk/snyk-sdk-go/snyk" ) func Dependencies() *schema.Table { @@ -13,6 +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", @@ -22,86 +23,6 @@ func Dependencies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "latest_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("LatestVersion"), - }, - { - Name: "latest_version_published_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestVersionPublishedDate"), - }, - { - Name: "first_published_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("FirstPublishedDate"), - }, - { - Name: "is_deprecated", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsDeprecated"), - }, - { - Name: "deprecated_versions", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DeprecatedVersions"), - }, - { - Name: "dependencies_with_issues", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DependenciesWithIssues"), - }, - { - Name: "issues_critical", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IssuesCritical"), - }, - { - Name: "issues_high", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IssuesHigh"), - }, - { - Name: "issues_medium", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IssuesMedium"), - }, - { - Name: "issues_low", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IssuesLow"), - }, - { - Name: "licenses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Licenses"), - }, - { - Name: "projects", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Projects"), - }, - { - Name: "copyright", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Copyright"), - }, }, } } diff --git a/plugins/source/snyk/resources/services/integration/integrations.go b/plugins/source/snyk/resources/services/integration/integrations.go index 819bb2b76d6e52..1686a143c94f19 100644 --- a/plugins/source/snyk/resources/services/integration/integrations.go +++ b/plugins/source/snyk/resources/services/integration/integrations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package integration import ( "github.com/cloudquery/cloudquery/plugins/source/snyk/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/pavel-snyk/snyk-sdk-go/snyk" ) func Integrations() *schema.Table { @@ -14,6 +14,7 @@ func Integrations() *schema.Table { Resolver: fetchIntegrations, PreResourceResolver: getIntegration, Multiplex: client.ByOrganization, + Transform: transformers.TransformWithStruct(&snyk.Integration{}), Columns: []schema.Column{ { Name: "organization_id", @@ -25,11 +26,6 @@ func Integrations() *schema.Table { Type: schema.TypeJSON, Resolver: getIntegrationSettings, }, - { - Name: "credentials", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Credentials"), - }, { Name: "id", Type: schema.TypeString, @@ -38,11 +34,6 @@ func Integrations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/snyk/resources/services/organization/organizations.go b/plugins/source/snyk/resources/services/organization/organizations.go index 9c6a147598360d..41bcbb27270213 100644 --- a/plugins/source/snyk/resources/services/organization/organizations.go +++ b/plugins/source/snyk/resources/services/organization/organizations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package organization import ( "github.com/cloudquery/cloudquery/plugins/source/snyk/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/pavel-snyk/snyk-sdk-go/snyk" ) func Organizations() *schema.Table { @@ -13,12 +13,8 @@ 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: "group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Group"), - }, { Name: "id", Type: schema.TypeString, @@ -27,21 +23,6 @@ func Organizations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "slug", - Type: schema.TypeString, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, }, } } diff --git a/plugins/source/snyk/resources/services/project/projects.go b/plugins/source/snyk/resources/services/project/projects.go index 714c3179c23690..597e7ef976a306 100644 --- a/plugins/source/snyk/resources/services/project/projects.go +++ b/plugins/source/snyk/resources/services/project/projects.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package project import ( "github.com/cloudquery/cloudquery/plugins/source/snyk/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/pavel-snyk/snyk-sdk-go/snyk" ) func Projects() *schema.Table { @@ -13,6 +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", @@ -27,16 +28,6 @@ func Projects() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "origin", - Type: schema.TypeString, - Resolver: schema.PathResolver("Origin"), - }, }, } } From b91ca037c14a6e228ef0e95d54757757f505b747 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:33:39 +0200 Subject: [PATCH 048/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/codebuild to v1.20.0 (#6444) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/codebuild](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.19.21` -> `v1.20.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.20.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/codebuild/v1.19.21...service/codebuild/v1.20.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/codebuild/v1.19.21...service/codebuild/v1.20.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 6f0b5453b280da..1cdd0cb88fedb9 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index df2e92273a5ab2..af0e9ad410b4be 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -92,8 +92,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 h1:6VwY6q6RZwxZTTTXjDmS8 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1/go.mod h1:th8fks2kW4FFCUKUQenuEG9TEzMLVxeL0ckdJn/QVbI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 h1:Ai+CjJw+5/s3r6k5pggzDuFhWor2U3iwtsrmvN0Hczc= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0/go.mod h1:xHK1ta0bQEa5jL6rahKRJvsibjzDO7NTIs5itzsF4w8= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21 h1:UQ6xFsV/IyOg+0on4vsna3qTsEBHr35tpR0ZTXSSdZI= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.21/go.mod h1:8qcyoqQjYm4jOQApmG43LtHG9ZehKXyCzAq2n+B/v2s= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 h1:7v1hy+4DUc2mLhV4WMzv+YuShj0zbqLW+WMCHqzDPyk= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0/go.mod h1:8qcyoqQjYm4jOQApmG43LtHG9ZehKXyCzAq2n+B/v2s= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 h1:yqd0C0Zrgu8y9CeDW3YUyELa5BH8e8Q5FBERzxRCWGQ= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21/go.mod h1:CZzLW6TnEwqFDs9BcgSVB7lbUe4KGuspzmMHGAwBTow= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6 h1:Xh64I0AGrji+nE8otxK6J4d1us9aHk7tYutn70yuVS4= From c93c3059e570dbace6a6cf18f0f48b8dcfcff449 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:50:11 +0200 Subject: [PATCH 049/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentity to v1.15.0 (#6446) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cognitoidentity](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.14.6` -> `v1.15.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.15.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cognitoidentity/v1.14.6...v1.15.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cognitoidentity/v1.14.6...v1.15.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 1cdd0cb88fedb9..f58f142b2e2084 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 github.com/aws/aws-sdk-go-v2/service/configservice v1.28.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index af0e9ad410b4be..47f6c9ea1541b2 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -96,8 +96,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 h1:7v1hy+4DUc2mLhV4WMzv+Y github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0/go.mod h1:8qcyoqQjYm4jOQApmG43LtHG9ZehKXyCzAq2n+B/v2s= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 h1:yqd0C0Zrgu8y9CeDW3YUyELa5BH8e8Q5FBERzxRCWGQ= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21/go.mod h1:CZzLW6TnEwqFDs9BcgSVB7lbUe4KGuspzmMHGAwBTow= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6 h1:Xh64I0AGrji+nE8otxK6J4d1us9aHk7tYutn70yuVS4= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.6/go.mod h1:Aih6A0KgGM80Igtyh4HZeKAaH7uuHpK0peQU1Z5+T4U= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 h1:gEO985266S4UHk317zoxb8w1Ng0cF9+ICf0R8daHNTE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0/go.mod h1:Aih6A0KgGM80Igtyh4HZeKAaH7uuHpK0peQU1Z5+T4U= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 h1:swyj/SiBWn1wu8MHk4xQ7rw0wXSUrr144xQDEYkCDdc= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4/go.mod h1:ptcvvcDMc0lkuPjU6NFgSgptt6WeARIADRPsUJMDGLU= github.com/aws/aws-sdk-go-v2/service/configservice v1.28.2 h1:h1r/OjBFVeoQM6ykIg1WbuSeiVf4qUQfWcdCmZ1W+Bs= From 2433cbe134d1f5041eb7cfb7e08dbfa783f47f6a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:07:24 +0200 Subject: [PATCH 050/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/configservice to v1.29.0 (#6448) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/configservice](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.28.2` -> `v1.29.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.29.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/configservice/v1.28.2...service/configservice/v1.29.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/configservice/v1.28.2...service/configservice/v1.29.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index f58f142b2e2084..2539aa32112add 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 - github.com/aws/aws-sdk-go-v2/service/configservice v1.28.2 + github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 github.com/aws/aws-sdk-go-v2/service/dax v1.11.21 github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 47f6c9ea1541b2..884016ca7197f3 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -100,8 +100,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 h1:gEO985266S4UHk31 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0/go.mod h1:Aih6A0KgGM80Igtyh4HZeKAaH7uuHpK0peQU1Z5+T4U= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 h1:swyj/SiBWn1wu8MHk4xQ7rw0wXSUrr144xQDEYkCDdc= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4/go.mod h1:ptcvvcDMc0lkuPjU6NFgSgptt6WeARIADRPsUJMDGLU= -github.com/aws/aws-sdk-go-v2/service/configservice v1.28.2 h1:h1r/OjBFVeoQM6ykIg1WbuSeiVf4qUQfWcdCmZ1W+Bs= -github.com/aws/aws-sdk-go-v2/service/configservice v1.28.2/go.mod h1:Ff8A1VXTt1C8H99/YJDAINMO6Pqkv0aypgZdTVqy1dc= +github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 h1:qBGGajtPc2mZByb2ytZeeLFiBtrlWpzrntKPuZooVFo= +github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0/go.mod h1:Ff8A1VXTt1C8H99/YJDAINMO6Pqkv0aypgZdTVqy1dc= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 h1:nGKPtKOw5sp7/SXJY0oK8VEoBC9S8H1E6TQon9jaPOk= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3/go.mod h1:pOl6OyO4afJ52vesM08ugFIMaIj/GLcHq7jNPcvUNTI= github.com/aws/aws-sdk-go-v2/service/dax v1.11.21 h1:aHnMhjnvv/+9va80rs0uMsq5iAxbcSniiYe4ip63AqU= From da537c6d28a10e4334ca42a2180bae763159146b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:24:21 +0200 Subject: [PATCH 051/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/dax to v1.12.0 (#6450) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/dax](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.11.21` -> `v1.12.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.12.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/dax/v1.11.21...v1.12.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/dax/v1.11.21...v1.12.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2539aa32112add..1156d809daed29 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 - github.com/aws/aws-sdk-go-v2/service/dax v1.11.21 + github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 github.com/aws/aws-sdk-go-v2/service/docdb v1.19.18 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 884016ca7197f3..a64f597ecb5429 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -104,8 +104,8 @@ github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 h1:qBGGajtPc2mZByb2yt github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0/go.mod h1:Ff8A1VXTt1C8H99/YJDAINMO6Pqkv0aypgZdTVqy1dc= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 h1:nGKPtKOw5sp7/SXJY0oK8VEoBC9S8H1E6TQon9jaPOk= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3/go.mod h1:pOl6OyO4afJ52vesM08ugFIMaIj/GLcHq7jNPcvUNTI= -github.com/aws/aws-sdk-go-v2/service/dax v1.11.21 h1:aHnMhjnvv/+9va80rs0uMsq5iAxbcSniiYe4ip63AqU= -github.com/aws/aws-sdk-go-v2/service/dax v1.11.21/go.mod h1:kIbK4cfyQbe0Rq0iD3x8jgDcIbmHlEtBp9QxDT5eU4Q= +github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 h1:g2wSKHbwjpIc9xtp/iRcDFLsK+U+qtcPlgjjlwilTJI= +github.com/aws/aws-sdk-go-v2/service/dax v1.12.0/go.mod h1:kIbK4cfyQbe0Rq0iD3x8jgDcIbmHlEtBp9QxDT5eU4Q= github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 h1:Qu4RzizX0ETpYIg3Bcoe4rc/H9ogKC/2UACmBqkaFmY= github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25/go.mod h1:26OrZdg3uBa9JFHpzIzXhhaZTkIr22Qcju15mzwJqMU= github.com/aws/aws-sdk-go-v2/service/docdb v1.19.18 h1:6J0Sf+2jBbbdBmDC5ps5f93LACae/nHg1JPGWFoR8kQ= From 472536a5a39c2d9176adbe3db2ca2f4b192ff2df Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 03:42:58 +0200 Subject: [PATCH 052/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/docdb to v1.20.0 (#6452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/docdb](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.19.18` -> `v1.20.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.20.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/codebuild/v1.19.21...service/codebuild/v1.20.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/docdb/v1.19.18...service/docdb/v1.20.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 1156d809daed29..fa74ec85417578 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 - github.com/aws/aws-sdk-go-v2/service/docdb v1.19.18 + github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.17.25 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a64f597ecb5429..e2e2b5cf67cceb 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -108,8 +108,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 h1:g2wSKHbwjpIc9xtp/iRcDFLsK+U+ github.com/aws/aws-sdk-go-v2/service/dax v1.12.0/go.mod h1:kIbK4cfyQbe0Rq0iD3x8jgDcIbmHlEtBp9QxDT5eU4Q= github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 h1:Qu4RzizX0ETpYIg3Bcoe4rc/H9ogKC/2UACmBqkaFmY= github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25/go.mod h1:26OrZdg3uBa9JFHpzIzXhhaZTkIr22Qcju15mzwJqMU= -github.com/aws/aws-sdk-go-v2/service/docdb v1.19.18 h1:6J0Sf+2jBbbdBmDC5ps5f93LACae/nHg1JPGWFoR8kQ= -github.com/aws/aws-sdk-go-v2/service/docdb v1.19.18/go.mod h1:L5e0d7YdvUtAiG6AAQqFi5mM1kHkLz32qkoYvZLm1qU= +github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 h1:ig+1+lWeM02O6G7fweMxncbnPIvsTxNcBfeL0Ym3Tjg= +github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0/go.mod h1:L5e0d7YdvUtAiG6AAQqFi5mM1kHkLz32qkoYvZLm1qU= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 h1:b5IdivLEHiIPErQoNNLAt7sECZxnL9BT4Bvp7qxCTwQ= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9/go.mod h1:uP2wpt43//qh6NqMFslaRu53A2YbnFStkV4Wn1Ldels= github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 h1:m6HYlpZlTWb9vHuuRHpWRieqPHWlS0mvQ90OJNrG/Nk= From ecdbe985cc0834d3bc60708b48ef9769dd9a2a52 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 04:00:07 +0200 Subject: [PATCH 053/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/ecr to v1.18.0 (#6454) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/ecr](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.25` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/directconnect/v1.17.25...service/directconnect/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ecr/v1.17.25...service/ecr/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index fa74ec85417578..55eefb2b4e7299 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.17.25 + github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 github.com/aws/aws-sdk-go-v2/service/ecs v1.22.0 github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index e2e2b5cf67cceb..8a9a594fe705ed 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -114,8 +114,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 h1:b5IdivLEHiIPErQoNNLAt7s github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9/go.mod h1:uP2wpt43//qh6NqMFslaRu53A2YbnFStkV4Wn1Ldels= github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 h1:m6HYlpZlTWb9vHuuRHpWRieqPHWlS0mvQ90OJNrG/Nk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0/go.mod h1:mV0E7631M1eXdB+tlGFIw6JxfsC7Pz7+7Aw15oLVhZw= -github.com/aws/aws-sdk-go-v2/service/ecr v1.17.25 h1:1bido4Jtd8CG9JcheRITQMQ820RE6mw+ool5ln9jbtY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.17.25/go.mod h1:9yGOFsa2OcdyePojE89xNGtdBusTyc8ocjpiuFtFc0g= +github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 h1:5RVanD+P+L2W9WU07/8J/A52vnQi7F3ClBdWQttgYlg= +github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0/go.mod h1:9yGOFsa2OcdyePojE89xNGtdBusTyc8ocjpiuFtFc0g= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 h1:mAfbm9OuaKTQ/KweojB47hTHSRxf1Z3h721bOxLJjNY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22/go.mod h1:bBy8YiBBFd549EeySGjb0vHWg80XeMSigv/dr/2HFjE= github.com/aws/aws-sdk-go-v2/service/ecs v1.22.0 h1:Z5jcr24fuBhpA4uHRyU0jJ1pfzyFqzUrWvQ4Iwl5EGw= From 94b8b4c4dfc0c1c8bab2e05d5db59d1793193753 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 04:20:06 +0200 Subject: [PATCH 054/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/ecs to v1.23.0 (#6456) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/ecs](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.22.0` -> `v1.23.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.23.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/databasemigrationservice/v1.22.3...service/databasemigrationservice/v1.23.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.22.0...service/ecs/v1.23.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 55eefb2b4e7299..f6f3708244b8b5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 - github.com/aws/aws-sdk-go-v2/service/ecs v1.22.0 + github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 github.com/aws/aws-sdk-go-v2/service/eks v1.26.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 8a9a594fe705ed..30362b9987adb4 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -118,8 +118,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 h1:5RVanD+P+L2W9WU07/8J/A52vnQi github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0/go.mod h1:9yGOFsa2OcdyePojE89xNGtdBusTyc8ocjpiuFtFc0g= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 h1:mAfbm9OuaKTQ/KweojB47hTHSRxf1Z3h721bOxLJjNY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22/go.mod h1:bBy8YiBBFd549EeySGjb0vHWg80XeMSigv/dr/2HFjE= -github.com/aws/aws-sdk-go-v2/service/ecs v1.22.0 h1:Z5jcr24fuBhpA4uHRyU0jJ1pfzyFqzUrWvQ4Iwl5EGw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.22.0/go.mod h1:YXZ3cd8LDvvQytFpWjqbgdmHRAyJi4qbIT5dYdyhfeM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 h1:U1C52Ja15znyDMd+J5t9URqHyGBTN0hPZt1UHlDFa7U= +github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0/go.mod h1:YXZ3cd8LDvvQytFpWjqbgdmHRAyJi4qbIT5dYdyhfeM= github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 h1:V+qYxQTQObQAegchEMXSP2XXEe3ujqC3y7jU5Ww+9m4= github.com/aws/aws-sdk-go-v2/service/efs v1.18.3/go.mod h1:5MfwGfNzP7d86CrJKNCk7jawZLgBzO4N+X1q/4eYNN8= github.com/aws/aws-sdk-go-v2/service/eks v1.26.0 h1:YgH4p2ZmNkpsEWOB1xcd4ncvD+JACPhYy7o5EydX0m4= From 4a74a54e138f5271727281fbaeb5afaa5ff38303 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 04:37:10 +0200 Subject: [PATCH 055/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/eks to v1.27.0 (#6458) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/eks](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.26.0` -> `v1.27.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.27.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/eks/v1.26.0...service/eks/v1.27.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/eks/v1.26.0...service/eks/v1.27.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index f6f3708244b8b5..c1eaa39c11ba2d 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 - github.com/aws/aws-sdk-go-v2/service/eks v1.26.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.22 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 30362b9987adb4..a613fda90ff1cc 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -122,8 +122,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 h1:U1C52Ja15znyDMd+J5t9URqHyGBT github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0/go.mod h1:YXZ3cd8LDvvQytFpWjqbgdmHRAyJi4qbIT5dYdyhfeM= github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 h1:V+qYxQTQObQAegchEMXSP2XXEe3ujqC3y7jU5Ww+9m4= github.com/aws/aws-sdk-go-v2/service/efs v1.18.3/go.mod h1:5MfwGfNzP7d86CrJKNCk7jawZLgBzO4N+X1q/4eYNN8= -github.com/aws/aws-sdk-go-v2/service/eks v1.26.0 h1:YgH4p2ZmNkpsEWOB1xcd4ncvD+JACPhYy7o5EydX0m4= -github.com/aws/aws-sdk-go-v2/service/eks v1.26.0/go.mod h1:H/748RFDDxPmaxe03lhX0ufIQHIO2ctqjTfxuX4N7Vg= +github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 h1:ZXtMY5AgBS6YBtvrlKHSCLuIm5jtLKb/QaUhXH+vCsk= +github.com/aws/aws-sdk-go-v2/service/eks v1.27.0/go.mod h1:H/748RFDDxPmaxe03lhX0ufIQHIO2ctqjTfxuX4N7Vg= github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 h1:P3YfmNXT2nWjmduq/alZAy/G+BSX/6Kk2G4gS+v8pKk= github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0/go.mod h1:gnN6CtMag9be9XGXsMenh084NcSy5pO0hriEYz/TERk= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.22 h1:3PuyV/di5W2n98OZYBUXmEhmytGaoGCU4Qd3K9gQbMk= From 3333cfb377deebedd278632540987f1c9988b281 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 04:57:43 +0200 Subject: [PATCH 056/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk to v1.15.0 (#6460) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.14.22` -> `v1.15.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.15.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticbeanstalk/v1.14.22...v1.15.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticbeanstalk/v1.14.22...v1.15.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index c1eaa39c11ba2d..dcb59557dd5149 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.22 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.4 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a613fda90ff1cc..0f53b1fa3157a9 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -126,8 +126,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 h1:ZXtMY5AgBS6YBtvrlKHSCLuIm5jt github.com/aws/aws-sdk-go-v2/service/eks v1.27.0/go.mod h1:H/748RFDDxPmaxe03lhX0ufIQHIO2ctqjTfxuX4N7Vg= github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 h1:P3YfmNXT2nWjmduq/alZAy/G+BSX/6Kk2G4gS+v8pKk= github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0/go.mod h1:gnN6CtMag9be9XGXsMenh084NcSy5pO0hriEYz/TERk= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.22 h1:3PuyV/di5W2n98OZYBUXmEhmytGaoGCU4Qd3K9gQbMk= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.22/go.mod h1:txSsTeuqHfPwicYkpg3PoOXFOpERUL5colZaCaaa8D0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 h1:cBiPqmKWJexeZ987WqThao6MQb267ttB7869BeJirlA= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0/go.mod h1:txSsTeuqHfPwicYkpg3PoOXFOpERUL5colZaCaaa8D0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 h1:Iy28SRz2KfiGFtlj/HmLM5QPE+8K9I3bQPFx8Fo59OI= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25/go.mod h1:3OUv9SlYvymsCF3I5NftITc1+B09cF5lg4IsZgQQy1U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 h1:Ae7aH1PEbrVSg1fSQy33E/mILWd1Csncz95FMfxYWms= From bb7d3f29aef0ff6b8307664f2546cf9f497b3e6a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 05:19:22 +0200 Subject: [PATCH 057/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/codepipeline to v1.14.0 (#6445) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/codepipeline](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.21` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/codepipeline/v1.13.21...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/codepipeline/v1.13.21...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index dcb59557dd5149..e0a3482e6ccf0f 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0f53b1fa3157a9..0cd5e97a26daa8 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -94,8 +94,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 h1:Ai+CjJw+5/s3r6k5p github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0/go.mod h1:xHK1ta0bQEa5jL6rahKRJvsibjzDO7NTIs5itzsF4w8= github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 h1:7v1hy+4DUc2mLhV4WMzv+YuShj0zbqLW+WMCHqzDPyk= github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0/go.mod h1:8qcyoqQjYm4jOQApmG43LtHG9ZehKXyCzAq2n+B/v2s= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21 h1:yqd0C0Zrgu8y9CeDW3YUyELa5BH8e8Q5FBERzxRCWGQ= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.21/go.mod h1:CZzLW6TnEwqFDs9BcgSVB7lbUe4KGuspzmMHGAwBTow= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0 h1:vuUng/+gXtRZ0LhMpgPy1D/yOcIo58hCQuukZhLFIEI= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0/go.mod h1:CZzLW6TnEwqFDs9BcgSVB7lbUe4KGuspzmMHGAwBTow= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 h1:gEO985266S4UHk317zoxb8w1Ng0cF9+ICf0R8daHNTE= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0/go.mod h1:Aih6A0KgGM80Igtyh4HZeKAaH7uuHpK0peQU1Z5+T4U= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 h1:swyj/SiBWn1wu8MHk4xQ7rw0wXSUrr144xQDEYkCDdc= From 4ffbfd52267bb6386527d8f23df671b2752cbbde Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 05:38:58 +0200 Subject: [PATCH 058/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider to v1.22.0 (#6447) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.21.4` -> `v1.22.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.22.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cognitoidentityprovider/v1.21.4...service/cognitoidentityprovider/v1.22.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cognitoidentityprovider/v1.21.4...service/cognitoidentityprovider/v1.22.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e0a3482e6ccf0f..46fd27b5f6c1bc 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0cd5e97a26daa8..17901770e1d36c 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -98,8 +98,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0 h1:vuUng/+gXtRZ0LhMpgP github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0/go.mod h1:CZzLW6TnEwqFDs9BcgSVB7lbUe4KGuspzmMHGAwBTow= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 h1:gEO985266S4UHk317zoxb8w1Ng0cF9+ICf0R8daHNTE= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0/go.mod h1:Aih6A0KgGM80Igtyh4HZeKAaH7uuHpK0peQU1Z5+T4U= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4 h1:swyj/SiBWn1wu8MHk4xQ7rw0wXSUrr144xQDEYkCDdc= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.4/go.mod h1:ptcvvcDMc0lkuPjU6NFgSgptt6WeARIADRPsUJMDGLU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0 h1:pYLNx6zc/t3Vz1Jo4stU+FsSTeLnYvyyjvPjMIwb2hg= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0/go.mod h1:ptcvvcDMc0lkuPjU6NFgSgptt6WeARIADRPsUJMDGLU= github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 h1:qBGGajtPc2mZByb2ytZeeLFiBtrlWpzrntKPuZooVFo= github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0/go.mod h1:Ff8A1VXTt1C8H99/YJDAINMO6Pqkv0aypgZdTVqy1dc= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 h1:nGKPtKOw5sp7/SXJY0oK8VEoBC9S8H1E6TQon9jaPOk= From 9c2bb7c22a0cb5c8fd38708c311386bc6e36f19f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 05:55:57 +0200 Subject: [PATCH 059/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice to v1.23.0 (#6449) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/databasemigrationservice](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.22.3` -> `v1.23.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.23.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/databasemigrationservice/v1.22.3...service/databasemigrationservice/v1.23.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/databasemigrationservice/v1.22.3...service/databasemigrationservice/v1.23.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 46fd27b5f6c1bc..ca5c95bac4bb6c 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.15.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0 github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 17901770e1d36c..a197cfcdba77b0 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -102,8 +102,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0 h1:pYLNx6zc github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.22.0/go.mod h1:ptcvvcDMc0lkuPjU6NFgSgptt6WeARIADRPsUJMDGLU= github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 h1:qBGGajtPc2mZByb2ytZeeLFiBtrlWpzrntKPuZooVFo= github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0/go.mod h1:Ff8A1VXTt1C8H99/YJDAINMO6Pqkv0aypgZdTVqy1dc= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3 h1:nGKPtKOw5sp7/SXJY0oK8VEoBC9S8H1E6TQon9jaPOk= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.3/go.mod h1:pOl6OyO4afJ52vesM08ugFIMaIj/GLcHq7jNPcvUNTI= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0 h1:W0/T9iewJ2i3jGluQxUvfofTqhN6t4t39QamcVJvyWk= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0/go.mod h1:pOl6OyO4afJ52vesM08ugFIMaIj/GLcHq7jNPcvUNTI= github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 h1:g2wSKHbwjpIc9xtp/iRcDFLsK+U+qtcPlgjjlwilTJI= github.com/aws/aws-sdk-go-v2/service/dax v1.12.0/go.mod h1:kIbK4cfyQbe0Rq0iD3x8jgDcIbmHlEtBp9QxDT5eU4Q= github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 h1:Qu4RzizX0ETpYIg3Bcoe4rc/H9ogKC/2UACmBqkaFmY= From e282e8476eea9345fd7a41a72ee4eaaa2f26351a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 06:22:51 +0200 Subject: [PATCH 060/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice to v1.18.0 (#6463) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elasticsearchservice](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.4` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/directconnect/v1.17.25...service/directconnect/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticsearchservice/v1.17.4...service/elasticsearchservice/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index ca5c95bac4bb6c..2349f6b2bda8d9 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.4 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 github.com/aws/aws-sdk-go-v2/service/emr v1.21.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a197cfcdba77b0..3871eebd056800 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -132,8 +132,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 h1:Iy28SRz2Kf github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25/go.mod h1:3OUv9SlYvymsCF3I5NftITc1+B09cF5lg4IsZgQQy1U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 h1:Ae7aH1PEbrVSg1fSQy33E/mILWd1Csncz95FMfxYWms= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28/go.mod h1:ix71C17la8K2MUJrqJzu+i7+aPoQYTAy14hKQbGDB9w= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.4 h1:Ax1F+gXewXHPN2qMBV5RS04fYIJ9nggReQc1tvXR0mU= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.4/go.mod h1:XBRdG4B+BnZjICBUIVLD4++5TkX19Y28f6+PNhXvWWc= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 h1:WvtC9K3UTI6EJSQzITax3/TElN4WGCaOB7Ptocj7AMY= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0/go.mod h1:XBRdG4B+BnZjICBUIVLD4++5TkX19Y28f6+PNhXvWWc= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 h1:IVjbpLCY3u4QauMHSt4Aw+1hDlZojB4NDpW7YD31cAg= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21/go.mod h1:+oD0h85OfgOl9bQuBPHKMkO4iLO0URj/orDtsrsnsUE= github.com/aws/aws-sdk-go-v2/service/emr v1.21.0 h1:zS00brRiCTrzwbM9IoXATI56AYlSgW4mBPwotKmkslk= From f149f084163145ec03023122161e39899f2ab763 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 06:41:28 +0200 Subject: [PATCH 061/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/emr to v1.22.0 (#6465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/emr](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.21.0` -> `v1.22.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.22.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/emr/v1.21.0...service/emr/v1.22.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/emr/v1.21.0...service/emr/v1.22.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2349f6b2bda8d9..ed2d792df00bf3 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -46,7 +46,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 - github.com/aws/aws-sdk-go-v2/service/emr v1.21.0 + github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 3871eebd056800..ed0f9f46e12a2e 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -136,8 +136,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 h1:WvtC9K3UTI6 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0/go.mod h1:XBRdG4B+BnZjICBUIVLD4++5TkX19Y28f6+PNhXvWWc= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 h1:IVjbpLCY3u4QauMHSt4Aw+1hDlZojB4NDpW7YD31cAg= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21/go.mod h1:+oD0h85OfgOl9bQuBPHKMkO4iLO0URj/orDtsrsnsUE= -github.com/aws/aws-sdk-go-v2/service/emr v1.21.0 h1:zS00brRiCTrzwbM9IoXATI56AYlSgW4mBPwotKmkslk= -github.com/aws/aws-sdk-go-v2/service/emr v1.21.0/go.mod h1:bo7MVg6I469xv/PCz2FU45pRiWqXa9uNVFUJmQ0eMrM= +github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 h1:Kch/usVC3OJ/WTRu6eR7WvN4usuYe+K3FIkbWeW4qGE= +github.com/aws/aws-sdk-go-v2/service/emr v1.22.0/go.mod h1:bo7MVg6I469xv/PCz2FU45pRiWqXa9uNVFUJmQ0eMrM= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 h1:9mefPSbUp/FdT01NJVvl+afbvUNhTiZ2td3rzOT02Hg= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22/go.mod h1:YLJlg6D8anm5tkNO68n5rSXo0N86Chp8HIGbdwL1dzk= github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 h1:LmYCmH3DedyWegzA5U86QMIAx8Ennt8ab4Fm4hPd2Xg= From 89e34fe8db2ffb40b6b1a6373e13db28346b3f6e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 06:58:15 +0200 Subject: [PATCH 062/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/directconnect to v1.18.0 (#6451) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/directconnect](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.25` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/directconnect/v1.17.25...service/directconnect/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/directconnect/v1.17.25...service/directconnect/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index ed2d792df00bf3..ae8e4599e65abf 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.29.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0 github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index ed0f9f46e12a2e..7e62bef0cab4ab 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -106,8 +106,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0 h1:W0/T9ie github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.23.0/go.mod h1:pOl6OyO4afJ52vesM08ugFIMaIj/GLcHq7jNPcvUNTI= github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 h1:g2wSKHbwjpIc9xtp/iRcDFLsK+U+qtcPlgjjlwilTJI= github.com/aws/aws-sdk-go-v2/service/dax v1.12.0/go.mod h1:kIbK4cfyQbe0Rq0iD3x8jgDcIbmHlEtBp9QxDT5eU4Q= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25 h1:Qu4RzizX0ETpYIg3Bcoe4rc/H9ogKC/2UACmBqkaFmY= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.25/go.mod h1:26OrZdg3uBa9JFHpzIzXhhaZTkIr22Qcju15mzwJqMU= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0 h1:G1dIrd7zMs7iMOg5O7FEJxx21NhS/ie0TZR+Y8JnPL8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0/go.mod h1:26OrZdg3uBa9JFHpzIzXhhaZTkIr22Qcju15mzwJqMU= github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 h1:ig+1+lWeM02O6G7fweMxncbnPIvsTxNcBfeL0Ym3Tjg= github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0/go.mod h1:L5e0d7YdvUtAiG6AAQqFi5mM1kHkLz32qkoYvZLm1qU= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 h1:b5IdivLEHiIPErQoNNLAt7sECZxnL9BT4Bvp7qxCTwQ= From 561db492f96428cc50e6e8dbaa5afb1ee5f8eadf Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 07:15:56 +0200 Subject: [PATCH 063/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.18.0 (#6453) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/dynamodb](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.9` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/directconnect/v1.17.25...service/directconnect/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/dynamodb/v1.17.9...service/dynamodb/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index ae8e4599e65abf..18a9c3073eba9a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.12.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.18.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 7e62bef0cab4ab..a8edde0dd8a661 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -110,8 +110,8 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0 h1:G1dIrd7zMs7iMOg5O7 github.com/aws/aws-sdk-go-v2/service/directconnect v1.18.0/go.mod h1:26OrZdg3uBa9JFHpzIzXhhaZTkIr22Qcju15mzwJqMU= github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0 h1:ig+1+lWeM02O6G7fweMxncbnPIvsTxNcBfeL0Ym3Tjg= github.com/aws/aws-sdk-go-v2/service/docdb v1.20.0/go.mod h1:L5e0d7YdvUtAiG6AAQqFi5mM1kHkLz32qkoYvZLm1qU= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9 h1:b5IdivLEHiIPErQoNNLAt7sECZxnL9BT4Bvp7qxCTwQ= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.9/go.mod h1:uP2wpt43//qh6NqMFslaRu53A2YbnFStkV4Wn1Ldels= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.18.0 h1:ytPUxPttkqtX8ducnFlimxa75RTwWfox+y8FwhIzMQE= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.18.0/go.mod h1:uP2wpt43//qh6NqMFslaRu53A2YbnFStkV4Wn1Ldels= github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 h1:m6HYlpZlTWb9vHuuRHpWRieqPHWlS0mvQ90OJNrG/Nk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0/go.mod h1:mV0E7631M1eXdB+tlGFIw6JxfsC7Pz7+7Aw15oLVhZw= github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 h1:5RVanD+P+L2W9WU07/8J/A52vnQi7F3ClBdWQttgYlg= From 7984da97223ad938d141c0be2aac09557cc89bcd Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 07:32:43 +0200 Subject: [PATCH 064/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/ecrpublic to v1.14.0 (#6455) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/ecrpublic](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.22` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ecrpublic/v1.13.22...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ecrpublic/v1.13.22...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 18a9c3073eba9a..5eab0c1717a2fe 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.18.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a8edde0dd8a661..4a9fd72965826e 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -116,8 +116,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 h1:m6HYlpZlTWb9vHuuRHpWRieqPHWl github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0/go.mod h1:mV0E7631M1eXdB+tlGFIw6JxfsC7Pz7+7Aw15oLVhZw= github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 h1:5RVanD+P+L2W9WU07/8J/A52vnQi7F3ClBdWQttgYlg= github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0/go.mod h1:9yGOFsa2OcdyePojE89xNGtdBusTyc8ocjpiuFtFc0g= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22 h1:mAfbm9OuaKTQ/KweojB47hTHSRxf1Z3h721bOxLJjNY= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.22/go.mod h1:bBy8YiBBFd549EeySGjb0vHWg80XeMSigv/dr/2HFjE= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0 h1:NOTXBdCwPPCa2AnTpATUx86EQPKY3RElaCwYYwy210I= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0/go.mod h1:bBy8YiBBFd549EeySGjb0vHWg80XeMSigv/dr/2HFjE= github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 h1:U1C52Ja15znyDMd+J5t9URqHyGBTN0hPZt1UHlDFa7U= github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0/go.mod h1:YXZ3cd8LDvvQytFpWjqbgdmHRAyJi4qbIT5dYdyhfeM= github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 h1:V+qYxQTQObQAegchEMXSP2XXEe3ujqC3y7jU5Ww+9m4= From a56841ae4b07aa42f20ccd556d54f2e7824f97aa Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 07:54:22 +0200 Subject: [PATCH 065/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/efs to v1.19.0 (#6457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/efs](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.3` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/efs/v1.18.3...service/efs/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/efs/v1.18.3...service/efs/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 5eab0c1717a2fe..7bc5412db2090a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 - github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 + github.com/aws/aws-sdk-go-v2/service/efs v1.19.0 github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 4a9fd72965826e..1db8dc3eaac69e 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -120,8 +120,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0 h1:NOTXBdCwPPCa2AnTpATUx8 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.14.0/go.mod h1:bBy8YiBBFd549EeySGjb0vHWg80XeMSigv/dr/2HFjE= github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 h1:U1C52Ja15znyDMd+J5t9URqHyGBTN0hPZt1UHlDFa7U= github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0/go.mod h1:YXZ3cd8LDvvQytFpWjqbgdmHRAyJi4qbIT5dYdyhfeM= -github.com/aws/aws-sdk-go-v2/service/efs v1.18.3 h1:V+qYxQTQObQAegchEMXSP2XXEe3ujqC3y7jU5Ww+9m4= -github.com/aws/aws-sdk-go-v2/service/efs v1.18.3/go.mod h1:5MfwGfNzP7d86CrJKNCk7jawZLgBzO4N+X1q/4eYNN8= +github.com/aws/aws-sdk-go-v2/service/efs v1.19.0 h1:3kuyykZ/ttISUeCeCRa7QBLIknnerNNDYLrAzYAYVjM= +github.com/aws/aws-sdk-go-v2/service/efs v1.19.0/go.mod h1:5MfwGfNzP7d86CrJKNCk7jawZLgBzO4N+X1q/4eYNN8= github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 h1:ZXtMY5AgBS6YBtvrlKHSCLuIm5jtLKb/QaUhXH+vCsk= github.com/aws/aws-sdk-go-v2/service/eks v1.27.0/go.mod h1:H/748RFDDxPmaxe03lhX0ufIQHIO2ctqjTfxuX4N7Vg= github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 h1:P3YfmNXT2nWjmduq/alZAy/G+BSX/6Kk2G4gS+v8pKk= From 5c70e455c721bab217ca7ef5bc4b9e58de25fb60 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 08:10:59 +0200 Subject: [PATCH 066/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elasticache to v1.26.0 (#6459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elasticache](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.25.0` -> `v1.26.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.26.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticache/v1.25.0...service/elasticache/v1.26.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticache/v1.25.0...service/elasticache/v1.26.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 7bc5412db2090a..5f4b412c4dfa24 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -40,7 +40,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.23.0 github.com/aws/aws-sdk-go-v2/service/efs v1.19.0 github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 1db8dc3eaac69e..dc1502c7ba28f1 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -124,8 +124,8 @@ github.com/aws/aws-sdk-go-v2/service/efs v1.19.0 h1:3kuyykZ/ttISUeCeCRa7QBLIknne github.com/aws/aws-sdk-go-v2/service/efs v1.19.0/go.mod h1:5MfwGfNzP7d86CrJKNCk7jawZLgBzO4N+X1q/4eYNN8= github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 h1:ZXtMY5AgBS6YBtvrlKHSCLuIm5jtLKb/QaUhXH+vCsk= github.com/aws/aws-sdk-go-v2/service/eks v1.27.0/go.mod h1:H/748RFDDxPmaxe03lhX0ufIQHIO2ctqjTfxuX4N7Vg= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0 h1:P3YfmNXT2nWjmduq/alZAy/G+BSX/6Kk2G4gS+v8pKk= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.25.0/go.mod h1:gnN6CtMag9be9XGXsMenh084NcSy5pO0hriEYz/TERk= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0 h1:hKb7jojTnBE4FWqO2VeQ/phXizYWi+LL4RSME2HQyq0= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0/go.mod h1:gnN6CtMag9be9XGXsMenh084NcSy5pO0hriEYz/TERk= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 h1:cBiPqmKWJexeZ987WqThao6MQb267ttB7869BeJirlA= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0/go.mod h1:txSsTeuqHfPwicYkpg3PoOXFOpERUL5colZaCaaa8D0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 h1:Iy28SRz2KfiGFtlj/HmLM5QPE+8K9I3bQPFx8Fo59OI= From d72d213e3daabf1ac4520866136bcb5990fb7531 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 08:32:24 +0200 Subject: [PATCH 067/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing to v1.15.0 (#6461) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.14.25` -> `v1.15.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.15.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticloadbalancing/v1.14.25...v1.15.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticloadbalancing/v1.14.25...v1.15.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 5f4b412c4dfa24..381dc6f87b2415 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.27.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index dc1502c7ba28f1..74049b13ac7dad 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -128,8 +128,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0 h1:hKb7jojTnBE4FWqO2VeQ github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0/go.mod h1:gnN6CtMag9be9XGXsMenh084NcSy5pO0hriEYz/TERk= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 h1:cBiPqmKWJexeZ987WqThao6MQb267ttB7869BeJirlA= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0/go.mod h1:txSsTeuqHfPwicYkpg3PoOXFOpERUL5colZaCaaa8D0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25 h1:Iy28SRz2KfiGFtlj/HmLM5QPE+8K9I3bQPFx8Fo59OI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.25/go.mod h1:3OUv9SlYvymsCF3I5NftITc1+B09cF5lg4IsZgQQy1U= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0 h1:FFfQypN9iItIrGhbl8em90uXMFBLrCkNC1yJ65+m9Sk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0/go.mod h1:3OUv9SlYvymsCF3I5NftITc1+B09cF5lg4IsZgQQy1U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 h1:Ae7aH1PEbrVSg1fSQy33E/mILWd1Csncz95FMfxYWms= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28/go.mod h1:ix71C17la8K2MUJrqJzu+i7+aPoQYTAy14hKQbGDB9w= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 h1:WvtC9K3UTI6EJSQzITax3/TElN4WGCaOB7Ptocj7AMY= From 163a58103ff3a5454c83e82fca0685ecd9ee2192 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 08:53:21 +0200 Subject: [PATCH 068/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elastictranscoder to v1.14.0 (#6464) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elastictranscoder](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.21` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elastictranscoder/v1.13.21...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elastictranscoder/v1.13.21...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 381dc6f87b2415..1b2af86e8a8915 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -45,7 +45,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 74049b13ac7dad..4ff3b858db8444 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -134,8 +134,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 h1:Ae7aH1PE github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28/go.mod h1:ix71C17la8K2MUJrqJzu+i7+aPoQYTAy14hKQbGDB9w= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 h1:WvtC9K3UTI6EJSQzITax3/TElN4WGCaOB7Ptocj7AMY= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0/go.mod h1:XBRdG4B+BnZjICBUIVLD4++5TkX19Y28f6+PNhXvWWc= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21 h1:IVjbpLCY3u4QauMHSt4Aw+1hDlZojB4NDpW7YD31cAg= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.13.21/go.mod h1:+oD0h85OfgOl9bQuBPHKMkO4iLO0URj/orDtsrsnsUE= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 h1:2AqNc84m2pGInkmtfbqxrU3CFfHUdP5Bi3/wvD8HVZM= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0/go.mod h1:+oD0h85OfgOl9bQuBPHKMkO4iLO0URj/orDtsrsnsUE= github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 h1:Kch/usVC3OJ/WTRu6eR7WvN4usuYe+K3FIkbWeW4qGE= github.com/aws/aws-sdk-go-v2/service/emr v1.22.0/go.mod h1:bo7MVg6I469xv/PCz2FU45pRiWqXa9uNVFUJmQ0eMrM= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 h1:9mefPSbUp/FdT01NJVvl+afbvUNhTiZ2td3rzOT02Hg= From f434f00285ed8fc5edbacf03194fb983d4d98f86 Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Sat, 7 Jan 2023 03:47:05 -0500 Subject: [PATCH 069/221] fix(destinations): Handle nulls in JSONs (#6466) Looks like we didn't handle `nulls` well in all cases. This should close https://github.com/cloudquery/cloudquery/issues/6333 and also the recent pg report that we got. Side note: There is some boilerplate code here but I don't think there is a way to avoid it because we do want to give destinations an opportunity to decide what to do on `null` value which might not always be just send null as it can be empty `string` like in CSV or some other value. --- .../destination/mongodb/client/transformer.go | 51 +++++++++++++---- .../destination/neo4j/client/transformer.go | 57 ++++++++++++++----- .../postgresql/client/transformer.go | 25 ++++++-- 3 files changed, 101 insertions(+), 32 deletions(-) diff --git a/plugins/destination/mongodb/client/transformer.go b/plugins/destination/mongodb/client/transformer.go index 52ac6e73731622..03c0f93da7f194 100644 --- a/plugins/destination/mongodb/client/transformer.go +++ b/plugins/destination/mongodb/client/transformer.go @@ -7,19 +7,31 @@ import ( ) func (*Client) TransformBool(v *schema.Bool) any { - return v.Bool + if v.Status == schema.Present { + return v.Bool + } + return nil } func (*Client) TransformBytea(v *schema.Bytea) any { - return v.Bytes + if v.Status == schema.Present { + return v.Bytes + } + return nil } func (*Client) TransformFloat8(v *schema.Float8) any { - return v.Float + if v.Status == schema.Present { + return v.Float + } + return nil } func (*Client) TransformInt8(v *schema.Int8) any { - return v.Int + if v.Status == schema.Present { + return v.Int + } + return nil } func (*Client) TransformInt8Array(v *schema.Int8Array) any { @@ -42,7 +54,10 @@ func (*Client) TransformJSON(v *schema.JSON) any { } func (*Client) TransformText(v *schema.Text) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformTextArray(v *schema.TextArray) any { @@ -54,14 +69,17 @@ func (*Client) TransformTextArray(v *schema.TextArray) any { } func (*Client) TransformTimestamptz(v *schema.Timestamptz) any { - if v.Status != schema.Present { - return nil + if v.Status == schema.Present { + return v.Time } - return v.Time + return nil } func (*Client) TransformUUID(v *schema.UUID) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformUUIDArray(v *schema.UUIDArray) any { @@ -73,7 +91,10 @@ func (*Client) TransformUUIDArray(v *schema.UUIDArray) any { } func (*Client) TransformCIDR(v *schema.CIDR) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { @@ -85,7 +106,10 @@ func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { } func (*Client) TransformInet(v *schema.Inet) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformInetArray(v *schema.InetArray) any { @@ -97,7 +121,10 @@ func (*Client) TransformInetArray(v *schema.InetArray) any { } func (*Client) TransformMacaddr(v *schema.Macaddr) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformMacaddrArray(v *schema.MacaddrArray) any { diff --git a/plugins/destination/neo4j/client/transformer.go b/plugins/destination/neo4j/client/transformer.go index 82cb7ff6b1f4bd..7949a1476a22b3 100644 --- a/plugins/destination/neo4j/client/transformer.go +++ b/plugins/destination/neo4j/client/transformer.go @@ -5,19 +5,31 @@ import ( ) func (*Client) TransformBool(v *schema.Bool) any { - return v.Bool + if v.Status == schema.Present { + return v.Bool + } + return nil } func (*Client) TransformBytea(v *schema.Bytea) any { - return v.Bytes + if v.Status == schema.Present { + return v.Bytes + } + return nil } func (*Client) TransformFloat8(v *schema.Float8) any { - return v.Float + if v.Status == schema.Present { + return v.Float + } + return nil } func (*Client) TransformInt8(v *schema.Int8) any { - return v.Int + if v.Status == schema.Present { + return v.Int + } + return nil } func (*Client) TransformInt8Array(v *schema.Int8Array) any { @@ -29,14 +41,17 @@ func (*Client) TransformInt8Array(v *schema.Int8Array) any { } func (*Client) TransformJSON(v *schema.JSON) any { - if v.Status != schema.Present { - return nil + if v.Status == schema.Present { + return string(v.Bytes) } - return string(v.Bytes) + return nil } func (*Client) TransformText(v *schema.Text) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformTextArray(v *schema.TextArray) any { @@ -48,14 +63,17 @@ func (*Client) TransformTextArray(v *schema.TextArray) any { } func (*Client) TransformTimestamptz(v *schema.Timestamptz) any { - if v.Status != schema.Present { - return nil + if v.Status == schema.Present { + return v.Time } - return v.Time + return nil } func (*Client) TransformUUID(v *schema.UUID) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformUUIDArray(v *schema.UUIDArray) any { @@ -67,7 +85,10 @@ func (*Client) TransformUUIDArray(v *schema.UUIDArray) any { } func (*Client) TransformCIDR(v *schema.CIDR) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { @@ -79,7 +100,10 @@ func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { } func (*Client) TransformInet(v *schema.Inet) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformInetArray(v *schema.InetArray) any { @@ -91,7 +115,10 @@ func (*Client) TransformInetArray(v *schema.InetArray) any { } func (*Client) TransformMacaddr(v *schema.Macaddr) any { - return v.String() + if v.Status == schema.Present { + return v.String() + } + return nil } func (*Client) TransformMacaddrArray(v *schema.MacaddrArray) any { diff --git a/plugins/destination/postgresql/client/transformer.go b/plugins/destination/postgresql/client/transformer.go index 4afe23da38e683..265fbb1aa84046 100644 --- a/plugins/destination/postgresql/client/transformer.go +++ b/plugins/destination/postgresql/client/transformer.go @@ -16,7 +16,10 @@ func (*Client) TransformBool(v *schema.Bool) any { } func (*Client) TransformBytea(v *schema.Bytea) any { - return v.Bytes + if v.Status == schema.Present { + return v.Bytes + } + return nil } func (*Client) TransformFloat8(v *schema.Float8) any { @@ -42,7 +45,10 @@ func (*Client) TransformInt8Array(v *schema.Int8Array) any { } func (*Client) TransformJSON(v *schema.JSON) any { - return v.Bytes + if v.Status == schema.Present { + return v.Bytes + } + return nil } func (*Client) TransformText(v *schema.Text) any { @@ -83,7 +89,10 @@ func (*Client) TransformUUIDArray(v *schema.UUIDArray) any { } func (*Client) TransformCIDR(v *schema.CIDR) any { - return v.IPNet + if v.Status == schema.Present { + return v.IPNet + } + return nil } func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { @@ -95,7 +104,10 @@ func (*Client) TransformCIDRArray(v *schema.CIDRArray) any { } func (*Client) TransformInet(v *schema.Inet) any { - return v.IPNet + if v.Status == schema.Present { + return v.IPNet + } + return nil } func (*Client) TransformInetArray(v *schema.InetArray) any { @@ -107,7 +119,10 @@ func (*Client) TransformInetArray(v *schema.InetArray) any { } func (*Client) TransformMacaddr(v *schema.Macaddr) any { - return v.Addr + if v.Status == schema.Present { + return v.Addr + } + return nil } func (c *Client) TransformMacaddrArray(v *schema.MacaddrArray) any { From b45f5d99361af5fbef46bc49ea93341a437e7f3d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:50:59 +0200 Subject: [PATCH 070/221] chore(main): Release plugins-destination-postgresql v2.0.3 (#6467) :robot: I have created a release *beep* *boop* --- ## [2.0.3](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.2...plugins-destination-postgresql-v2.0.3) (2023-01-07) ### Bug Fixes * **destinations:** Handle nulls in JSONs ([#6466](https://github.com/cloudquery/cloudquery/issues/6466)) ([f434f00](https://github.com/cloudquery/cloudquery/commit/f434f00285ed8fc5edbacf03194fb983d4d98f86)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/destination/postgresql/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 6d41d4b2894f1d..33facb41ea985b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -23,7 +23,7 @@ "plugins/source/terraform+FILLER": "0.0.0", "plugins/source/test": "1.3.27", "plugins/source/test+FILLER": "0.0.0", - "plugins/destination/postgresql": "2.0.2", + "plugins/destination/postgresql": "2.0.3", "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "1.3.13", "plugins/destination/test+FILLER": "0.0.0", diff --git a/plugins/destination/postgresql/CHANGELOG.md b/plugins/destination/postgresql/CHANGELOG.md index 8e8c7b0defda5b..3b91101ad9da37 100644 --- a/plugins/destination/postgresql/CHANGELOG.md +++ b/plugins/destination/postgresql/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.0.3](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.2...plugins-destination-postgresql-v2.0.3) (2023-01-07) + + +### Bug Fixes + +* **destinations:** Handle nulls in JSONs ([#6466](https://github.com/cloudquery/cloudquery/issues/6466)) ([f434f00](https://github.com/cloudquery/cloudquery/commit/f434f00285ed8fc5edbacf03194fb983d4d98f86)) + ## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.1...plugins-destination-postgresql-v2.0.2) (2023-01-06) From b29f747862753a82c9e2eff0085fd832ec0936d1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:54:55 +0200 Subject: [PATCH 071/221] chore: Update plugin `destination-postgresql` version to v2.0.3 (#6468) Updates the `destination-postgresql` plugin latest version to v2.0.3 --- website/versions/destination-postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-postgresql.json b/website/versions/destination-postgresql.json index 063290f5f30cd1..bcf25472294be4 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v2.0.2" } +{ "latest": "plugins-destination-postgresql-v2.0.3" } From 7e10b28ac7451749de5b08d114ea3dbecdb8cada Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 7 Jan 2023 11:25:37 +0200 Subject: [PATCH 072/221] chore(deps): Update dependency cloudquery/cloudquery to v2.0.3 (#6469) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cloudquery/cloudquery](https://togithub.com/cloudquery/cloudquery) | patch | `v2.0.2` -> `v2.0.3` | --- ### Release Notes
cloudquery/cloudquery ### [`v2.0.3`](https://togithub.com/cloudquery/cloudquery/releases/tag/plugins-destination-postgresql-v2.0.3) [Compare Source](https://togithub.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.2...plugins-destination-postgresql-v2.0.3) ##### Bug Fixes - **destinations:** Handle nulls in JSONs ([#​6466](https://togithub.com/cloudquery/cloudquery/issues/6466)) ([f434f00](https://togithub.com/cloudquery/cloudquery/commit/f434f00285ed8fc5edbacf03194fb983d4d98f86))
--- ### 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/test/policy_cq_config.yml | 2 +- plugins/source/azure/test/policy_cq_config.yml | 2 +- plugins/source/gcp/test/policy_cq_config.yml | 2 +- plugins/source/k8s/test/policy_cq_config.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/aws/test/policy_cq_config.yml b/plugins/source/aws/test/policy_cq_config.yml index f10d28593f803f..122e7e10367cb5 100644 --- a/plugins/source/aws/test/policy_cq_config.yml +++ b/plugins/source/aws/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.2" # latest version of postgresql plugin + version: "v2.0.3" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/azure/test/policy_cq_config.yml b/plugins/source/azure/test/policy_cq_config.yml index fbb8d20dcb8cd5..e56b02d6f34ec8 100644 --- a/plugins/source/azure/test/policy_cq_config.yml +++ b/plugins/source/azure/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.2" # latest version of postgresql plugin + version: "v2.0.3" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/gcp/test/policy_cq_config.yml b/plugins/source/gcp/test/policy_cq_config.yml index dae99a21f08b9b..fb6a683958c6b2 100644 --- a/plugins/source/gcp/test/policy_cq_config.yml +++ b/plugins/source/gcp/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.2" # latest version of postgresql plugin + version: "v2.0.3" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index 0f15345fd274a4..bc0ccfc5cbd2f5 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.2" # latest version of postgresql plugin + version: "v2.0.3" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From 188848f482ef1f0657fd78203dfa279709bff53b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 02:36:33 +0200 Subject: [PATCH 073/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/eventbridge to v1.17.0 (#6473) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/eventbridge](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.22` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/eventbridge/v1.16.22...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/eventbridge/v1.16.22...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 1b2af86e8a8915..e88c47d563f1be 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14 github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 4ff3b858db8444..0176797bbf220c 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -138,8 +138,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 h1:2AqNc84m2pGInk github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0/go.mod h1:+oD0h85OfgOl9bQuBPHKMkO4iLO0URj/orDtsrsnsUE= github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 h1:Kch/usVC3OJ/WTRu6eR7WvN4usuYe+K3FIkbWeW4qGE= github.com/aws/aws-sdk-go-v2/service/emr v1.22.0/go.mod h1:bo7MVg6I469xv/PCz2FU45pRiWqXa9uNVFUJmQ0eMrM= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22 h1:9mefPSbUp/FdT01NJVvl+afbvUNhTiZ2td3rzOT02Hg= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.22/go.mod h1:YLJlg6D8anm5tkNO68n5rSXo0N86Chp8HIGbdwL1dzk= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 h1:+uhUWMs/eLtCB7h3Z6mKbnBbneyKqzj3jwQzPYR/Lk8= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0/go.mod h1:YLJlg6D8anm5tkNO68n5rSXo0N86Chp8HIGbdwL1dzk= github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 h1:LmYCmH3DedyWegzA5U86QMIAx8Ennt8ab4Fm4hPd2Xg= github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2/go.mod h1:+GELYqaH2ElEY/zq8DFfk0y9IN/0/EnrYoTU5d8QbVU= github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14 h1:37LSdR3e793PiZ+UBkhdOZ8SYAGUAWdkFW7ipNTb860= From 19b154ac1da2e3792a8a25a4f6c11f4fb9dabc86 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 02:53:32 +0200 Subject: [PATCH 074/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/frauddetector to v1.21.0 (#6475) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/frauddetector](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.20.14` -> `v1.21.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.21.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/frauddetector/v1.20.14...service/frauddetector/v1.21.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/frauddetector/v1.20.14...service/frauddetector/v1.21.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e88c47d563f1be..095b8193d9989d 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 - github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14 + github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.13.21 github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0176797bbf220c..f57d551c864a3b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -142,8 +142,8 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 h1:+uhUWMs/eLtCB7h3Z6mK github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0/go.mod h1:YLJlg6D8anm5tkNO68n5rSXo0N86Chp8HIGbdwL1dzk= github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 h1:LmYCmH3DedyWegzA5U86QMIAx8Ennt8ab4Fm4hPd2Xg= github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2/go.mod h1:+GELYqaH2ElEY/zq8DFfk0y9IN/0/EnrYoTU5d8QbVU= -github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14 h1:37LSdR3e793PiZ+UBkhdOZ8SYAGUAWdkFW7ipNTb860= -github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.14/go.mod h1:oArmB2ikSpX0dBgd035hl0nvcLMlorcq9z9GbNT0CNo= +github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 h1:HIcghBvpkx0OSPOzd0F7RreFzOmFijS6Xgb2nCMH5LQ= +github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0/go.mod h1:oArmB2ikSpX0dBgd035hl0nvcLMlorcq9z9GbNT0CNo= github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 h1:Zp2xRYo/i7R7Tnz2P8EODce94HQ6H5ofAVtyWq5GMeg= github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0/go.mod h1:EEV2x8JcEn905TMiRMp1S1WjpnUTUxwpKxzjLJYwBZY= github.com/aws/aws-sdk-go-v2/service/glacier v1.13.21 h1:0qtspkMuqng6KW7j7w1p47ESK9UHhHOz67SPEhNTtnI= From 8d0887fb4a1d48b0e7b5b8e8b1732f7aa57a7142 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 03:15:10 +0200 Subject: [PATCH 075/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/glacier to v1.14.0 (#6477) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/glacier](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.21` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/glacier/v1.13.21...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/glacier/v1.13.21...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 095b8193d9989d..beab492188f37b 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 - github.com/aws/aws-sdk-go-v2/service/glacier v1.13.21 + github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 github.com/aws/aws-sdk-go-v2/service/iam v1.18.25 github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index f57d551c864a3b..31c745336837b1 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -146,8 +146,8 @@ github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 h1:HIcghBvpkx0OSPOzd0 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0/go.mod h1:oArmB2ikSpX0dBgd035hl0nvcLMlorcq9z9GbNT0CNo= github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 h1:Zp2xRYo/i7R7Tnz2P8EODce94HQ6H5ofAVtyWq5GMeg= github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0/go.mod h1:EEV2x8JcEn905TMiRMp1S1WjpnUTUxwpKxzjLJYwBZY= -github.com/aws/aws-sdk-go-v2/service/glacier v1.13.21 h1:0qtspkMuqng6KW7j7w1p47ESK9UHhHOz67SPEhNTtnI= -github.com/aws/aws-sdk-go-v2/service/glacier v1.13.21/go.mod h1:drgw9PzthcgV9UCHP2Q6Obqs3t6pR19o6C64J9MqnKw= +github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 h1:DXC2VcVpknkf33b1PUZThqiAZIgKsf8d/z/Z68VJ0VA= +github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0/go.mod h1:drgw9PzthcgV9UCHP2Q6Obqs3t6pR19o6C64J9MqnKw= github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 h1:t4H6jJJEq11K+3Xrm3GKcSepdZxveO1BGdeCA5gg1Mc= github.com/aws/aws-sdk-go-v2/service/glue v1.38.1/go.mod h1:kXio9ACrVjRndIledemYxonQhqmfDFbgDH3/AIBx3Hk= github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 h1:e3A56GKB/4VKCJ6bvHM7IIn2G5MYep4bhGH1mQv/ASo= From 30cf79d234d86dc3ab36350ebcbdca9696174d03 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 03:36:56 +0200 Subject: [PATCH 076/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/iam to v1.19.0 (#6480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/iam](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.25` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/iam/v1.18.25...service/iam/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/iam/v1.18.25...service/iam/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index beab492188f37b..474f0cac4e68d5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 - github.com/aws/aws-sdk-go-v2/service/iam v1.18.25 + github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 github.com/aws/aws-sdk-go-v2/service/inspector v1.12.21 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 31c745336837b1..fb31e187d10d74 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -152,8 +152,8 @@ github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 h1:t4H6jJJEq11K+3Xrm3GKcSepdZx github.com/aws/aws-sdk-go-v2/service/glue v1.38.1/go.mod h1:kXio9ACrVjRndIledemYxonQhqmfDFbgDH3/AIBx3Hk= github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 h1:e3A56GKB/4VKCJ6bvHM7IIn2G5MYep4bhGH1mQv/ASo= github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6/go.mod h1:vivHPqk4e0/WY4rF3h2LRFeMV8QYIefHMXXEs8oPsTU= -github.com/aws/aws-sdk-go-v2/service/iam v1.18.25 h1:Np+wTW2nuSBGyEu0WFsiu0LO05rxLFMh3hYVAjOzyVw= -github.com/aws/aws-sdk-go-v2/service/iam v1.18.25/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA= +github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3RZFsZ6wkQ+yxtj8= +github.com/aws/aws-sdk-go-v2/service/iam v1.19.0/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 h1:Dz0+Uux9AsYVrMOLf4MxfrAglld4NkvGuhPBx10W7tA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10/go.mod h1:mN2AeMZcyQWmPJhkrMU2fFUh2ZrUlLZER+V+YKplyMQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.12.21 h1:tiYJi0XpdrVWWbBpGGKlBXmDTKT8FiL6I54hj6z71cM= From e628a51e8912222ec5a6a44b1dc117768cce30d5 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 03:54:54 +0200 Subject: [PATCH 077/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/inspector to v1.13.0 (#6482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/inspector](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.12.21` -> `v1.13.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.13.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/inspector/v1.12.21...v1.13.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/inspector/v1.12.21...v1.13.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 474f0cac4e68d5..990a176a7a07f7 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 - github.com/aws/aws-sdk-go-v2/service/inspector v1.12.21 + github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 github.com/aws/aws-sdk-go-v2/service/iot v1.32.2 github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index fb31e187d10d74..db0dd7f88abc07 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -156,8 +156,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3 github.com/aws/aws-sdk-go-v2/service/iam v1.19.0/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 h1:Dz0+Uux9AsYVrMOLf4MxfrAglld4NkvGuhPBx10W7tA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10/go.mod h1:mN2AeMZcyQWmPJhkrMU2fFUh2ZrUlLZER+V+YKplyMQ= -github.com/aws/aws-sdk-go-v2/service/inspector v1.12.21 h1:tiYJi0XpdrVWWbBpGGKlBXmDTKT8FiL6I54hj6z71cM= -github.com/aws/aws-sdk-go-v2/service/inspector v1.12.21/go.mod h1:yhb64vvxW/Op5JkExPqVAoRxYr/SF5x7mgddE5WP2K4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 h1:4kZatO2FYgFO5CbkMqg+3R2uqUSipvFzHRo02NUHCsQ= +github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0/go.mod h1:yhb64vvxW/Op5JkExPqVAoRxYr/SF5x7mgddE5WP2K4= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 h1:F7M3ahO584qQU6yqD+gfPF2LrBeaytbYmLDks0hBtTw= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0/go.mod h1:/QsVqJ/J9mmPWc0RD68wd49ZROMlVT6FEOGfZx7Bbhc= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= From d66ca2585ac6a61a963e80d4b3e5fc0b59713260 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 04:17:41 +0200 Subject: [PATCH 078/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/iot to v1.33.0 (#6484) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/iot](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.32.2` -> `v1.33.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.33.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/iot/v1.32.2...service/iot/v1.33.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/iot/v1.32.2...service/iot/v1.33.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 990a176a7a07f7..bb65a94cfb9883 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 - github.com/aws/aws-sdk-go-v2/service/iot v1.32.2 + github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.16.0 github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index db0dd7f88abc07..0c2b2612642f83 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -170,8 +170,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViS github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/iot v1.32.2 h1:5FAxV/9KFnLVhg7iP4A0w2AnnFpUwGg/Y6fn9u7YIKI= -github.com/aws/aws-sdk-go-v2/service/iot v1.32.2/go.mod h1:Tf3F28CzhHasATZACLyWf0E3UqJTmSP0WpUD5AND6ZU= +github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 h1:saWmjIWj+jr375L8Y3fNHtVgJ3hKqw++RmOuDVTkOqo= +github.com/aws/aws-sdk-go-v2/service/iot v1.33.0/go.mod h1:Tf3F28CzhHasATZACLyWf0E3UqJTmSP0WpUD5AND6ZU= github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 h1:FCT22MDEEVm73SMJSY5wuZjkH46UsBTcciKfdHx2tx0= github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2/go.mod h1:H1d6K7aIv7anW0Qxnp9bAD5XGZ4PGi3fMLv9W3imMp0= github.com/aws/aws-sdk-go-v2/service/kinesis v1.16.0 h1:FUCSyj8bRM+SnRvjKXS17p6TUEego3mayDPmpfsru54= From 31b551f89e3e48e8e669e2ae960205d06d5fba4b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 04:35:19 +0200 Subject: [PATCH 079/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/kinesis to v1.17.0 (#6486) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/kinesis](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.0` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.6...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.0...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index bb65a94cfb9883..01b48dd240b0b5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -59,7 +59,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.16.0 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 github.com/aws/aws-sdk-go-v2/service/lambda v1.26.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0c2b2612642f83..3fcfda30e75f74 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -174,8 +174,8 @@ github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 h1:saWmjIWj+jr375L8Y3fNHtVgJ3hK github.com/aws/aws-sdk-go-v2/service/iot v1.33.0/go.mod h1:Tf3F28CzhHasATZACLyWf0E3UqJTmSP0WpUD5AND6ZU= github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 h1:FCT22MDEEVm73SMJSY5wuZjkH46UsBTcciKfdHx2tx0= github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2/go.mod h1:H1d6K7aIv7anW0Qxnp9bAD5XGZ4PGi3fMLv9W3imMp0= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.16.0 h1:FUCSyj8bRM+SnRvjKXS17p6TUEego3mayDPmpfsru54= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.16.0/go.mod h1:Nsbb771f+MGZwUJRlFoxvcSJMb1lLQW3b17L01t1YZI= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 h1:Q57meHerZDM7jLK35iQ9mZSwYV/B3yWfGXL9PiE5I4U= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0/go.mod h1:Nsbb771f+MGZwUJRlFoxvcSJMb1lLQW3b17L01t1YZI= github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 h1:bX+nEwdukfDdfGPUjNNqs7NwZyqyMjIy5YpZda9Gcu4= github.com/aws/aws-sdk-go-v2/service/kms v1.19.4/go.mod h1:13sjgMH7Xu4e46+0BEDhSnNh+cImHSYS5PpBjV3oXcU= github.com/aws/aws-sdk-go-v2/service/lambda v1.26.2 h1:N7YZeA5IlmhuRhoUtlWwuciRMISaP/YREIvosGthsLs= From de83edafcafd92df94ad9dc23967ffc0f278d3c8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 04:52:39 +0200 Subject: [PATCH 080/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/lambda to v1.27.0 (#6488) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/lambda](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.26.2` -> `v1.27.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.27.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/lambda/v1.26.2...service/lambda/v1.27.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/lambda/v1.26.2...service/lambda/v1.27.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 01b48dd240b0b5..63afa3ac491880 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 - github.com/aws/aws-sdk-go-v2/service/lambda v1.26.2 + github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 github.com/aws/aws-sdk-go-v2/service/mwaa v1.13.14 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 3fcfda30e75f74..a66aa779f5104b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -178,8 +178,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 h1:Q57meHerZDM7jLK35iQ9mZSw github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0/go.mod h1:Nsbb771f+MGZwUJRlFoxvcSJMb1lLQW3b17L01t1YZI= github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 h1:bX+nEwdukfDdfGPUjNNqs7NwZyqyMjIy5YpZda9Gcu4= github.com/aws/aws-sdk-go-v2/service/kms v1.19.4/go.mod h1:13sjgMH7Xu4e46+0BEDhSnNh+cImHSYS5PpBjV3oXcU= -github.com/aws/aws-sdk-go-v2/service/lambda v1.26.2 h1:N7YZeA5IlmhuRhoUtlWwuciRMISaP/YREIvosGthsLs= -github.com/aws/aws-sdk-go-v2/service/lambda v1.26.2/go.mod h1:swAeO/+tSUbMwB9EF2miaCxPDSQwzRjfnRsYaNwbeRk= +github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 h1:3PrEtnvtaZcIFpjOkm155oNe6TofwkJxHDJiu+UkEYI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0/go.mod h1:swAeO/+tSUbMwB9EF2miaCxPDSQwzRjfnRsYaNwbeRk= github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 h1:LsuDsjpTTuIF3tPGdDclXSJFWAET4SR7ZknzzCuylbM= github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2/go.mod h1:6/SjaL8UNIHaMpaHIvuYk0jsMP////YmB/I5yHWginA= github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 h1:tH4kxJT0HUGVmLmOvrC0/cGjpDC2g7vlueGF/xxBO9E= From de60adb2c5ffa8eea22e202089d25f01bff373b6 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:10:02 +0200 Subject: [PATCH 081/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/firehose to v1.16.0 (#6474) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/firehose](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.2` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/firehose/v1.15.2...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/firehose/v1.15.2...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 63afa3ac491880..eca347082a0f20 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -48,7 +48,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 - github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 + github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a66aa779f5104b..4e8ebe129aec6f 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -140,8 +140,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 h1:Kch/usVC3OJ/WTRu6eR7WvN4usuY github.com/aws/aws-sdk-go-v2/service/emr v1.22.0/go.mod h1:bo7MVg6I469xv/PCz2FU45pRiWqXa9uNVFUJmQ0eMrM= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 h1:+uhUWMs/eLtCB7h3Z6mKbnBbneyKqzj3jwQzPYR/Lk8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0/go.mod h1:YLJlg6D8anm5tkNO68n5rSXo0N86Chp8HIGbdwL1dzk= -github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2 h1:LmYCmH3DedyWegzA5U86QMIAx8Ennt8ab4Fm4hPd2Xg= -github.com/aws/aws-sdk-go-v2/service/firehose v1.15.2/go.mod h1:+GELYqaH2ElEY/zq8DFfk0y9IN/0/EnrYoTU5d8QbVU= +github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0 h1:9yyz2i4eCGihbyEpfDISy+dwryTdmfBtjlZ7OdxpFpc= +github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0/go.mod h1:+GELYqaH2ElEY/zq8DFfk0y9IN/0/EnrYoTU5d8QbVU= github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 h1:HIcghBvpkx0OSPOzd0F7RreFzOmFijS6Xgb2nCMH5LQ= github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0/go.mod h1:oArmB2ikSpX0dBgd035hl0nvcLMlorcq9z9GbNT0CNo= github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 h1:Zp2xRYo/i7R7Tnz2P8EODce94HQ6H5ofAVtyWq5GMeg= From 7b39554e05b53e7ae54679c19f36e71d45fcb3c8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:28:28 +0200 Subject: [PATCH 082/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/fsx to v1.28.0 (#6476) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/fsx](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.27.0` -> `v1.28.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.28.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/fsx/v1.27.0...service/fsx/v1.28.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/fsx/v1.27.0...service/fsx/v1.28.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index eca347082a0f20..924dff217ec832 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -50,7 +50,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eventbridge v1.17.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0 github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 - github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 + github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 4e8ebe129aec6f..e6c60a09a4e612 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -144,8 +144,8 @@ github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0 h1:9yyz2i4eCGihbyEpfDISy+d github.com/aws/aws-sdk-go-v2/service/firehose v1.16.0/go.mod h1:+GELYqaH2ElEY/zq8DFfk0y9IN/0/EnrYoTU5d8QbVU= github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 h1:HIcghBvpkx0OSPOzd0F7RreFzOmFijS6Xgb2nCMH5LQ= github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0/go.mod h1:oArmB2ikSpX0dBgd035hl0nvcLMlorcq9z9GbNT0CNo= -github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0 h1:Zp2xRYo/i7R7Tnz2P8EODce94HQ6H5ofAVtyWq5GMeg= -github.com/aws/aws-sdk-go-v2/service/fsx v1.27.0/go.mod h1:EEV2x8JcEn905TMiRMp1S1WjpnUTUxwpKxzjLJYwBZY= +github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0 h1:xO97w6lU7raIrM0HigqbotgHT2MqLIj5tVGqmNLMIbE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0/go.mod h1:EEV2x8JcEn905TMiRMp1S1WjpnUTUxwpKxzjLJYwBZY= github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 h1:DXC2VcVpknkf33b1PUZThqiAZIgKsf8d/z/Z68VJ0VA= github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0/go.mod h1:drgw9PzthcgV9UCHP2Q6Obqs3t6pR19o6C64J9MqnKw= github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 h1:t4H6jJJEq11K+3Xrm3GKcSepdZxveO1BGdeCA5gg1Mc= From 4001267f92b58fbd6069a170a6173b80f8d53417 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:48:58 +0200 Subject: [PATCH 083/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/glue to v1.39.0 (#6478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/glue](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.38.1` -> `v1.39.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.39.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/glue/v1.38.1...service/glue/v1.39.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/glue/v1.38.1...service/glue/v1.39.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 924dff217ec832..5ed6a81cbee963 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect github.com/aws/aws-sdk-go-v2/service/athena v1.22.0 github.com/aws/aws-sdk-go-v2/service/backup v1.19.0 - github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 + github.com/aws/aws-sdk-go-v2/service/glue v1.39.0 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index e6c60a09a4e612..b6c61f9746fe62 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -148,8 +148,8 @@ github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0 h1:xO97w6lU7raIrM0HigqbotgHT2Mq github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0/go.mod h1:EEV2x8JcEn905TMiRMp1S1WjpnUTUxwpKxzjLJYwBZY= github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 h1:DXC2VcVpknkf33b1PUZThqiAZIgKsf8d/z/Z68VJ0VA= github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0/go.mod h1:drgw9PzthcgV9UCHP2Q6Obqs3t6pR19o6C64J9MqnKw= -github.com/aws/aws-sdk-go-v2/service/glue v1.38.1 h1:t4H6jJJEq11K+3Xrm3GKcSepdZxveO1BGdeCA5gg1Mc= -github.com/aws/aws-sdk-go-v2/service/glue v1.38.1/go.mod h1:kXio9ACrVjRndIledemYxonQhqmfDFbgDH3/AIBx3Hk= +github.com/aws/aws-sdk-go-v2/service/glue v1.39.0 h1:ERYkN77o2SUI0gm29Njcr9qF88ANjw4o+mhLS75YNgY= +github.com/aws/aws-sdk-go-v2/service/glue v1.39.0/go.mod h1:kXio9ACrVjRndIledemYxonQhqmfDFbgDH3/AIBx3Hk= github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 h1:e3A56GKB/4VKCJ6bvHM7IIn2G5MYep4bhGH1mQv/ASo= github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6/go.mod h1:vivHPqk4e0/WY4rF3h2LRFeMV8QYIefHMXXEs8oPsTU= github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3RZFsZ6wkQ+yxtj8= From c565b0aa691019c1a11058b062fa2d2a30bceb7c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 06:24:51 +0200 Subject: [PATCH 084/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/mwaa to v1.14.0 (#6491) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/mwaa](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.14` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/mwaa/v1.13.14...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/mwaa/v1.13.14...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 5ed6a81cbee963..2804e5e5a01201 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.13.14 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5 github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index b6c61f9746fe62..9b8f3a8c9de414 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -184,8 +184,8 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 h1:LsuDsjpTTuIF3tPGdDclXS github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2/go.mod h1:6/SjaL8UNIHaMpaHIvuYk0jsMP////YmB/I5yHWginA= github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 h1:tH4kxJT0HUGVmLmOvrC0/cGjpDC2g7vlueGF/xxBO9E= github.com/aws/aws-sdk-go-v2/service/mq v1.13.18/go.mod h1:zVok6IADzEtpRaHw5ZMh0GhBDCczGJRstMuvIxmhKag= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.13.14 h1:OXcMa4i7X1BrWP+VeChzyPQbV1yx1NR32OCxykd6lJ4= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.13.14/go.mod h1:jalIW8gZHg5jsVAzlaOdgAcSNFUNBCQO2DC+QmXp6mw= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 h1:KSyaXsg1+VnX3ASoQ21/cIqz7l0NtjIqNAysmhvEvLI= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0/go.mod h1:jalIW8gZHg5jsVAzlaOdgAcSNFUNBCQO2DC+QmXp6mw= github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5 h1:tBZajbHPhVC60F49XXTKlFqaHTc5PqJdHk034IKn+aI= github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5/go.mod h1:kBudc/ZVbpqaZmWaZiQgyujuCgsPqh6kYlzGeW65wh4= github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 h1:ubTiUDDsayQOogwKbr7qlBac6pFEqEbeGfYuC/fF/HM= From c7dd4a64734ad60be65a9c31d823d311f53ddd7e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 06:45:08 +0200 Subject: [PATCH 085/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/identitystore to v1.16.0 (#6481) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/identitystore](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.10` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/identitystore/v1.15.10...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/identitystore/v1.15.10...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2804e5e5a01201..4b1d77ee3f9609 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 9b8f3a8c9de414..3cbece3a8b919f 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -154,8 +154,8 @@ github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 h1:e3A56GKB/4VKCJ6bvHM7II github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6/go.mod h1:vivHPqk4e0/WY4rF3h2LRFeMV8QYIefHMXXEs8oPsTU= github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3RZFsZ6wkQ+yxtj8= github.com/aws/aws-sdk-go-v2/service/iam v1.19.0/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10 h1:Dz0+Uux9AsYVrMOLf4MxfrAglld4NkvGuhPBx10W7tA= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.10/go.mod h1:mN2AeMZcyQWmPJhkrMU2fFUh2ZrUlLZER+V+YKplyMQ= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 h1:kaDCnnGZIeeKZdjGjkMuh9/GLh9yEt70IxBzA0rBHjQ= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0/go.mod h1:mN2AeMZcyQWmPJhkrMU2fFUh2ZrUlLZER+V+YKplyMQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 h1:4kZatO2FYgFO5CbkMqg+3R2uqUSipvFzHRo02NUHCsQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0/go.mod h1:yhb64vvxW/Op5JkExPqVAoRxYr/SF5x7mgddE5WP2K4= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 h1:F7M3ahO584qQU6yqD+gfPF2LrBeaytbYmLDks0hBtTw= From fe8fd70ca0f1782f734f1e45730ca09384b86664 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 07:02:10 +0200 Subject: [PATCH 086/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/inspector2 to v1.11.0 (#6483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/inspector2](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.10.0` -> `v1.11.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.11.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.10.0...v1.11.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.10.0...v1.11.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 4b1d77ee3f9609..9cb8322f5be26a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.0 github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 3cbece3a8b919f..2405241903b367 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -158,8 +158,8 @@ github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 h1:kaDCnnGZIeeKZdjGjk github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0/go.mod h1:mN2AeMZcyQWmPJhkrMU2fFUh2ZrUlLZER+V+YKplyMQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 h1:4kZatO2FYgFO5CbkMqg+3R2uqUSipvFzHRo02NUHCsQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0/go.mod h1:yhb64vvxW/Op5JkExPqVAoRxYr/SF5x7mgddE5WP2K4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0 h1:F7M3ahO584qQU6yqD+gfPF2LrBeaytbYmLDks0hBtTw= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.10.0/go.mod h1:/QsVqJ/J9mmPWc0RD68wd49ZROMlVT6FEOGfZx7Bbhc= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.0 h1:MOVObNSnREy84X0f1kd9Zpo0rpt8sVffBwY0M4R8C3A= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.0/go.mod h1:/QsVqJ/J9mmPWc0RD68wd49ZROMlVT6FEOGfZx7Bbhc= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 h1:kv5vRAl00tozRxSnI0IszPWGXsJOyA7hmEUHFYqsyvw= From acb26838a6d09ce9581224964de386e56caae3a9 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 07:22:44 +0200 Subject: [PATCH 087/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/kafka to v1.19.0 (#6485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/kafka](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.2` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/kafka/v1.18.2...service/kafka/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/kafka/v1.18.2...service/kafka/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 9cb8322f5be26a..66f8a3c9d4d8ce 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.11.0 github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 - github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 + github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2405241903b367..5adb0502fe9125 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -172,8 +172,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrO github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 h1:saWmjIWj+jr375L8Y3fNHtVgJ3hKqw++RmOuDVTkOqo= github.com/aws/aws-sdk-go-v2/service/iot v1.33.0/go.mod h1:Tf3F28CzhHasATZACLyWf0E3UqJTmSP0WpUD5AND6ZU= -github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2 h1:FCT22MDEEVm73SMJSY5wuZjkH46UsBTcciKfdHx2tx0= -github.com/aws/aws-sdk-go-v2/service/kafka v1.18.2/go.mod h1:H1d6K7aIv7anW0Qxnp9bAD5XGZ4PGi3fMLv9W3imMp0= +github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0 h1:mVSEFtTTXa3huVlgDqM4Ng9BGbNTmavaW7jmoQJOCnc= +github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0/go.mod h1:H1d6K7aIv7anW0Qxnp9bAD5XGZ4PGi3fMLv9W3imMp0= github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 h1:Q57meHerZDM7jLK35iQ9mZSwYV/B3yWfGXL9PiE5I4U= github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0/go.mod h1:Nsbb771f+MGZwUJRlFoxvcSJMb1lLQW3b17L01t1YZI= github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 h1:bX+nEwdukfDdfGPUjNNqs7NwZyqyMjIy5YpZda9Gcu4= From 5a8b81da157189a9ec92522b06992b20b969bc6c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 07:46:42 +0200 Subject: [PATCH 088/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/kms to v1.20.0 (#6487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/kms](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.19.4` -> `v1.20.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.20.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/kms/v1.19.4...service/kms/v1.20.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/kms/v1.19.4...service/kms/v1.20.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 66f8a3c9d4d8ce..b5989d738221c1 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -60,7 +60,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.33.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 - github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 + github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 5adb0502fe9125..a9cdb18466f9bb 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -176,8 +176,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0 h1:mVSEFtTTXa3huVlgDqM4Ng9BGb github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0/go.mod h1:H1d6K7aIv7anW0Qxnp9bAD5XGZ4PGi3fMLv9W3imMp0= github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 h1:Q57meHerZDM7jLK35iQ9mZSwYV/B3yWfGXL9PiE5I4U= github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0/go.mod h1:Nsbb771f+MGZwUJRlFoxvcSJMb1lLQW3b17L01t1YZI= -github.com/aws/aws-sdk-go-v2/service/kms v1.19.4 h1:bX+nEwdukfDdfGPUjNNqs7NwZyqyMjIy5YpZda9Gcu4= -github.com/aws/aws-sdk-go-v2/service/kms v1.19.4/go.mod h1:13sjgMH7Xu4e46+0BEDhSnNh+cImHSYS5PpBjV3oXcU= +github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 h1:1mEQ1BVRfxU2KzcUUIzqDQ8p6yPkhzHrHT++sjtLJts= +github.com/aws/aws-sdk-go-v2/service/kms v1.20.0/go.mod h1:13sjgMH7Xu4e46+0BEDhSnNh+cImHSYS5PpBjV3oXcU= github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 h1:3PrEtnvtaZcIFpjOkm155oNe6TofwkJxHDJiu+UkEYI= github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0/go.mod h1:swAeO/+tSUbMwB9EF2miaCxPDSQwzRjfnRsYaNwbeRk= github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 h1:LsuDsjpTTuIF3tPGdDclXSJFWAET4SR7ZknzzCuylbM= From 99ce47890a9d303537eb833e60a95fa1f63495cc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 08:03:31 +0200 Subject: [PATCH 089/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/lightsail to v1.25.0 (#6489) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/lightsail](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.24.2` -> `v1.25.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.25.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/lightsail/v1.24.2...service/lightsail/v1.25.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/lightsail/v1.24.2...service/lightsail/v1.25.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index b5989d738221c1..2d6eb286424ccd 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a9cdb18466f9bb..a6772a620e3df2 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -180,8 +180,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 h1:1mEQ1BVRfxU2KzcUUIzqDQ8p6yPk github.com/aws/aws-sdk-go-v2/service/kms v1.20.0/go.mod h1:13sjgMH7Xu4e46+0BEDhSnNh+cImHSYS5PpBjV3oXcU= github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 h1:3PrEtnvtaZcIFpjOkm155oNe6TofwkJxHDJiu+UkEYI= github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0/go.mod h1:swAeO/+tSUbMwB9EF2miaCxPDSQwzRjfnRsYaNwbeRk= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2 h1:LsuDsjpTTuIF3tPGdDclXSJFWAET4SR7ZknzzCuylbM= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.24.2/go.mod h1:6/SjaL8UNIHaMpaHIvuYk0jsMP////YmB/I5yHWginA= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0 h1:7sc6Mmr/Jx6OVC79PTwro3Y46e42ZzJmMdMU1BA983o= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0/go.mod h1:6/SjaL8UNIHaMpaHIvuYk0jsMP////YmB/I5yHWginA= github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 h1:tH4kxJT0HUGVmLmOvrC0/cGjpDC2g7vlueGF/xxBO9E= github.com/aws/aws-sdk-go-v2/service/mq v1.13.18/go.mod h1:zVok6IADzEtpRaHw5ZMh0GhBDCczGJRstMuvIxmhKag= github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 h1:KSyaXsg1+VnX3ASoQ21/cIqz7l0NtjIqNAysmhvEvLI= From 651dfe437778b2e3df663a33c4787fba5b0ab61d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 08:20:48 +0200 Subject: [PATCH 090/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/guardduty to v1.17.0 (#6479) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/guardduty](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.6` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.6...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.6...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2d6eb286424ccd..c10ddcb13d276a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/frauddetector v1.21.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.28.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.17.0 github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.13.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a6772a620e3df2..c9689b5905019b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -150,8 +150,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0 h1:DXC2VcVpknkf33b1PUZThqiA github.com/aws/aws-sdk-go-v2/service/glacier v1.14.0/go.mod h1:drgw9PzthcgV9UCHP2Q6Obqs3t6pR19o6C64J9MqnKw= github.com/aws/aws-sdk-go-v2/service/glue v1.39.0 h1:ERYkN77o2SUI0gm29Njcr9qF88ANjw4o+mhLS75YNgY= github.com/aws/aws-sdk-go-v2/service/glue v1.39.0/go.mod h1:kXio9ACrVjRndIledemYxonQhqmfDFbgDH3/AIBx3Hk= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6 h1:e3A56GKB/4VKCJ6bvHM7IIn2G5MYep4bhGH1mQv/ASo= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.6/go.mod h1:vivHPqk4e0/WY4rF3h2LRFeMV8QYIefHMXXEs8oPsTU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.17.0 h1:sCX483Q4LvmpRxRDmnZTB16bi3VMLx+8PMdB/J26NY4= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.17.0/go.mod h1:vivHPqk4e0/WY4rF3h2LRFeMV8QYIefHMXXEs8oPsTU= github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 h1:9vCynoqC+dgxZKrsjvAniyIopsv3RZFsZ6wkQ+yxtj8= github.com/aws/aws-sdk-go-v2/service/iam v1.19.0/go.mod h1:OyAuvpFeSVNppcSsp1hFOVQcaTRc1LE24YIR7pMbbAA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.0 h1:kaDCnnGZIeeKZdjGjkMuh9/GLh9yEt70IxBzA0rBHjQ= From d373abd5031631885e6c59a904f11459a337b156 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sun, 8 Jan 2023 08:38:35 +0200 Subject: [PATCH 091/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/neptune to v1.19.0 (#6492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/neptune](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.5` -> `v1.19.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/neptune/v1.18.5...service/neptune/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/neptune/v1.18.5...service/neptune/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index c10ddcb13d276a..e6f92c4f45cb72 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 - github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5 + github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c9689b5905019b..d4db289c8d81fa 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -186,8 +186,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 h1:tH4kxJT0HUGVmLmOvrC0/cGjpDC2 github.com/aws/aws-sdk-go-v2/service/mq v1.13.18/go.mod h1:zVok6IADzEtpRaHw5ZMh0GhBDCczGJRstMuvIxmhKag= github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 h1:KSyaXsg1+VnX3ASoQ21/cIqz7l0NtjIqNAysmhvEvLI= github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0/go.mod h1:jalIW8gZHg5jsVAzlaOdgAcSNFUNBCQO2DC+QmXp6mw= -github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5 h1:tBZajbHPhVC60F49XXTKlFqaHTc5PqJdHk034IKn+aI= -github.com/aws/aws-sdk-go-v2/service/neptune v1.18.5/go.mod h1:kBudc/ZVbpqaZmWaZiQgyujuCgsPqh6kYlzGeW65wh4= +github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 h1:ugVidYCmMOdCDnf+244pRn3uv+ob1NxdWBncan5sH/U= +github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0/go.mod h1:kBudc/ZVbpqaZmWaZiQgyujuCgsPqh6kYlzGeW65wh4= github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 h1:ubTiUDDsayQOogwKbr7qlBac6pFEqEbeGfYuC/fF/HM= github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2/go.mod h1:SiHyOVjKY74qa5H6RTexGKLjQLg43lZ/jZT5Z84FhU0= github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 h1:/OCgIWXxvyw/f9904V5DwE8YtFi2XsGMmIVd3Aj4h6Y= From bbb2457db330818f24496719f4bceb32384bc9cb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:36:26 +0200 Subject: [PATCH 092/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/organizations to v1.18.0 (#6495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/organizations](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.2` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.2...service/organizations/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.2...service/organizations/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e6f92c4f45cb72..b2ce711ada734f 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -66,7 +66,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 - github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 + github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3 github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index d4db289c8d81fa..8d3045e623b40d 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -188,8 +188,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 h1:KSyaXsg1+VnX3ASoQ21/cIqz7l0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0/go.mod h1:jalIW8gZHg5jsVAzlaOdgAcSNFUNBCQO2DC+QmXp6mw= github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 h1:ugVidYCmMOdCDnf+244pRn3uv+ob1NxdWBncan5sH/U= github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0/go.mod h1:kBudc/ZVbpqaZmWaZiQgyujuCgsPqh6kYlzGeW65wh4= -github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2 h1:ubTiUDDsayQOogwKbr7qlBac6pFEqEbeGfYuC/fF/HM= -github.com/aws/aws-sdk-go-v2/service/organizations v1.17.2/go.mod h1:SiHyOVjKY74qa5H6RTexGKLjQLg43lZ/jZT5Z84FhU0= +github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 h1:QoAzrTInIpXGHjaI5zuy1IfzKsbuB0eQucV2npoBDRY= +github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0/go.mod h1:SiHyOVjKY74qa5H6RTexGKLjQLg43lZ/jZT5Z84FhU0= github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 h1:/OCgIWXxvyw/f9904V5DwE8YtFi2XsGMmIVd3Aj4h6Y= github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22/go.mod h1:yanKnbAjmnFTI9U5QxkN+ovlq/eXlew5rMhmfYDek2I= github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3 h1:oOITThfr01t8r/v/RzRuHV+EqN5dAalVpMNODRS6zF4= From 6c6788c677dc7632f01dd029c155c8c7ce18c622 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:53:47 +0200 Subject: [PATCH 093/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/quicksight to v1.29.0 (#6497) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/quicksight](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.28.3` -> `v1.29.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.29.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/quicksight/v1.28.3...service/quicksight/v1.29.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/quicksight/v1.28.3...service/quicksight/v1.29.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index b2ce711ada734f..e228c0ca570da3 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 github.com/aws/aws-sdk-go-v2/service/rds v1.38.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 8d3045e623b40d..878b0e9b9813e2 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -192,8 +192,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 h1:QoAzrTInIpXGHjaI5z github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0/go.mod h1:SiHyOVjKY74qa5H6RTexGKLjQLg43lZ/jZT5Z84FhU0= github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 h1:/OCgIWXxvyw/f9904V5DwE8YtFi2XsGMmIVd3Aj4h6Y= github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22/go.mod h1:yanKnbAjmnFTI9U5QxkN+ovlq/eXlew5rMhmfYDek2I= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3 h1:oOITThfr01t8r/v/RzRuHV+EqN5dAalVpMNODRS6zF4= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.28.3/go.mod h1:wvJpr20R/imRPZsRJMkxCYV5zquGzJbASqARtCbiKKE= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 h1:iL7otrHmucGPfW2NzV4R4lCnRzJKxh8ePstzA3I+Iv8= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0/go.mod h1:wvJpr20R/imRPZsRJMkxCYV5zquGzJbASqARtCbiKKE= github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 h1:N6sleYzj/LBqeTk53KPGA6+chMQj5m4txIavGZtPmtQ= github.com/aws/aws-sdk-go-v2/service/ram v1.16.26/go.mod h1:hKHJTTpBpOG9+TPPnRjsvXsPytZFmXX0FRDEMiBOcek= github.com/aws/aws-sdk-go-v2/service/rds v1.38.0 h1:4LyiHO7LPBNQmP8QbK4pa/9wgjpaI16Z4PGZVNJhKTA= From ed4cd10e81c576f1c03c6c77400db17a673db843 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 03:11:32 +0200 Subject: [PATCH 094/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/rds to v1.39.0 (#6499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/rds](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.38.0` -> `v1.39.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.39.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/rds/v1.38.0...service/rds/v1.39.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/rds/v1.38.0...service/rds/v1.39.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- .../source/aws/docs/tables/aws_rds_engine_versions.md | 2 ++ plugins/source/aws/docs/tables/aws_rds_instances.md | 1 + plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- .../aws/resources/services/rds/engine_versions.go | 10 ++++++++++ plugins/source/aws/resources/services/rds/instances.go | 5 +++++ 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md index 97466fac7fa97e..af1b2473eaa8f9 100644 --- a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md +++ b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md @@ -36,12 +36,14 @@ The following tables depend on aws_rds_engine_versions: |kms_key_id|String| |major_engine_version|String| |status|String| +|supported_ca_certificate_identifiers|StringArray| |supported_character_sets|JSON| |supported_engine_modes|StringArray| |supported_feature_names|StringArray| |supported_nchar_character_sets|JSON| |supported_timezones|JSON| |supports_babelfish|Bool| +|supports_certificate_rotation_without_restart|Bool| |supports_global_databases|Bool| |supports_log_exports_to_cloudwatch_logs|Bool| |supports_parallel_query|Bool| diff --git a/plugins/source/aws/docs/tables/aws_rds_instances.md b/plugins/source/aws/docs/tables/aws_rds_instances.md index 0169bf78a79ba0..7ee88bc6b21a07 100644 --- a/plugins/source/aws/docs/tables/aws_rds_instances.md +++ b/plugins/source/aws/docs/tables/aws_rds_instances.md @@ -33,6 +33,7 @@ The primary key for this table is **arn**. |backup_retention_period|Int| |backup_target|String| |ca_certificate_identifier|String| +|certificate_details|JSON| |character_set_name|String| |copy_tags_to_snapshot|Bool| |custom_iam_instance_profile|String| diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e228c0ca570da3..4d4e2f04d13498 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 - github.com/aws/aws-sdk-go-v2/service/rds v1.38.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 878b0e9b9813e2..6de2ae27eb84e5 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -196,8 +196,8 @@ github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 h1:iL7otrHmucGPfW2NzV4R4 github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0/go.mod h1:wvJpr20R/imRPZsRJMkxCYV5zquGzJbASqARtCbiKKE= github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 h1:N6sleYzj/LBqeTk53KPGA6+chMQj5m4txIavGZtPmtQ= github.com/aws/aws-sdk-go-v2/service/ram v1.16.26/go.mod h1:hKHJTTpBpOG9+TPPnRjsvXsPytZFmXX0FRDEMiBOcek= -github.com/aws/aws-sdk-go-v2/service/rds v1.38.0 h1:4LyiHO7LPBNQmP8QbK4pa/9wgjpaI16Z4PGZVNJhKTA= -github.com/aws/aws-sdk-go-v2/service/rds v1.38.0/go.mod h1:Ume9NHqT871hUdxIRojWtWsPFyCswQmSjHHhyGot7v0= +github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 h1:SnusHwHQWMZxlS5gvRfzsg1Odq7gWl3STP4aUIqzRGE= +github.com/aws/aws-sdk-go-v2/service/rds v1.39.0/go.mod h1:Ume9NHqT871hUdxIRojWtWsPFyCswQmSjHHhyGot7v0= github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 h1:a/DqQAS4PqbnEgZj/BDIkc3c31jY3w+M+5/RuSXYKNk= github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18/go.mod h1:cpzzZf+cK9kF7PAbJOU491GGQO/8+oD4jtbawDUG+pc= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 h1:DcD2mZOpFmo3HOd4LaXcDuOzPcCYEhumLMSrde/tgFM= diff --git a/plugins/source/aws/resources/services/rds/engine_versions.go b/plugins/source/aws/resources/services/rds/engine_versions.go index 80339282f43c7d..0c4698d6170634 100644 --- a/plugins/source/aws/resources/services/rds/engine_versions.go +++ b/plugins/source/aws/resources/services/rds/engine_versions.go @@ -121,6 +121,11 @@ func EngineVersions() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("Status"), }, + { + Name: "supported_ca_certificate_identifiers", + Type: schema.TypeStringArray, + Resolver: schema.PathResolver("SupportedCACertificateIdentifiers"), + }, { Name: "supported_character_sets", Type: schema.TypeJSON, @@ -151,6 +156,11 @@ func EngineVersions() *schema.Table { Type: schema.TypeBool, Resolver: schema.PathResolver("SupportsBabelfish"), }, + { + Name: "supports_certificate_rotation_without_restart", + Type: schema.TypeBool, + Resolver: schema.PathResolver("SupportsCertificateRotationWithoutRestart"), + }, { Name: "supports_global_databases", Type: schema.TypeBool, diff --git a/plugins/source/aws/resources/services/rds/instances.go b/plugins/source/aws/resources/services/rds/instances.go index dee217634ced76..42dd61c5d8d807 100644 --- a/plugins/source/aws/resources/services/rds/instances.go +++ b/plugins/source/aws/resources/services/rds/instances.go @@ -122,6 +122,11 @@ func Instances() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("CACertificateIdentifier"), }, + { + Name: "certificate_details", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("CertificateDetails"), + }, { Name: "character_set_name", Type: schema.TypeString, From 9efd1217a33b38944f91e64f0e3cfc50c3ce2d82 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 03:29:18 +0200 Subject: [PATCH 095/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/resourcegroups to v1.13.0 (#6501) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/resourcegroups](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.12.23` -> `v1.13.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.13.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/resourcegroups/v1.12.23...v1.13.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/resourcegroups/v1.12.23...v1.13.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 4d4e2f04d13498..99d2132c2a4c77 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 6de2ae27eb84e5..4847fa4fd9f883 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -200,8 +200,8 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 h1:SnusHwHQWMZxlS5gvRfzsg1Odq7g github.com/aws/aws-sdk-go-v2/service/rds v1.39.0/go.mod h1:Ume9NHqT871hUdxIRojWtWsPFyCswQmSjHHhyGot7v0= github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 h1:a/DqQAS4PqbnEgZj/BDIkc3c31jY3w+M+5/RuSXYKNk= github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18/go.mod h1:cpzzZf+cK9kF7PAbJOU491GGQO/8+oD4jtbawDUG+pc= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 h1:DcD2mZOpFmo3HOd4LaXcDuOzPcCYEhumLMSrde/tgFM= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 h1:YJCC58cjhiXvvKSOPTP1+K6fFKbZWo8eUpdQeCPZMHs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 h1:0isIvtqn8syj503AEQSdu56dMtuEeu0h5LJ7sgpR8CY= From ba2aa9e975664b4249c093c329a7c5f9d2884bae Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 03:48:13 +0200 Subject: [PATCH 096/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/route53domains to v1.14.0 (#6503) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/route53domains](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.0` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.13.0...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.13.0...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 99d2132c2a4c77..6c5144c017c501 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -74,7 +74,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 4847fa4fd9f883..3d123335aadafe 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -204,8 +204,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 h1:YJCC58cjhiXvvKSOP github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 h1:0isIvtqn8syj503AEQSdu56dMtuEeu0h5LJ7sgpR8CY= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 h1:I/rT8QFy58zw4A/tkTPsTjkIe3LaKI6UsvDn/YdJgE0= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 h1:HILTJewyveEWszPKAN3C3gALrs2x13tCIN3BZZrUgkE= From 0091d82fb507266d324cdeaf4a66347ee1531313 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 03:49:33 +0200 Subject: [PATCH 097/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/s3 to v1.30.0 (#6504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/s3](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.29.6` -> `v1.30.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.30.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/s3/v1.29.6...service/s3/v1.30.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/s3/v1.29.6...service/s3/v1.30.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/digitalocean/go.mod | 2 +- plugins/source/digitalocean/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index 6a9a53017f9870..057b4761622470 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -6,7 +6,7 @@ require ( github.com/avast/retry-go/v4 v4.3.1 github.com/aws/aws-sdk-go-v2 v1.17.3 github.com/aws/aws-sdk-go-v2/config v1.18.8 - github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 + github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/smithy-go v1.13.5 github.com/cloudquery/plugin-sdk v1.21.0 github.com/digitalocean/godo v1.93.0 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index d836edc8259eda..081cda1f0d0c75 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -61,8 +61,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViS github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 h1:vY5siRXvW5TrOKm2qKEf9tliBfdLxdfy0i02LOcmqUo= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21/go.mod h1:WZvNXT1XuH8dnJM0HvOlvk+RNn7NbAPvA/ACO0QarSc= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c= github.com/aws/aws-sdk-go-v2/service/sso v1.12.0/go.mod h1:wo/B7uUm/7zw/dWhBJ4FXuw1sySU5lyIhVg1Bu2yL9A= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 h1:Jfly6mRxk2ZOSlbCvZfKNS7TukSx1mIzhSsqZ/IGSZI= From 47fa203c1be135d6e06ca6a39c580a502d24e29f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 04:13:29 +0200 Subject: [PATCH 098/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/s3control to v1.29.0 (#6505) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/s3control](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.28.2` -> `v1.29.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.29.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/s3control/v1.28.2...service/s3control/v1.29.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/s3control/v1.28.2...service/s3control/v1.29.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 6c5144c017c501..faab062f6643fc 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -76,7 +76,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 + github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 3d123335aadafe..ce9bbc93d82f63 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -208,8 +208,8 @@ github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 h1:I/rT8QFy58zw4A/tk github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 h1:HILTJewyveEWszPKAN3C3gALrs2x13tCIN3BZZrUgkE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2/go.mod h1:4DfdtJVYJj82pZdBoOwyA87ocrDYfQgAgbW6e17Xr2U= +github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 h1:pK0WPrNx459/ZDyiQh2dZg9G1o/H/qNStrN98SHPFqo= +github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0/go.mod h1:4DfdtJVYJj82pZdBoOwyA87ocrDYfQgAgbW6e17Xr2U= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 h1:yQjFY8oQcFVXkCNNoQdolB/Rbq1KMtB64NxlfteaM/s= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0/go.mod h1:v+qgYDefdlOgci1kvpeo9jwo0J66r/i+z1WJWher+cE= github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3 h1:y06COYMS5OWfEv31VWaOCgTXsfWEZydwqqGvTkvl9nc= From a56a3e0b885b913d0cee5bc17e01350e967cf866 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 04:30:48 +0200 Subject: [PATCH 099/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/scheduler to v1.1.0 (#6507) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/scheduler](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.0.3` -> `v1.1.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.1.0`](https://togithub.com/aws/aws-sdk-go-v2/releases/tag/v1.1.0): (2021-01-29) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/scheduler/v1.0.3...v1.1.0) #### Service Client Highlights - Bug Fix: A serialization bug has been fixed that caused some service operations with empty inputs to not be serialized correctly ([#​1071](https://togithub.com/aws/aws-sdk-go-v2/pull/1071)) - Bug Fix: Fixes a bug that could cause a waiter to fail when comparing types ([#​1083](https://togithub.com/aws/aws-sdk-go-v2/pull/1083)) #### Core SDK Highlights - Feature: EndpointResolverFromURL helpers have been added for constructing a service EndpointResolver type ([#​1066](https://togithub.com/aws/aws-sdk-go-v2/pull/1066)) - Dependency Update: Updated SDK dependencies to their latest versions. - `aws` - v1.1.0 - Feature: Add support for specifying the EndpointSource on aws.Endpoint types ([#​1070](https://togithub.com/aws/aws-sdk-go-v2/pull/1070/)) - `config` - v1.1.0 - Feature: Add Support for AWS Single Sign-On (SSO) credential provider ([#​1072](https://togithub.com/aws/aws-sdk-go-v2/pull/1072)) - `credentials` - v1.1.0 - Feature: Add AWS Single Sign-On (SSO) credential provider ([#​1072](https://togithub.com/aws/aws-sdk-go-v2/pull/1072))
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index faab062f6643fc..e71cba93bfbcba 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.15.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index ce9bbc93d82f63..5b80760302b00c 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -212,8 +212,8 @@ github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 h1:pK0WPrNx459/ZDyiQh2dZg github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0/go.mod h1:4DfdtJVYJj82pZdBoOwyA87ocrDYfQgAgbW6e17Xr2U= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 h1:yQjFY8oQcFVXkCNNoQdolB/Rbq1KMtB64NxlfteaM/s= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0/go.mod h1:v+qgYDefdlOgci1kvpeo9jwo0J66r/i+z1WJWher+cE= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3 h1:y06COYMS5OWfEv31VWaOCgTXsfWEZydwqqGvTkvl9nc= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.3/go.mod h1:ZnD5i/e5nCIh1w3ivCfifQ5r4PLh3aOCElnOrZz+WnQ= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 h1:4AYYktQrNoGvQS7hm6SYTUYIbFC/T23I54Dx8KIM5AY= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0/go.mod h1:ZnD5i/e5nCIh1w3ivCfifQ5r4PLh3aOCElnOrZz+WnQ= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 h1:6W6BLZcXytRJsVvc2gGwxKE4wbMSlWqdxZivBP/E+ys= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.15.2 h1:z8OpD43IKDSDmYdKSLkV0/cLKhxosj82j/5klEExu3A= From 1e69f8dd2ea31117bbe0bd3ff2056eab849ccd67 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 04:49:47 +0200 Subject: [PATCH 100/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/servicecatalog to v1.16.0 (#6509) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/servicecatalog](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.2` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicecatalog/v1.15.2...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicecatalog/v1.15.2...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e71cba93bfbcba..124fbe9f4edd2d 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.15.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 github.com/aws/aws-sdk-go-v2/service/ses v1.14.23 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 5b80760302b00c..c4cafef8a97fe5 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -216,8 +216,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 h1:4AYYktQrNoGvQS7hm6SYTUY github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0/go.mod h1:ZnD5i/e5nCIh1w3ivCfifQ5r4PLh3aOCElnOrZz+WnQ= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 h1:6W6BLZcXytRJsVvc2gGwxKE4wbMSlWqdxZivBP/E+ys= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.15.2 h1:z8OpD43IKDSDmYdKSLkV0/cLKhxosj82j/5klEExu3A= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.15.2/go.mod h1:r0xKT6nzw2oTEZ37LdnSCRA85zZwRFt0Cmc40+b9Rmk= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 h1:Yo5zv0KriAoPCo4yWCrcJ7IURim9PYNrAVZ3tP+IUfw= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0/go.mod h1:r0xKT6nzw2oTEZ37LdnSCRA85zZwRFt0Cmc40+b9Rmk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 h1:o1yfwnYPIePeya0etsxv1qrc46WM6wyVZld1AuXhvYk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2/go.mod h1:H/ErouUYrKFwuRLD4MIUeoyZgupytldUbDzCACH+Rys= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 h1:QTbShmzWTmoF5dbd0K34aY1tXZV7LO6NJ1iRnJQ9v8I= From 5f01dcfaf5b4c07f05905e9b25adea9482270379 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 05:07:30 +0200 Subject: [PATCH 101/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/qldb to v1.15.0 (#6496) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/qldb](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.14.22` -> `v1.15.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.15.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/qldb/v1.14.22...v1.15.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/qldb/v1.14.22...v1.15.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 124fbe9f4edd2d..fe154fb7da72f5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 - github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 + github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c4cafef8a97fe5..c2350ec5e958ed 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -190,8 +190,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 h1:ugVidYCmMOdCDnf+244pRn3u github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0/go.mod h1:kBudc/ZVbpqaZmWaZiQgyujuCgsPqh6kYlzGeW65wh4= github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 h1:QoAzrTInIpXGHjaI5zuy1IfzKsbuB0eQucV2npoBDRY= github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0/go.mod h1:SiHyOVjKY74qa5H6RTexGKLjQLg43lZ/jZT5Z84FhU0= -github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22 h1:/OCgIWXxvyw/f9904V5DwE8YtFi2XsGMmIVd3Aj4h6Y= -github.com/aws/aws-sdk-go-v2/service/qldb v1.14.22/go.mod h1:yanKnbAjmnFTI9U5QxkN+ovlq/eXlew5rMhmfYDek2I= +github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0 h1:thIf/AZspDQ8tnDzRtXkP3YH9rPZAKR4lnkr9FcSQZk= +github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0/go.mod h1:yanKnbAjmnFTI9U5QxkN+ovlq/eXlew5rMhmfYDek2I= github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 h1:iL7otrHmucGPfW2NzV4R4lCnRzJKxh8ePstzA3I+Iv8= github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0/go.mod h1:wvJpr20R/imRPZsRJMkxCYV5zquGzJbASqARtCbiKKE= github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 h1:N6sleYzj/LBqeTk53KPGA6+chMQj5m4txIavGZtPmtQ= From 306bcc5d81b2b86014ab5b2cf08d59f9951c2426 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 05:25:06 +0200 Subject: [PATCH 102/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/ram to v1.17.0 (#6498) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/ram](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.26` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ram/v1.16.26...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ram/v1.16.26...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index fe154fb7da72f5..b7a3ed38e4496b 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -69,7 +69,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 - github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 + github.com/aws/aws-sdk-go-v2/service/ram v1.17.0 github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c2350ec5e958ed..3528e666cef81b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -194,8 +194,8 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0 h1:thIf/AZspDQ8tnDzRtXkP3YH9rP github.com/aws/aws-sdk-go-v2/service/qldb v1.15.0/go.mod h1:yanKnbAjmnFTI9U5QxkN+ovlq/eXlew5rMhmfYDek2I= github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 h1:iL7otrHmucGPfW2NzV4R4lCnRzJKxh8ePstzA3I+Iv8= github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0/go.mod h1:wvJpr20R/imRPZsRJMkxCYV5zquGzJbASqARtCbiKKE= -github.com/aws/aws-sdk-go-v2/service/ram v1.16.26 h1:N6sleYzj/LBqeTk53KPGA6+chMQj5m4txIavGZtPmtQ= -github.com/aws/aws-sdk-go-v2/service/ram v1.16.26/go.mod h1:hKHJTTpBpOG9+TPPnRjsvXsPytZFmXX0FRDEMiBOcek= +github.com/aws/aws-sdk-go-v2/service/ram v1.17.0 h1:kiOOQz6ZhYrcHaYcgsIPlIfvYT44FNErJpeBtXQzHEs= +github.com/aws/aws-sdk-go-v2/service/ram v1.17.0/go.mod h1:hKHJTTpBpOG9+TPPnRjsvXsPytZFmXX0FRDEMiBOcek= github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 h1:SnusHwHQWMZxlS5gvRfzsg1Odq7gWl3STP4aUIqzRGE= github.com/aws/aws-sdk-go-v2/service/rds v1.39.0/go.mod h1:Ume9NHqT871hUdxIRojWtWsPFyCswQmSjHHhyGot7v0= github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 h1:a/DqQAS4PqbnEgZj/BDIkc3c31jY3w+M+5/RuSXYKNk= From 4c82e8be4121cd1e9c6025ee5e1c55021ca35ca8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 05:48:14 +0200 Subject: [PATCH 103/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/redshift to v1.27.0 (#6500) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/redshift](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.26.18` -> `v1.27.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.27.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/redshift/v1.26.18...service/redshift/v1.27.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/redshift/v1.26.18...service/redshift/v1.27.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index b7a3ed38e4496b..73b92d216f3271 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -71,7 +71,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.29.0 github.com/aws/aws-sdk-go-v2/service/ram v1.17.0 github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 - github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 + github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 3528e666cef81b..2f419a84e16ee8 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -198,8 +198,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.17.0 h1:kiOOQz6ZhYrcHaYcgsIPlIfvYT44 github.com/aws/aws-sdk-go-v2/service/ram v1.17.0/go.mod h1:hKHJTTpBpOG9+TPPnRjsvXsPytZFmXX0FRDEMiBOcek= github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 h1:SnusHwHQWMZxlS5gvRfzsg1Odq7gWl3STP4aUIqzRGE= github.com/aws/aws-sdk-go-v2/service/rds v1.39.0/go.mod h1:Ume9NHqT871hUdxIRojWtWsPFyCswQmSjHHhyGot7v0= -github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 h1:a/DqQAS4PqbnEgZj/BDIkc3c31jY3w+M+5/RuSXYKNk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18/go.mod h1:cpzzZf+cK9kF7PAbJOU491GGQO/8+oD4jtbawDUG+pc= +github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0 h1:kJDkVPtkB+gLwahLNtWs0vnjneny2Apqjrz1zdBYqb4= +github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0/go.mod h1:cpzzZf+cK9kF7PAbJOU491GGQO/8+oD4jtbawDUG+pc= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 h1:YJCC58cjhiXvvKSOPTP1+K6fFKbZWo8eUpdQeCPZMHs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4= From 4f8863cd922df654ef4860897ee22f8437192539 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 06:23:44 +0200 Subject: [PATCH 104/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/ses to v1.15.0 (#6512) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/ses](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.14.23` -> `v1.15.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.15.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ses/v1.14.23...v1.15.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/ses/v1.14.23...v1.15.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 73b92d216f3271..581f41b61993e1 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -83,7 +83,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 - github.com/aws/aws-sdk-go-v2/service/ses v1.14.23 + github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 github.com/aws/aws-sdk-go-v2/service/sfn v1.16.2 github.com/aws/aws-sdk-go-v2/service/sns v1.18.8 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2f419a84e16ee8..a47cddae090943 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -222,8 +222,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 h1:o1yfwn github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2/go.mod h1:H/ErouUYrKFwuRLD4MIUeoyZgupytldUbDzCACH+Rys= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 h1:QTbShmzWTmoF5dbd0K34aY1tXZV7LO6NJ1iRnJQ9v8I= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23/go.mod h1:8I7mkhR5OsSBE1FlKOZ7Etb5gtA9881M++HhCEhMj10= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.23 h1:d6Ivfh5RQtQBGgo4NrrRqNcwA5VuTYdd/hh+IBZgnYc= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.23/go.mod h1:yOTAnL3dDC5wYhxL6+PXAa/hvsia8ckCBqyhzptW5K8= +github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 h1:hFlk7D1Y4OHaxTSbgGY19gso4tmAXuLi0JRlSZkgCjI= +github.com/aws/aws-sdk-go-v2/service/ses v1.15.0/go.mod h1:yOTAnL3dDC5wYhxL6+PXAa/hvsia8ckCBqyhzptW5K8= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 h1:JK8OY6BvODGFdv1B01s3kTjdJWoCQQUIItcEJCZEbwo= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3/go.mod h1:Q+I4FY+sxSWRVgbNXULzRnK+REDSF8oXzY5Eya/Y33c= github.com/aws/aws-sdk-go-v2/service/sfn v1.16.2 h1:tIgwAUjuSgMgJcZ+RCM5y1wckV6Ex62SnchT95qp+1k= From c8e7d9cc72fd6ab71dc8916ef6ddc8902bf5b92b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 06:46:26 +0200 Subject: [PATCH 105/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/sfn to v1.17.0 (#6514) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/sfn](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.16.2` -> `v1.17.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.17.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.2...v1.17.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.16.2...v1.17.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 581f41b61993e1..5035cdb92982ab 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 - github.com/aws/aws-sdk-go-v2/service/sfn v1.16.2 + github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0 github.com/aws/aws-sdk-go-v2/service/sns v1.18.8 github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17 github.com/aws/aws-sdk-go-v2/service/ssm v1.34.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a47cddae090943..26e8e56f432fd5 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -226,8 +226,8 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 h1:hFlk7D1Y4OHaxTSbgGY19gso4tmA github.com/aws/aws-sdk-go-v2/service/ses v1.15.0/go.mod h1:yOTAnL3dDC5wYhxL6+PXAa/hvsia8ckCBqyhzptW5K8= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 h1:JK8OY6BvODGFdv1B01s3kTjdJWoCQQUIItcEJCZEbwo= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3/go.mod h1:Q+I4FY+sxSWRVgbNXULzRnK+REDSF8oXzY5Eya/Y33c= -github.com/aws/aws-sdk-go-v2/service/sfn v1.16.2 h1:tIgwAUjuSgMgJcZ+RCM5y1wckV6Ex62SnchT95qp+1k= -github.com/aws/aws-sdk-go-v2/service/sfn v1.16.2/go.mod h1:8M33kWcIYN1f2bfWrvKxzxveUN7UJv3dD3rmLoDaWrE= +github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0 h1:D/NRBYtylwdGLucbrKFMl3EpF8lVmC5TTlYPnYQQnio= +github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0/go.mod h1:8M33kWcIYN1f2bfWrvKxzxveUN7UJv3dD3rmLoDaWrE= github.com/aws/aws-sdk-go-v2/service/shield v1.17.13 h1:Omc6xBl4m4wMZoZWlt2f2Yjk6it7VEJMsvjC4oLCMGE= github.com/aws/aws-sdk-go-v2/service/shield v1.17.13/go.mod h1:0mYbbS2XwsqOGyD5ReNH4FV884zHQB1WcixrT0ckhRI= github.com/aws/aws-sdk-go-v2/service/sns v1.18.8 h1:Iwbdihm8vAnNJhnggU1D98JD79ZIIaOFFB8DBiA8Z48= From 135dc6b79f07e6af16aa44f18c19b8b585e2152f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 07:04:11 +0200 Subject: [PATCH 106/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/route53 to v1.26.0 (#6502) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/route53](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.25.2` -> `v1.26.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.26.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/route53/v1.25.2...service/route53/v1.26.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/route53/v1.25.2...service/route53/v1.26.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 5035cdb92982ab..8e021980b59c88 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.39.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 - github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 + github.com/aws/aws-sdk-go-v2/service/route53 v1.26.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 26e8e56f432fd5..1bb53aa3d96c5b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -202,8 +202,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0 h1:kJDkVPtkB+gLwahLNtWs0vn github.com/aws/aws-sdk-go-v2/service/redshift v1.27.0/go.mod h1:cpzzZf+cK9kF7PAbJOU491GGQO/8+oD4jtbawDUG+pc= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0 h1:YJCC58cjhiXvvKSOPTP1+K6fFKbZWo8eUpdQeCPZMHs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.13.0/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= -github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4= -github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= +github.com/aws/aws-sdk-go-v2/service/route53 v1.26.0 h1:Lt96i6l9YONN7X0KW5AgJJ84l3gAzBZcPqCbeEGhd3Y= +github.com/aws/aws-sdk-go-v2/service/route53 v1.26.0/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 h1:I/rT8QFy58zw4A/tkTPsTjkIe3LaKI6UsvDn/YdJgE0= github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a3gktjODY6jYQBo= From 6a7f928051691ca17e219af069d2422ed373cc33 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 07:21:44 +0200 Subject: [PATCH 107/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry to v1.16.0 (#6510) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.2` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicecatalogappregistry/v1.15.2...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicecatalogappregistry/v1.15.2...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 8e021980b59c88..f5bc083b06b2d1 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 1bb53aa3d96c5b..d0e7852e593df3 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -218,8 +218,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 h1:6W6BLZcXytRJsVvc2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 h1:Yo5zv0KriAoPCo4yWCrcJ7IURim9PYNrAVZ3tP+IUfw= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0/go.mod h1:r0xKT6nzw2oTEZ37LdnSCRA85zZwRFt0Cmc40+b9Rmk= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2 h1:o1yfwnYPIePeya0etsxv1qrc46WM6wyVZld1AuXhvYk= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.15.2/go.mod h1:H/ErouUYrKFwuRLD4MIUeoyZgupytldUbDzCACH+Rys= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 h1:FObz7TAV6hXLH9RPUgctQjBeXsQ9dlRlo+ob3s4Pbik= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0/go.mod h1:H/ErouUYrKFwuRLD4MIUeoyZgupytldUbDzCACH+Rys= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 h1:QTbShmzWTmoF5dbd0K34aY1tXZV7LO6NJ1iRnJQ9v8I= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23/go.mod h1:8I7mkhR5OsSBE1FlKOZ7Etb5gtA9881M++HhCEhMj10= github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 h1:hFlk7D1Y4OHaxTSbgGY19gso4tmAXuLi0JRlSZkgCjI= From 83f6116fa8e4e355502a07850def33304059d08a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 07:40:01 +0200 Subject: [PATCH 108/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/secretsmanager to v1.18.0 (#6508) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/secretsmanager](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.17.0` -> `v1.18.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.18.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.0...service/secretsmanager/v1.18.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.17.0...service/secretsmanager/v1.18.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index f5bc083b06b2d1..798d51d8eb07b2 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index d0e7852e593df3..0eb80eaf769c58 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -214,8 +214,8 @@ github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 h1:yQjFY8oQcFVXkCNNoQdolB github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0/go.mod h1:v+qgYDefdlOgci1kvpeo9jwo0J66r/i+z1WJWher+cE= github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 h1:4AYYktQrNoGvQS7hm6SYTUYIbFC/T23I54Dx8KIM5AY= github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0/go.mod h1:ZnD5i/e5nCIh1w3ivCfifQ5r4PLh3aOCElnOrZz+WnQ= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0 h1:6W6BLZcXytRJsVvc2gGwxKE4wbMSlWqdxZivBP/E+ys= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.17.0/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0 h1:UQDiRZyaHQGPXIuCYqKsz/wIVZknCiZdRmPW8buD/xc= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0/go.mod h1:jAeo/PdIJZuDSwsvxJS94G4d6h8tStj7WXVuKwLHWU8= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 h1:Yo5zv0KriAoPCo4yWCrcJ7IURim9PYNrAVZ3tP+IUfw= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0/go.mod h1:r0xKT6nzw2oTEZ37LdnSCRA85zZwRFt0Cmc40+b9Rmk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 h1:FObz7TAV6hXLH9RPUgctQjBeXsQ9dlRlo+ob3s4Pbik= From a4987ae191b9f5e660d29ca4a99f1469dd9e1fe7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:00:42 +0200 Subject: [PATCH 109/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/sesv2 to v1.16.0 (#6513) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/sesv2](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.15.3` -> `v1.16.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.16.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicecatalogappregistry/v1.15.2...v1.16.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/sesv2/v1.15.3...v1.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 798d51d8eb07b2..e2556f632ffb80 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.16.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0 github.com/aws/aws-sdk-go-v2/service/sns v1.18.8 github.com/aws/aws-sdk-go-v2/service/sqs v1.19.17 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 0eb80eaf769c58..595711a6a2f94e 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -224,8 +224,8 @@ github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 h1:QTbShmzWTmoF5dbd0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23/go.mod h1:8I7mkhR5OsSBE1FlKOZ7Etb5gtA9881M++HhCEhMj10= github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 h1:hFlk7D1Y4OHaxTSbgGY19gso4tmAXuLi0JRlSZkgCjI= github.com/aws/aws-sdk-go-v2/service/ses v1.15.0/go.mod h1:yOTAnL3dDC5wYhxL6+PXAa/hvsia8ckCBqyhzptW5K8= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3 h1:JK8OY6BvODGFdv1B01s3kTjdJWoCQQUIItcEJCZEbwo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.15.3/go.mod h1:Q+I4FY+sxSWRVgbNXULzRnK+REDSF8oXzY5Eya/Y33c= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.16.0 h1:ZVu7clQZjixs6IYUcpgkUoigjQn4HUToPiRd1AjmCl0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.16.0/go.mod h1:Q+I4FY+sxSWRVgbNXULzRnK+REDSF8oXzY5Eya/Y33c= github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0 h1:D/NRBYtylwdGLucbrKFMl3EpF8lVmC5TTlYPnYQQnio= github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0/go.mod h1:8M33kWcIYN1f2bfWrvKxzxveUN7UJv3dD3rmLoDaWrE= github.com/aws/aws-sdk-go-v2/service/shield v1.17.13 h1:Omc6xBl4m4wMZoZWlt2f2Yjk6it7VEJMsvjC4oLCMGE= From d5b465cf656c706fdf588657f6e31fd2dbe40021 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 10:58:58 +0200 Subject: [PATCH 110/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/mq to v1.14.0 (#6490) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/mq](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.18` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/mq/v1.13.18...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/mq/v1.13.18...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e2556f632ffb80..785c8a872519ef 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0 - github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 + github.com/aws/aws-sdk-go-v2/service/mq v1.14.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.18.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 595711a6a2f94e..5574f8ce7df06b 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -182,8 +182,8 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0 h1:3PrEtnvtaZcIFpjOkm155oNe6 github.com/aws/aws-sdk-go-v2/service/lambda v1.27.0/go.mod h1:swAeO/+tSUbMwB9EF2miaCxPDSQwzRjfnRsYaNwbeRk= github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0 h1:7sc6Mmr/Jx6OVC79PTwro3Y46e42ZzJmMdMU1BA983o= github.com/aws/aws-sdk-go-v2/service/lightsail v1.25.0/go.mod h1:6/SjaL8UNIHaMpaHIvuYk0jsMP////YmB/I5yHWginA= -github.com/aws/aws-sdk-go-v2/service/mq v1.13.18 h1:tH4kxJT0HUGVmLmOvrC0/cGjpDC2g7vlueGF/xxBO9E= -github.com/aws/aws-sdk-go-v2/service/mq v1.13.18/go.mod h1:zVok6IADzEtpRaHw5ZMh0GhBDCczGJRstMuvIxmhKag= +github.com/aws/aws-sdk-go-v2/service/mq v1.14.0 h1:04SEqGxjXmRJ2C437T4o3GT8VOm7sYFgWfGQwjiMUaY= +github.com/aws/aws-sdk-go-v2/service/mq v1.14.0/go.mod h1:zVok6IADzEtpRaHw5ZMh0GhBDCczGJRstMuvIxmhKag= github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0 h1:KSyaXsg1+VnX3ASoQ21/cIqz7l0NtjIqNAysmhvEvLI= github.com/aws/aws-sdk-go-v2/service/mwaa v1.14.0/go.mod h1:jalIW8gZHg5jsVAzlaOdgAcSNFUNBCQO2DC+QmXp6mw= github.com/aws/aws-sdk-go-v2/service/neptune v1.19.0 h1:ugVidYCmMOdCDnf+244pRn3uv+ob1NxdWBncan5sH/U= From 57207cfd05228f8e257764cabee6b6f14b01d1c1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 11:16:36 +0200 Subject: [PATCH 111/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/sagemaker to v1.62.0 (#6506) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/sagemaker](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.61.0` -> `v1.62.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.62.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/sagemaker/v1.61.0...service/sagemaker/v1.62.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/sagemaker/v1.61.0...service/sagemaker/v1.62.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 2am" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 785c8a872519ef..e2524676c476c5 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -77,7 +77,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.62.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 5574f8ce7df06b..bf7c8d4d4782d4 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -210,8 +210,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 h1:wddsyuESfviaiXk3w9N6/4iRwTg/a github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0 h1:pK0WPrNx459/ZDyiQh2dZg9G1o/H/qNStrN98SHPFqo= github.com/aws/aws-sdk-go-v2/service/s3control v1.29.0/go.mod h1:4DfdtJVYJj82pZdBoOwyA87ocrDYfQgAgbW6e17Xr2U= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0 h1:yQjFY8oQcFVXkCNNoQdolB/Rbq1KMtB64NxlfteaM/s= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.61.0/go.mod h1:v+qgYDefdlOgci1kvpeo9jwo0J66r/i+z1WJWher+cE= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.62.0 h1:zyZAG/kCMQMGng20RM4NXGuZhznsExxfhD12Od0eOvw= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.62.0/go.mod h1:v+qgYDefdlOgci1kvpeo9jwo0J66r/i+z1WJWher+cE= github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0 h1:4AYYktQrNoGvQS7hm6SYTUYIbFC/T23I54Dx8KIM5AY= github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.0/go.mod h1:ZnD5i/e5nCIh1w3ivCfifQ5r4PLh3aOCElnOrZz+WnQ= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0 h1:UQDiRZyaHQGPXIuCYqKsz/wIVZknCiZdRmPW8buD/xc= From b7e4e737a5f4d8f254960426ea8ba555d8f9b944 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 11:34:52 +0200 Subject: [PATCH 112/221] fix(deps): Update module github.com/cloudquery/plugin-sdk to v1.22.0 (#6516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/plugin-sdk](https://togithub.com/cloudquery/plugin-sdk) | require | minor | `v1.21.0` -> `v1.22.0` | --- ### Release Notes
cloudquery/plugin-sdk ### [`v1.22.0`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v1.22.0) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v1.21.0...v1.22.0) ##### Features - Add size in bytes to CQ types ([#​510](https://togithub.com/cloudquery/plugin-sdk/issues/510)) ([7c15d9a](https://togithub.com/cloudquery/plugin-sdk/commit/7c15d9a157ef895077ac749acf4adb57deb43fd8)) - Add WithIgnoreInTestsTransformer ([#​579](https://togithub.com/cloudquery/plugin-sdk/issues/579)) ([f836abd](https://togithub.com/cloudquery/plugin-sdk/commit/f836abd5addad71f3a4fa389730c4a9cdba1c219)) - Add WithResolverTransformer ([#​578](https://togithub.com/cloudquery/plugin-sdk/issues/578)) ([5aeba0e](https://togithub.com/cloudquery/plugin-sdk/commit/5aeba0e1bec90a28190fae38ebc6194fa27f7653))
--- ### 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 6 ++---- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 6 ++---- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 6 ++---- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 6 ++---- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 6 ++---- plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 6 ++---- plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/go.sum | 6 ++---- plugins/destination/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 6 ++---- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 6 ++---- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 6 ++---- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 6 ++---- plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 6 ++---- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- plugins/source/azure/go.mod | 2 +- plugins/source/azure/go.sum | 4 ++-- plugins/source/azuredevops/go.mod | 2 +- plugins/source/azuredevops/go.sum | 4 ++-- plugins/source/cloudflare/go.mod | 7 +------ plugins/source/cloudflare/go.sum | 11 ++--------- plugins/source/crowdstrike/go.mod | 3 +-- plugins/source/crowdstrike/go.sum | 6 ++---- plugins/source/datadog/go.mod | 2 +- plugins/source/datadog/go.sum | 4 ++-- plugins/source/digitalocean/go.mod | 2 +- plugins/source/digitalocean/go.sum | 4 ++-- plugins/source/fastly/go.mod | 2 +- plugins/source/fastly/go.sum | 4 ++-- plugins/source/gandi/go.mod | 2 +- plugins/source/gandi/go.sum | 4 ++-- plugins/source/gcp/go.mod | 2 +- plugins/source/gcp/go.sum | 4 ++-- plugins/source/github/go.mod | 2 +- plugins/source/github/go.sum | 4 ++-- plugins/source/gitlab/go.mod | 2 +- plugins/source/gitlab/go.sum | 4 ++-- plugins/source/heroku/go.mod | 2 +- plugins/source/heroku/go.sum | 4 ++-- plugins/source/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 ++-- plugins/source/okta/go.mod | 2 +- plugins/source/okta/go.sum | 4 ++-- plugins/source/pagerduty/go.mod | 2 +- plugins/source/pagerduty/go.sum | 4 ++-- plugins/source/salesforce/go.mod | 2 +- plugins/source/salesforce/go.sum | 4 ++-- plugins/source/shopify/go.mod | 2 +- plugins/source/shopify/go.sum | 4 ++-- plugins/source/slack/go.mod | 2 +- plugins/source/slack/go.sum | 4 ++-- plugins/source/snyk/go.mod | 5 ++--- plugins/source/snyk/go.sum | 6 ++---- plugins/source/tailscale/go.mod | 2 +- plugins/source/tailscale/go.sum | 4 ++-- plugins/source/terraform/go.mod | 2 +- plugins/source/terraform/go.sum | 4 ++-- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 ++-- plugins/source/vercel/go.mod | 2 +- plugins/source/vercel/go.sum | 4 ++-- 74 files changed, 112 insertions(+), 154 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 657340f5f00c6c..11a0c164ce4e82 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/getsentry/sentry-go v0.16.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/cli/go.sum b/cli/go.sum index a5b484bca81a05..c5712efdb7117d 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,8 +1,8 @@ github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE= github.com/avast/retry-go/v4 v4.3.1/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 14feff2ad4f055..4568991ab1bf43 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 2324d5edd54e19..b6f19ff6312ac8 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -52,10 +52,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index b7b9481b67a9e0..2525c9c1db7941 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 golang.org/x/sync v0.1.0 google.golang.org/api v0.103.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 3e6877fa62ef57..ab72c3ab5f2b7b 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -53,10 +53,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index bee66f36777b24..33359e36bcc060 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 48096ddf913ef2..61b5bd56e3851b 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -42,10 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 616bbef0e6d54c..8fe901e39b1954 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 0893ddd6f8d255..b35cee47ad07fa 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -53,10 +53,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 2b0410dea5c13d..b505dd2c7ad1e7 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index f5e4b884ff4a90..9d5ccc63cd6875 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -45,10 +45,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 69f511638aaa70..2a6104ce1269e9 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 go.mongodb.org/mongo-driver v1.11.1 ) diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index ea6a8ad966fb16..c42795c489e238 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -40,10 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 80567a7f9bfb49..515bf98f94ec9f 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/neo4j/neo4j-go-driver/v5 v5.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index ddafb98f5aa2ca..0b05f66ebcad65 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -40,10 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 5b3ae89f1ae2a4..1754efaa5eab07 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v5 v5.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 5491c08654b2c5..fa7063219feb33 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -40,10 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.18.0 h1:8n78JWjqeunEaIT2WNTE/jMbAFvDxhX4f8TnwgUX48I= -github.com/cloudquery/plugin-sdk v1.18.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 40576e6b26565d..8399257a95bf51 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 3796295df5b94f..d182eaf55bdc7c 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -80,10 +80,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index fffb723089537a..b9ac368aca0754 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 github.com/snowflakedb/gosnowflake v1.6.16 ) diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index f4b2a846239783..ab0cb73c0db0dc 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -103,10 +103,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index a916b82bf065ab..0dd61a94d73587 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index 40aed11f80ce56..f850de0dcfe5ba 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -40,10 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index 0052c9e8d2cc60..82b87695979b21 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index 3132c7ad1b3059..0630ad7bc8f9a2 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -40,10 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.19.0 h1:rA2FHLgon5J+VB6tK+w3LLJyegsL/vAkj3Xi9N1Xk1c= -github.com/cloudquery/plugin-sdk v1.19.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index e2524676c476c5..6c63d7cd90b21a 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/xray v1.15.3 github.com/aws/smithy-go v1.13.5 github.com/basgys/goxml2json v1.1.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index bf7c8d4d4782d4..9eca3b72cab1f8 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -270,8 +270,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azure/go.mod b/plugins/source/azure/go.mod index 073b672e7be04f..ff060ce5136dd2 100644 --- a/plugins/source/azure/go.mod +++ b/plugins/source/azure/go.mod @@ -96,7 +96,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsesu/armwindowsesu v0.5.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsiot/armwindowsiot v1.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/workloads/armworkloads v0.2.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gorilla/mux v1.8.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/azure/go.sum b/plugins/source/azure/go.sum index b9058d04ef5dab..41237e970a4f4b 100644 --- a/plugins/source/azure/go.sum +++ b/plugins/source/azure/go.sum @@ -231,8 +231,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azuredevops/go.mod b/plugins/source/azuredevops/go.mod index 87857c9e8f1707..da6f49ea26ce50 100644 --- a/plugins/source/azuredevops/go.mod +++ b/plugins/source/azuredevops/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/azuredevops go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 github.com/iancoleman/strcase v0.2.0 github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1 diff --git a/plugins/source/azuredevops/go.sum b/plugins/source/azuredevops/go.sum index 239cdeb6d25bbf..08eab2553a2601 100644 --- a/plugins/source/azuredevops/go.sum +++ b/plugins/source/azuredevops/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 3bb60811b86a0e..f8fb7162f8e569 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -4,16 +4,13 @@ go 1.19 require ( github.com/cloudflare/cloudflare-go v0.57.1 - github.com/cloudquery/plugin-sdk v1.21.0 - github.com/gertd/go-pluralize v0.2.1 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 - github.com/stretchr/testify v1.8.1 github.com/thoas/go-funk v0.9.3 ) require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/getsentry/sentry-go v0.16.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -26,7 +23,6 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -42,5 +38,4 @@ require ( google.golang.org/grpc v1.51.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 421ed590fa0dd1..81cbcd8b4be178 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.57.1 h1:c9OhL/WusagBirP+CIJeCqS7OjT9kiWjtJv4lwxp3ZM= github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVHwHqgXJofb1ya210GQ= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -59,8 +59,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -190,16 +188,11 @@ github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUq github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/plugins/source/crowdstrike/go.mod b/plugins/source/crowdstrike/go.mod index 1b2b0f5e3dc4f1..8cde84881bbdcf 100644 --- a/plugins/source/crowdstrike/go.mod +++ b/plugins/source/crowdstrike/go.mod @@ -3,11 +3,10 @@ module github.com/cloudquery/cloudquery/plugins/source/crowdstrike go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/crowdstrike/gofalcon v0.2.32 github.com/go-openapi/runtime v0.25.0 github.com/golang/mock v1.6.0 - github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/crowdstrike/go.sum b/plugins/source/crowdstrike/go.sum index 629a8cf2246fee..8206d24318eb75 100644 --- a/plugins/source/crowdstrike/go.sum +++ b/plugins/source/crowdstrike/go.sum @@ -74,8 +74,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -275,8 +275,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index 21dc031adb4a55..c787f0fbdc0259 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-api-client-go/v2 v2.6.1 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index de9c528c0be9d5..f1bb0136f9571e 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index 057b4761622470..cdd23175761877 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/smithy-go v1.13.5 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/digitalocean/godo v1.93.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 081cda1f0d0c75..adc814d685670b 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -77,8 +77,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/fastly/go.mod b/plugins/source/fastly/go.mod index 8ba4e683857fc0..2388bd70f233fd 100644 --- a/plugins/source/fastly/go.mod +++ b/plugins/source/fastly/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/fastly go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/fastly/go-fastly/v7 v7.0.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/fastly/go.sum b/plugins/source/fastly/go.sum index 363f19540e57d8..512dde31cb5720 100644 --- a/plugins/source/fastly/go.sum +++ b/plugins/source/fastly/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gandi/go.mod b/plugins/source/gandi/go.mod index d947dec707fd6c..9ba128cee4ccaa 100644 --- a/plugins/source/gandi/go.mod +++ b/plugins/source/gandi/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gandi go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gertd/go-pluralize v0.2.1 github.com/go-gandi/go-gandi v0.5.1-0.20221118201059-f69b292fa399 github.com/golang/mock v1.6.0 diff --git a/plugins/source/gandi/go.sum b/plugins/source/gandi/go.sum index 5df56db7b03200..808af58b5ce430 100644 --- a/plugins/source/gandi/go.sum +++ b/plugins/source/gandi/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gcp/go.mod b/plugins/source/gcp/go.mod index 6ad4f25c4d981d..40bd738d1e0878 100644 --- a/plugins/source/gcp/go.mod +++ b/plugins/source/gcp/go.mod @@ -34,7 +34,7 @@ require ( cloud.google.com/go/secretmanager v1.9.0 cloud.google.com/go/serviceusage v1.4.0 cloud.google.com/go/storage v1.28.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/googleapis/gax-go/v2 v2.7.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 diff --git a/plugins/source/gcp/go.sum b/plugins/source/gcp/go.sum index f7ffb4baeae93e..593f35a49ec827 100644 --- a/plugins/source/gcp/go.sum +++ b/plugins/source/gcp/go.sum @@ -110,8 +110,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index bce217c0303beb..e2a2c764cd3d6f 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/github go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/google/go-github/v48 v48.2.0 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 007a183a24bd9a..4270f422cb6189 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index 401fb4263100d8..287f71ef10451f 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gitlab go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 441908f917b1b7..82c1adf872f98a 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/heroku/go.mod b/plugins/source/heroku/go.mod index a80a6f65c33857..684e4806f8d8ff 100644 --- a/plugins/source/heroku/go.mod +++ b/plugins/source/heroku/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/heroku go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/go-cmp v0.5.9 github.com/googleapis/gax-go/v2 v2.7.0 github.com/heroku/heroku-go/v5 v5.5.0 diff --git a/plugins/source/heroku/go.sum b/plugins/source/heroku/go.sum index e760076d09bbe3..e0c8bbe55e6dca 100644 --- a/plugins/source/heroku/go.sum +++ b/plugins/source/heroku/go.sum @@ -49,8 +49,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index ea2755314334c8..585d55a5ecfe86 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/k8s go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/google/gnostic v0.6.9 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 9e29ae0d1d1300..0a02262058e89d 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 0670cb9712168f..0356298626f769 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/okta go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.1 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 04311bf752b2a1..497069d48c1d67 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index 89241afe4423e9..86955551fcda17 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/PagerDuty/go-pagerduty v1.6.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 62154630513986..638939e8f1d400 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/salesforce/go.mod b/plugins/source/salesforce/go.mod index 84051836756252..cfcce71148dd43 100644 --- a/plugins/source/salesforce/go.mod +++ b/plugins/source/salesforce/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/salesforce go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/salesforce/go.sum b/plugins/source/salesforce/go.sum index b9c4cd22345483..c1bb7c8e52d122 100644 --- a/plugins/source/salesforce/go.sum +++ b/plugins/source/salesforce/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/shopify/go.mod b/plugins/source/shopify/go.mod index 0d81ff276ddc29..9baa34835bcfa9 100644 --- a/plugins/source/shopify/go.mod +++ b/plugins/source/shopify/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/shopify go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/shopify/go.sum b/plugins/source/shopify/go.sum index d6d4b76941cb8f..a0dbc1cde91e41 100644 --- a/plugins/source/shopify/go.sum +++ b/plugins/source/shopify/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/slack/go.mod b/plugins/source/slack/go.mod index 8e422d15d16ec4..19f48cb336896e 100644 --- a/plugins/source/slack/go.mod +++ b/plugins/source/slack/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/slack go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/slack/go.sum b/plugins/source/slack/go.sum index e55ccc47c78037..a2c4b7f690f30c 100644 --- a/plugins/source/slack/go.sum +++ b/plugins/source/slack/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/snyk/go.mod b/plugins/source/snyk/go.mod index f40d1c4696663a..2581f354c73415 100644 --- a/plugins/source/snyk/go.mod +++ b/plugins/source/snyk/go.mod @@ -3,14 +3,12 @@ module github.com/cloudquery/cloudquery/plugins/source/snyk go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/google/uuid v1.3.0 - github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/pavel-snyk/snyk-sdk-go v0.4.1 github.com/rs/zerolog v1.28.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 - golang.org/x/sync v0.1.0 ) replace github.com/pavel-snyk/snyk-sdk-go => github.com/cloudquery/snyk-sdk-go v0.1.0 @@ -29,6 +27,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/thoas/go-funk v0.9.3 // indirect golang.org/x/net v0.4.0 // indirect + golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.3.0 // indirect golang.org/x/text v0.5.0 // indirect google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect diff --git a/plugins/source/snyk/go.sum b/plugins/source/snyk/go.sum index 82dba464cdc1f9..c839f59ed62d02 100644 --- a/plugins/source/snyk/go.sum +++ b/plugins/source/snyk/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cloudquery/snyk-sdk-go v0.1.0 h1:lJ/3EhLwUAdcR/sukSA+EzAnRE1jRRxm8ewLESCNW5Q= github.com/cloudquery/snyk-sdk-go v0.1.0/go.mod h1:LRL1TRuuM925gnyGp54WtS9p8S4yJMd0oS4JpLg+n7Y= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -127,8 +127,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/tailscale/go.mod b/plugins/source/tailscale/go.mod index 3af42d45b5fe0e..e5c352e4dd7136 100644 --- a/plugins/source/tailscale/go.mod +++ b/plugins/source/tailscale/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/tailscale go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/tailscale/go.sum b/plugins/source/tailscale/go.sum index 1e85e5221a436f..ff10932ffdd2d1 100644 --- a/plugins/source/tailscale/go.sum +++ b/plugins/source/tailscale/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 91ac6519bd444d..3f2bfec474b5a6 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index 9268a0dac6bc96..1b264c32bb7043 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -78,8 +78,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 7dec16b1c146af..562b7f33a4ac83 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 9fc1c38d6009d0..0630ad7bc8f9a2 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/vercel/go.mod b/plugins/source/vercel/go.mod index 5a1704b99d2cf9..16067da813c4ad 100644 --- a/plugins/source/vercel/go.mod +++ b/plugins/source/vercel/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/vercel go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.21.0 + github.com/cloudquery/plugin-sdk v1.22.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/vercel/go.sum b/plugins/source/vercel/go.sum index fb5576ac1d394a..5d8e236768d35e 100644 --- a/plugins/source/vercel/go.sum +++ b/plugins/source/vercel/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.21.0 h1:Oon4fFeUpc/QNkSwLPaoHcv9EVzcXK/6Y3ZaAcg7VOk= -github.com/cloudquery/plugin-sdk v1.21.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= +github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From 779907c996edf1019e2403de38c9c3acb86ded76 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Mon, 9 Jan 2023 11:36:57 +0200 Subject: [PATCH 113/221] fix(table-diff): Mark type changes as breaking (#6515) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary While we [auto migrate type changes](https://github.com/cloudquery/cloudquery/blob/a4987ae191b9f5e660d29ca4a99f1469dd9e1fe7/plugins/destination/postgresql/client/migrate.go#LL110C8-L110C8) I believe those should still be considered breaking as they can impact how the data is queried --- scripts/table_diff/changes/changes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/table_diff/changes/changes.go b/scripts/table_diff/changes/changes.go index 29847ce9ad066c..b45d54481fec88 100644 --- a/scripts/table_diff/changes/changes.go +++ b/scripts/table_diff/changes/changes.go @@ -101,7 +101,7 @@ func getColumnChanges(file *gitdiff.File, table string) (changes []change) { if addedColumn.dataType != deletedColumn.dataType { changes = append(changes, change{ Text: fmt.Sprintf("Table %s: column type changed from %s to %s for %s", backtickStrings(table, deletedColumn.dataType, addedColumn.dataType, deletedName)...), - Breaking: false, + Breaking: true, }) } From 926d2788a2108097288519709d951ce5dc47a1c3 Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Mon, 9 Jan 2023 04:42:36 -0500 Subject: [PATCH 114/221] feat: Move AWS to use built-in transformations (no codegen) (#6337) Similar to https://github.com/cloudquery/cloudquery/pull/6276 moving transformation to be part of our SDK https://github.com/cloudquery/plugin-sdk/pull/564 This is related to https://github.com/cloudquery/plugin-sdk/pull/573 Few notes on column changes: most of changes are just additional columns and this should be fine as we did too much transformation. we want to keep the code simple, focus on extraction and provide and easy way of doing "dumb" one level transformation via reflection. The additional column are because we have in some places a duplicate where we add our own `arn` so it can be consistent but this is our decision and we still want to be as close as possible to the API so some duplicates is fine (and it makes the code simple and consistent). breaking changes in `aws_docdb_pending_maintenance_actions ` those apparently never worked and those columns where always empty (they didn't have mock tests so we didn't catch those) Co-authored-by: Kemal <223029+disq@users.noreply.github.com> Co-authored-by: Kemal Hadimli --- plugins/source/aws/Makefile | 7 +- plugins/source/aws/client/helpers.go | 29 + plugins/source/aws/codegen/main.go | 132 ---- .../aws/codegen/recipes/accessanalyzer.go | 70 --- plugins/source/aws/codegen/recipes/account.go | 46 -- plugins/source/aws/codegen/recipes/acm.go | 40 -- plugins/source/aws/codegen/recipes/amp.go | 52 -- .../source/aws/codegen/recipes/apigateway.go | 355 ----------- .../aws/codegen/recipes/apigatewayv2.go | 311 ---------- .../codegen/recipes/applicationautoscaling.go | 34 -- .../source/aws/codegen/recipes/apprunner.go | 172 ------ .../source/aws/codegen/recipes/appstream.go | 253 -------- plugins/source/aws/codegen/recipes/appsync.go | 34 -- plugins/source/aws/codegen/recipes/athena.go | 172 ------ .../source/aws/codegen/recipes/autoscaling.go | 125 ---- plugins/source/aws/codegen/recipes/backup.go | 156 ----- plugins/source/aws/codegen/recipes/base.go | 450 -------------- .../aws/codegen/recipes/cloudformation.go | 53 -- .../source/aws/codegen/recipes/cloudfront.go | 61 -- .../source/aws/codegen/recipes/cloudhsmv2.go | 60 -- .../source/aws/codegen/recipes/cloudtrail.go | 69 --- .../source/aws/codegen/recipes/cloudwatch.go | 45 -- .../aws/codegen/recipes/cloudwatchlogs.go | 69 --- .../source/aws/codegen/recipes/codebuild.go | 34 -- .../aws/codegen/recipes/codepipeline.go | 57 -- plugins/source/aws/codegen/recipes/cognito.go | 97 --- plugins/source/aws/codegen/recipes/config.go | 95 --- plugins/source/aws/codegen/recipes/dax.go | 39 -- .../aws/codegen/recipes/directconnect.go | 179 ------ .../aws/codegen/recipes/discover/discover.go | 133 ----- plugins/source/aws/codegen/recipes/dms.go | 42 -- plugins/source/aws/codegen/recipes/docdb.go | 238 -------- .../source/aws/codegen/recipes/dynamodb.go | 75 --- plugins/source/aws/codegen/recipes/ec2.go | 564 ------------------ plugins/source/aws/codegen/recipes/ecr.go | 108 ---- .../source/aws/codegen/recipes/ecrpublic.go | 55 -- plugins/source/aws/codegen/recipes/ecs.go | 130 ---- plugins/source/aws/codegen/recipes/efs.go | 39 -- plugins/source/aws/codegen/recipes/eks.go | 35 -- .../source/aws/codegen/recipes/elasticache.go | 231 ------- .../aws/codegen/recipes/elasticbeanstalk.go | 138 ----- .../aws/codegen/recipes/elasticsearch.go | 73 --- .../aws/codegen/recipes/elastictranscoder.go | 38 -- plugins/source/aws/codegen/recipes/elbv1.go | 72 --- plugins/source/aws/codegen/recipes/elbv2.go | 150 ----- plugins/source/aws/codegen/recipes/emr.go | 56 -- .../source/aws/codegen/recipes/eventbridge.go | 167 ------ .../source/aws/codegen/recipes/firehose.go | 41 -- .../aws/codegen/recipes/frauddetector.go | 138 ----- plugins/source/aws/codegen/recipes/fsx.go | 185 ------ plugins/source/aws/codegen/recipes/glacier.go | 103 ---- plugins/source/aws/codegen/recipes/glue.go | 403 ------------- .../source/aws/codegen/recipes/guardduty.go | 79 --- plugins/source/aws/codegen/recipes/iam.go | 490 --------------- .../aws/codegen/recipes/identitystore.go | 30 - .../source/aws/codegen/recipes/inspector.go | 44 -- .../source/aws/codegen/recipes/inspector2.go | 35 -- plugins/source/aws/codegen/recipes/iot.go | 264 -------- plugins/source/aws/codegen/recipes/kafka.go | 105 ---- plugins/source/aws/codegen/recipes/kinesis.go | 41 -- plugins/source/aws/codegen/recipes/kms.go | 88 --- plugins/source/aws/codegen/recipes/lambda.go | 224 ------- .../source/aws/codegen/recipes/lightsail.go | 351 ----------- plugins/source/aws/codegen/recipes/mq.go | 94 --- plugins/source/aws/codegen/recipes/mwaa.go | 36 -- plugins/source/aws/codegen/recipes/neptune.go | 224 ------- .../aws/codegen/recipes/organizations.go | 49 -- plugins/source/aws/codegen/recipes/qldb.go | 75 --- .../source/aws/codegen/recipes/quicksight.go | 240 -------- plugins/source/aws/codegen/recipes/ram.go | 88 --- plugins/source/aws/codegen/recipes/rds.go | 295 --------- .../source/aws/codegen/recipes/redshift.go | 154 ----- .../aws/codegen/recipes/resourcegroups.go | 48 -- plugins/source/aws/codegen/recipes/route53.go | 234 -------- plugins/source/aws/codegen/recipes/s3.go | 122 ---- .../source/aws/codegen/recipes/sagemaker.go | 111 ---- .../source/aws/codegen/recipes/scheduler.go | 53 -- .../aws/codegen/recipes/secretsmanager.go | 42 -- .../aws/codegen/recipes/servicecatalog.go | 81 --- .../aws/codegen/recipes/servicequota.go | 59 -- plugins/source/aws/codegen/recipes/ses.go | 135 ----- plugins/source/aws/codegen/recipes/shield.go | 99 --- plugins/source/aws/codegen/recipes/sns.go | 93 --- plugins/source/aws/codegen/recipes/sqs.go | 55 -- plugins/source/aws/codegen/recipes/ssm.go | 194 ------ .../source/aws/codegen/recipes/ssoadmin.go | 48 -- .../aws/codegen/recipes/stepfunction.go | 40 -- .../describe_resources_1/fetch.go.tpl | 35 -- .../describe_resources_1/mock_test.go.tpl | 54 -- .../fetch.go.tpl | 51 -- .../mock_test.go.tpl | 63 -- .../list_resources_1/README.md | 3 - .../list_resources_1/fetch.go.tpl | 34 -- .../list_resources_1/mock_test.go.tpl | 60 -- .../codegen/recipes/templates/resource.go.tpl | 12 - .../source/aws/codegen/recipes/timestream.go | 35 -- .../source/aws/codegen/recipes/transfer.go | 43 -- plugins/source/aws/codegen/recipes/waf.go | 119 ---- .../source/aws/codegen/recipes/wafregional.go | 112 ---- plugins/source/aws/codegen/recipes/wafv2.go | 192 ------ .../source/aws/codegen/recipes/workspaces.go | 48 -- plugins/source/aws/codegen/recipes/xray.go | 62 -- .../source/aws/codegen/services/clients.go | 207 ------- .../aws/codegen/services/custom/s3manager.go | 11 - .../source/aws/codegen/services/generate.go | 206 ------- .../services/models/s3manager/s3manager.go | 22 - .../codegen/services/templates/service.go.tpl | 14 - .../services/templates/services.go.tpl | 26 - plugins/source/aws/codegen/tables/generate.go | 72 --- .../codegen/tables/templates/tables.go.tpl | 18 - .../aws/docs/tables/aws_apigatewayv2_apis.md | 1 + .../aws_applicationautoscaling_policies.md | 1 + ...s_apprunner_auto_scaling_configurations.md | 1 + .../docs/tables/aws_apprunner_connections.md | 1 + .../tables/aws_apprunner_custom_domains.md | 2 +- ..._apprunner_observability_configurations.md | 1 + .../aws/docs/tables/aws_apprunner_services.md | 1 + .../tables/aws_apprunner_vpc_connectors.md | 1 + .../aws_apprunner_vpc_ingress_connections.md | 1 + .../aws_autoscaling_group_scaling_policies.md | 1 + .../aws/docs/tables/aws_autoscaling_groups.md | 1 + .../aws_autoscaling_launch_configurations.md | 1 + .../aws_autoscaling_scheduled_actions.md | 1 + .../aws/docs/tables/aws_backup_plans.md | 1 + .../aws_backup_vault_recovery_points.md | 1 + .../aws/docs/tables/aws_backup_vaults.md | 1 + .../docs/tables/aws_cloudformation_stacks.md | 1 + .../aws/docs/tables/aws_cloudtrail_trails.md | 1 + .../aws_cloudwatchlogs_resource_policies.md | 4 +- .../docs/tables/aws_codepipeline_pipelines.md | 3 +- .../docs/tables/aws_codepipeline_webhooks.md | 4 +- .../docs/tables/aws_cognito_identity_pools.md | 3 +- .../docs/tables/aws_config_config_rules.md | 1 + .../tables/aws_config_conformance_packs.md | 2 + .../aws/docs/tables/aws_dax_clusters.md | 1 + .../tables/aws_directconnect_connections.md | 1 + .../docs/tables/aws_directconnect_gateways.md | 1 + .../aws/docs/tables/aws_directconnect_lags.md | 1 + .../aws_directconnect_virtual_gateways.md | 1 + .../aws_directconnect_virtual_interfaces.md | 3 +- .../tables/aws_dms_replication_instances.md | 1 + .../aws/docs/tables/aws_docdb_certificates.md | 1 + .../aws_docdb_cluster_parameter_groups.md | 1 + .../tables/aws_docdb_cluster_snapshots.md | 5 +- .../aws/docs/tables/aws_docdb_clusters.md | 1 + .../docs/tables/aws_docdb_global_clusters.md | 1 + .../aws/docs/tables/aws_docdb_instances.md | 1 + .../aws_docdb_pending_maintenance_actions.md | 8 +- .../docs/tables/aws_docdb_subnet_groups.md | 1 + .../aws/docs/tables/aws_dynamodb_tables.md | 1 + .../aws/docs/tables/aws_ec2_ebs_snapshots.md | 2 +- .../aws/docs/tables/aws_ec2_ebs_volumes.md | 2 +- .../aws_ec2_egress_only_internet_gateways.md | 4 +- .../source/aws/docs/tables/aws_ec2_eips.md | 4 +- .../aws/docs/tables/aws_ec2_flow_logs.md | 2 +- .../source/aws/docs/tables/aws_ec2_hosts.md | 4 +- .../source/aws/docs/tables/aws_ec2_images.md | 2 +- .../docs/tables/aws_ec2_internet_gateways.md | 4 +- .../aws/docs/tables/aws_ec2_key_pairs.md | 4 +- .../aws/docs/tables/aws_ec2_nat_gateways.md | 2 +- .../aws/docs/tables/aws_ec2_network_acls.md | 2 +- .../docs/tables/aws_ec2_reserved_instances.md | 2 +- .../aws/docs/tables/aws_ec2_route_tables.md | 2 +- .../docs/tables/aws_ec2_security_groups.md | 2 +- .../source/aws/docs/tables/aws_ec2_subnets.md | 2 +- .../aws_ec2_transit_gateway_attachments.md | 2 +- ...s_ec2_transit_gateway_multicast_domains.md | 2 +- ...ec2_transit_gateway_peering_attachments.md | 2 +- .../aws_ec2_transit_gateway_route_tables.md | 2 +- .../docs/tables/aws_ec2_transit_gateways.md | 4 +- ...ec2_vpc_endpoint_service_configurations.md | 4 +- .../tables/aws_ec2_vpc_endpoint_services.md | 2 +- .../aws/docs/tables/aws_ec2_vpc_endpoints.md | 2 +- .../tables/aws_ec2_vpc_peering_connections.md | 2 +- .../source/aws/docs/tables/aws_ec2_vpcs.md | 2 +- .../aws/docs/tables/aws_ec2_vpn_gateways.md | 2 +- .../aws/docs/tables/aws_ecr_registries.md | 3 +- .../docs/tables/aws_ecr_registry_policies.md | 3 +- .../aws/docs/tables/aws_ecr_repositories.md | 1 + .../docs/tables/aws_ecrpublic_repositories.md | 1 + .../docs/tables/aws_ecs_cluster_services.md | 3 +- .../aws/docs/tables/aws_ecs_cluster_tasks.md | 1 + .../aws/docs/tables/aws_ecs_clusters.md | 5 +- .../docs/tables/aws_ecs_task_definitions.md | 1 + .../aws/docs/tables/aws_efs_filesystems.md | 3 +- .../aws/docs/tables/aws_eks_clusters.md | 2 +- .../aws_elasticache_reserved_cache_nodes.md | 1 + ...s_elasticbeanstalk_application_versions.md | 1 + .../aws_elasticbeanstalk_applications.md | 1 + .../aws_elasticbeanstalk_environments.md | 2 + .../docs/tables/aws_elasticsearch_packages.md | 3 +- .../tables/aws_elasticsearch_vpc_endpoints.md | 3 +- .../aws/docs/tables/aws_elbv2_listeners.md | 1 + .../docs/tables/aws_elbv2_load_balancers.md | 1 + .../docs/tables/aws_elbv2_target_groups.md | 1 + .../aws/docs/tables/aws_emr_clusters.md | 3 +- .../aws_eventbridge_api_destinations.md | 1 + .../tables/aws_eventbridge_connections.md | 1 + .../tables/aws_firehose_delivery_streams.md | 1 + .../source/aws/docs/tables/aws_fsx_backups.md | 3 +- .../aws_fsx_data_repository_associations.md | 5 +- .../tables/aws_fsx_data_repository_tasks.md | 5 +- .../aws/docs/tables/aws_fsx_file_caches.md | 1 + .../aws/docs/tables/aws_fsx_file_systems.md | 1 + .../aws/docs/tables/aws_fsx_snapshots.md | 3 +- .../aws_fsx_storage_virtual_machines.md | 3 +- .../source/aws/docs/tables/aws_fsx_volumes.md | 3 +- .../tables/aws_glacier_vault_lock_policies.md | 5 +- .../aws/docs/tables/aws_glacier_vaults.md | 1 + .../aws/docs/tables/aws_glue_registries.md | 1 + .../docs/tables/aws_glue_registry_schemas.md | 1 + .../source/aws/docs/tables/aws_iam_groups.md | 1 + ...s_iam_openid_connect_identity_providers.md | 2 +- .../aws/docs/tables/aws_iam_policies.md | 1 + .../source/aws/docs/tables/aws_iam_roles.md | 5 +- .../tables/aws_iam_saml_identity_providers.md | 2 + .../tables/aws_iam_server_certificates.md | 1 + .../source/aws/docs/tables/aws_iam_users.md | 5 +- .../tables/aws_iam_virtual_mfa_devices.md | 2 +- .../docs/tables/aws_inspector2_findings.md | 1 + .../aws/docs/tables/aws_iot_billing_groups.md | 1 + .../docs/tables/aws_iot_ca_certificates.md | 1 + .../aws/docs/tables/aws_iot_certificates.md | 1 + .../source/aws/docs/tables/aws_iot_jobs.md | 1 + .../aws/docs/tables/aws_iot_policies.md | 1 + .../source/aws/docs/tables/aws_iot_streams.md | 1 + .../aws/docs/tables/aws_iot_thing_groups.md | 1 + .../aws/docs/tables/aws_iot_thing_types.md | 1 + .../source/aws/docs/tables/aws_iot_things.md | 1 + .../aws/docs/tables/aws_iot_topic_rules.md | 1 + .../tables/aws_kafka_cluster_operations.md | 1 + .../aws/docs/tables/aws_kafka_clusters.md | 1 + .../source/aws/docs/tables/aws_kafka_nodes.md | 1 + .../aws/docs/tables/aws_kinesis_streams.md | 1 + .../source/aws/docs/tables/aws_kms_aliases.md | 1 + .../tables/aws_lambda_function_aliases.md | 1 + .../docs/tables/aws_lambda_layer_versions.md | 1 + .../aws/docs/tables/aws_lightsail_buckets.md | 2 +- .../aws_lightsail_container_services.md | 2 +- .../aws_lightsail_database_snapshots.md | 4 +- .../docs/tables/aws_lightsail_databases.md | 4 +- .../tables/aws_lightsail_disk_snapshots.md | 4 +- .../aws_lightsail_instance_snapshots.md | 4 +- .../docs/tables/aws_lightsail_instances.md | 2 +- ...ightsail_load_balancer_tls_certificates.md | 4 +- .../tables/aws_lightsail_load_balancers.md | 2 +- .../source/aws/docs/tables/aws_mq_brokers.md | 1 + .../aws_neptune_cluster_parameter_groups.md | 1 + .../tables/aws_neptune_cluster_snapshots.md | 1 + .../aws/docs/tables/aws_neptune_clusters.md | 1 + .../tables/aws_neptune_db_parameter_groups.md | 1 + .../tables/aws_neptune_event_subscriptions.md | 1 + .../tables/aws_neptune_global_clusters.md | 1 + .../aws/docs/tables/aws_neptune_instances.md | 1 + .../docs/tables/aws_neptune_subnet_groups.md | 3 +- .../docs/tables/aws_quicksight_analyses.md | 2 + .../docs/tables/aws_quicksight_dashboards.md | 2 + .../docs/tables/aws_quicksight_data_sets.md | 2 + .../tables/aws_quicksight_data_sources.md | 2 + .../aws/docs/tables/aws_quicksight_folders.md | 2 + .../tables/aws_quicksight_group_members.md | 3 + .../aws/docs/tables/aws_quicksight_groups.md | 2 + .../docs/tables/aws_quicksight_ingestions.md | 2 + .../docs/tables/aws_quicksight_templates.md | 2 + .../aws/docs/tables/aws_quicksight_users.md | 2 + .../aws/docs/tables/aws_ram_principals.md | 2 +- .../aws_ram_resource_share_associations.md | 2 +- .../aws_ram_resource_share_invitations.md | 3 +- .../docs/tables/aws_ram_resource_shares.md | 7 +- .../aws/docs/tables/aws_ram_resource_types.md | 4 +- .../aws/docs/tables/aws_rds_certificates.md | 1 + .../aws_rds_cluster_parameter_groups.md | 1 + .../docs/tables/aws_rds_cluster_parameters.md | 2 + .../docs/tables/aws_rds_cluster_snapshots.md | 1 + .../aws/docs/tables/aws_rds_clusters.md | 1 + .../tables/aws_rds_db_parameter_groups.md | 1 + .../docs/tables/aws_rds_db_security_groups.md | 1 + .../aws/docs/tables/aws_rds_db_snapshots.md | 1 + .../docs/tables/aws_rds_engine_versions.md | 2 +- .../tables/aws_rds_event_subscriptions.md | 1 + .../aws/docs/tables/aws_rds_instances.md | 1 + .../aws/docs/tables/aws_rds_subnet_groups.md | 1 + .../aws_redshift_event_subscriptions.md | 4 +- .../docs/tables/aws_redshift_subnet_groups.md | 2 +- plugins/source/aws/docs/tables/aws_regions.md | 3 +- .../aws_sagemaker_endpoint_configurations.md | 1 + .../aws/docs/tables/aws_sagemaker_models.md | 1 + .../aws_sagemaker_notebook_instances.md | 1 + .../tables/aws_sagemaker_training_jobs.md | 1 + .../docs/tables/aws_secretsmanager_secrets.md | 2 +- .../tables/aws_servicecatalog_products.md | 1 + .../docs/tables/aws_servicequotas_quotas.md | 1 + ...es_configuration_set_event_destinations.md | 2 +- .../docs/tables/aws_ses_configuration_sets.md | 2 +- .../aws/docs/tables/aws_ses_contact_lists.md | 3 +- .../aws/docs/tables/aws_ses_identities.md | 2 +- .../aws/docs/tables/aws_shield_attacks.md | 1 + .../tables/aws_shield_protection_groups.md | 1 + .../aws/docs/tables/aws_shield_protections.md | 1 + .../docs/tables/aws_shield_subscriptions.md | 1 + .../aws/docs/tables/aws_sns_subscriptions.md | 1 + .../source/aws/docs/tables/aws_sqs_queues.md | 2 +- .../aws/docs/tables/aws_ssm_documents.md | 2 +- .../aws_stepfunctions_state_machines.md | 1 + .../aws/docs/tables/aws_waf_rule_groups.md | 5 +- .../source/aws/docs/tables/aws_waf_rules.md | 6 +- .../aws/docs/tables/aws_waf_web_acls.md | 8 +- .../docs/tables/aws_wafregional_web_acls.md | 3 +- .../source/aws/docs/tables/aws_xray_groups.md | 1 + plugins/source/aws/go.mod | 1 - plugins/source/aws/go.sum | 2 - .../accessanalyzer/analyzer_archive_rules.go | 25 +- .../accessanalyzer/analyzer_findings.go | 75 +-- .../services/accessanalyzer/analyzers.go | 46 +- .../services/account/alternate_contacts.go | 25 +- .../resources/services/account/contacts.go | 65 +- .../resources/services/acm/certificates.go | 130 +--- .../services/amp/rule_groups_namespaces.go | 35 +- .../aws/resources/services/amp/workspaces.go | 36 +- .../resources/services/apigateway/api_keys.go | 55 +- .../apigateway/client_certificates.go | 35 +- .../domain_name_base_path_mappings.go | 20 +- .../services/apigateway/domain_names.go | 91 +-- .../apigateway/rest_api_authorizers.go | 55 +- .../apigateway/rest_api_deployments.go | 25 +- .../rest_api_documentation_parts.go | 20 +- .../rest_api_documentation_versions.go | 20 +- .../apigateway/rest_api_gateway_responses.go | 30 +- .../services/apigateway/rest_api_models.go | 30 +- .../apigateway/rest_api_request_validators.go | 25 +- .../services/apigateway/rest_api_resources.go | 30 +- .../services/apigateway/rest_api_stages.go | 90 +-- .../services/apigateway/rest_apis.go | 71 +-- .../services/apigateway/usage_plan_keys.go | 25 +- .../services/apigateway/usage_plans.go | 45 +- .../services/apigateway/vpc_links.go | 40 +- .../services/apigatewayv2/api_authorizers.go | 60 +- .../services/apigatewayv2/api_deployments.go | 35 +- .../apigatewayv2/api_integration_responses.go | 35 +- .../services/apigatewayv2/api_integrations.go | 106 +--- .../services/apigatewayv2/api_models.go | 30 +- .../apigatewayv2/api_route_responses.go | 30 +- .../services/apigatewayv2/api_routes.go | 71 +-- .../services/apigatewayv2/api_stages.go | 75 +-- .../resources/services/apigatewayv2/apis.go | 81 +-- .../services/apigatewayv2/domain_names.go | 31 +- .../services/apigatewayv2/vpc_links.go | 50 +- .../applicationautoscaling/policies.go | 48 +- .../apprunner/auto_scaling_configurations.go | 50 +- .../services/apprunner/connections.go | 25 +- .../services/apprunner/custom_domains.go | 20 +- .../apprunner/observability_configurations.go | 40 +- .../services/apprunner/operations.go | 40 +- .../resources/services/apprunner/services.go | 76 +-- .../services/apprunner/vpc_connectors.go | 40 +- .../apprunner/vpc_ingress_connections.go | 40 +- .../services/appstream/app_blocks.go | 35 +- .../application_fleet_associations.go | 5 +- .../services/appstream/applications.go | 76 +-- .../services/appstream/directory_configs.go | 25 +- .../resources/services/appstream/fleets.go | 120 +--- .../services/appstream/image_builders.go | 90 +-- .../resources/services/appstream/images.go | 85 +-- .../services/appstream/stack_entitlements.go | 30 +- .../appstream/stack_user_associations.go | 10 +- .../resources/services/appstream/stacks.go | 70 +-- .../appstream/usage_report_subscriptions.go | 20 +- .../aws/resources/services/appstream/users.go | 40 +- .../services/appsync/graphql_apis.go | 65 +- .../athena/data_catalog_database_tables.go | 35 +- .../services/athena/data_catalog_databases.go | 15 +- .../services/athena/data_catalogs.go | 25 +- .../athena/work_group_named_queries.go | 35 +- .../athena/work_group_prepared_statements.go | 30 +- .../athena/work_group_query_executions.go | 60 +- .../resources/services/athena/work_groups.go | 30 +- .../autoscaling/group_lifecycle_hooks.go | 50 +- .../autoscaling/group_scaling_policies.go | 80 +-- .../resources/services/autoscaling/groups.go | 176 +----- .../autoscaling/launch_configurations.go | 100 +--- .../services/autoscaling/scheduled_actions.go | 55 +- .../services/backup/global_settings.go | 20 +- .../services/backup/plan_selections.go | 33 +- .../aws/resources/services/backup/plans.go | 50 +- .../services/backup/region_settings.go | 20 +- .../services/backup/vault_recovery_points.go | 105 +--- .../aws/resources/services/backup/vaults.go | 50 +- .../cloudformation/stack_resources.go | 45 +- .../services/cloudformation/stacks.go | 110 +--- .../services/cloudfront/cache_policies.go | 15 +- .../services/cloudfront/distributions.go | 50 +- .../resources/services/cloudhsmv2/backups.go | 55 +- .../resources/services/cloudhsmv2/clusters.go | 75 +-- .../cloudtrail/trail_event_selectors.go | 25 +- .../resources/services/cloudtrail/trails.go | 86 +-- .../services/cloudwatchlogs/log_groups.go | 40 +- .../services/cloudwatchlogs/metric_filters.go | 30 +- .../cloudwatchlogs/resource_policies.go | 20 +- .../resources/services/codebuild/projects.go | 140 +---- .../services/codepipeline/pipelines.go | 15 +- .../services/codepipeline/webhooks.go | 30 +- .../services/cognito/identity_pools.go | 50 +- .../cognito/user_pool_identity_providers.go | 45 +- .../resources/services/cognito/user_pools.go | 165 +---- .../config/config_rule_compliances.go | 15 +- .../resources/services/config/config_rules.go | 55 +- .../config/configuration_recorders.go | 55 +- .../conformance_pack_rule_compliances.go | 40 +- .../services/config/conformance_packs.go | 40 +- .../aws/resources/services/dax/clusters.go | 90 +-- .../services/directconnect/connections.go | 105 +--- .../directconnect/gateway_associations.go | 55 +- .../directconnect/gateway_attachments.go | 40 +- .../services/directconnect/gateways.go | 31 +- .../resources/services/directconnect/lags.go | 95 +-- .../directconnect/virtual_gateways.go | 10 +- .../directconnect/virtual_interfaces.go | 120 +--- .../services/dms/replication_instances.go | 130 +--- .../resources/services/docdb/certificates.go | 30 +- .../docdb/cluster_parameter_groups.go | 10 +- .../services/docdb/cluster_parameters.go | 55 +- .../services/docdb/cluster_snapshots.go | 75 +-- .../aws/resources/services/docdb/clusters.go | 160 +---- .../services/docdb/engine_versions.go | 35 +- .../services/docdb/event_categories.go | 5 +- .../services/docdb/event_subscriptions.go | 55 +- .../aws/resources/services/docdb/events.go | 35 +- .../services/docdb/global_clusters.go | 50 +- .../aws/resources/services/docdb/instances.go | 135 +---- .../docdb/orderable_db_instance_options.go | 38 +- .../docdb/pending_maintenance_actions.go | 35 +- .../pending_maintenance_actions_mock_test.go | 32 + .../resources/services/docdb/subnet_groups.go | 30 +- .../dynamodb/table_continuous_backups.go | 15 +- .../dynamodb/table_replica_auto_scalings.go | 30 +- .../aws/resources/services/dynamodb/tables.go | 106 +--- .../aws/resources/services/ec2/byoip_cidrs.go | 20 +- .../services/ec2/customer_gateways.go | 45 +- .../resources/services/ec2/ebs_snapshots.go | 85 +-- .../aws/resources/services/ec2/ebs_volumes.go | 80 +-- .../ec2/egress_only_internet_gateways.go | 15 +- .../source/aws/resources/services/ec2/eips.go | 70 +-- .../aws/resources/services/ec2/flow_logs.go | 80 +-- .../aws/resources/services/ec2/hosts.go | 90 +-- .../aws/resources/services/ec2/images.go | 150 +---- .../services/ec2/instance_statuses.go | 40 +- .../resources/services/ec2/instance_types.go | 125 +--- .../aws/resources/services/ec2/instances.go | 285 +-------- .../services/ec2/internet_gateways.go | 20 +- .../aws/resources/services/ec2/key_pairs.go | 35 +- .../resources/services/ec2/nat_gateways.go | 60 +- .../resources/services/ec2/network_acls.go | 35 +- .../services/ec2/network_interfaces.go | 130 +--- .../services/ec2/regional_configs.go | 15 +- .../aws/resources/services/ec2/regions.go | 15 +- .../services/ec2/reserved_instances.go | 90 +-- .../resources/services/ec2/route_tables.go | 35 +- .../resources/services/ec2/security_groups.go | 40 +- .../aws/resources/services/ec2/subnets.go | 105 +--- .../ec2/transit_gateway_attachments.go | 50 +- .../ec2/transit_gateway_multicast_domains.go | 40 +- .../transit_gateway_peering_attachments.go | 45 +- .../ec2/transit_gateway_route_tables.go | 35 +- .../services/ec2/transit_gateways.go | 30 +- .../vpc_endpoint_service_configurations.go | 75 +-- .../services/ec2/vpc_endpoint_services.go | 75 +-- .../resources/services/ec2/vpc_endpoints.go | 95 +-- .../services/ec2/vpc_peering_connections.go | 30 +- .../source/aws/resources/services/ec2/vpcs.go | 50 +- .../resources/services/ec2/vpn_gateways.go | 35 +- .../aws/resources/services/ecr/registries.go | 10 +- .../services/ecr/registry_policies.go | 5 +- .../resources/services/ecr/repositories.go | 40 +- .../services/ecr/repository_images.go | 5 +- .../services/ecrpublic/repositories.go | 25 +- .../services/ecrpublic/repository_images.go | 45 +- .../services/ecs/cluster_services.go | 150 +---- .../resources/services/ecs/cluster_tasks.go | 175 +----- .../aws/resources/services/ecs/clusters.go | 75 +-- .../services/ecs/task_definitions.go | 120 +--- .../aws/resources/services/efs/filesystems.go | 80 +-- .../aws/resources/services/eks/clusters.go | 95 +-- .../services/elasticache/clusters.go | 165 +---- .../services/elasticache/engine_versions.go | 20 +- .../elasticache/global_replication_groups.go | 65 +- .../services/elasticache/parameter_groups.go | 25 +- .../elasticache/replication_groups.go | 150 +---- .../elasticache/reserved_cache_nodes.go | 65 +- .../reserved_cache_nodes_offerings.go | 45 +- .../services/elasticache/service_updates.go | 65 +- .../services/elasticache/snapshots.go | 140 +---- .../services/elasticache/subnet_groups.go | 30 +- .../services/elasticache/user_groups.go | 40 +- .../resources/services/elasticache/users.go | 45 +- .../elasticbeanstalk/application_versions.go | 50 +- .../services/elasticbeanstalk/applications.go | 35 +- .../elasticbeanstalk/configuration_options.go | 65 +- .../configuration_settings.go | 60 +- .../services/elasticbeanstalk/environments.go | 100 +--- .../services/elasticsearch/domains.go | 125 +--- .../services/elasticsearch/packages.go | 45 +- .../services/elasticsearch/versions.go | 2 - .../services/elasticsearch/vpc_endpoints.go | 30 +- .../elastictranscoder/pipeline_jobs.go | 60 +- .../services/elastictranscoder/pipelines.go | 55 +- .../services/elastictranscoder/presets.go | 45 +- .../services/elbv1/load_balancer_policies.go | 15 +- .../services/elbv1/load_balancers.go | 96 +-- .../aws/resources/services/elbv2/listeners.go | 40 +- .../elbv2/load_balancer_attributes.go | 15 +- .../services/elbv2/load_balancers.go | 65 +- ...target_group_target_health_descriptions.go | 20 +- .../resources/services/elbv2/target_groups.go | 90 +-- .../emr/block_public_access_configs.go | 20 +- .../aws/resources/services/emr/clusters.go | 150 +---- .../services/eventbridge/api_destinations.go | 45 +- .../services/eventbridge/archives.go | 45 +- .../services/eventbridge/connections.go | 40 +- .../services/eventbridge/endpoints.go | 65 +- .../services/eventbridge/event_bus_rules.go | 50 +- .../services/eventbridge/event_buses.go | 15 +- .../services/eventbridge/event_sources.go | 30 +- .../resources/services/eventbridge/replays.go | 50 +- .../services/firehose/delivery_streams.go | 60 +- .../services/frauddetector/batch_imports.go | 65 +- .../frauddetector/batch_predictions.go | 75 +-- .../services/frauddetector/detectors.go | 30 +- .../services/frauddetector/entity_types.go | 25 +- .../services/frauddetector/event_types.go | 50 +- .../services/frauddetector/external_models.go | 45 +- .../services/frauddetector/labels.go | 26 +- .../services/frauddetector/model_versions.go | 65 +- .../services/frauddetector/models.go | 35 +- .../services/frauddetector/outcomes.go | 25 +- .../resources/services/frauddetector/rules.go | 50 +- .../services/frauddetector/variables.go | 45 +- .../aws/resources/services/fsx/backups.go | 75 +-- .../fsx/data_repository_associations.go | 75 +-- .../services/fsx/data_repository_tasks.go | 70 +-- .../aws/resources/services/fsx/file_caches.go | 80 +-- .../resources/services/fsx/file_systems.go | 101 +--- .../aws/resources/services/fsx/snapshots.go | 35 +- .../services/fsx/storage_virtual_machines.go | 60 +- .../aws/resources/services/fsx/volumes.go | 50 +- .../glacier/data_retrieval_policies.go | 10 +- .../services/glacier/vault_access_policies.go | 5 +- .../services/glacier/vault_lock_policies.go | 5 +- .../services/glacier/vault_notifications.go | 15 +- .../aws/resources/services/glacier/vaults.go | 30 +- .../resources/services/glue/classifiers.go | 25 +- .../resources/services/glue/connections.go | 50 +- .../aws/resources/services/glue/crawlers.go | 105 +--- .../services/glue/database_table_indexes.go | 20 +- .../services/glue/database_tables.go | 100 +--- .../aws/resources/services/glue/databases.go | 45 +- .../glue/datacatalog_encryption_settings.go | 15 +- .../resources/services/glue/dev_endpoints.go | 130 +--- .../aws/resources/services/glue/job_runs.go | 125 +--- .../aws/resources/services/glue/jobs.go | 120 +--- .../services/glue/ml_transform_task_runs.go | 55 +- .../resources/services/glue/ml_transforms.go | 95 +-- .../aws/resources/services/glue/registries.go | 30 +- .../services/glue/registry_schema_versions.go | 45 +- .../services/glue/registry_schemas.go | 70 +-- .../services/glue/security_configurations.go | 15 +- .../aws/resources/services/glue/triggers.go | 55 +- .../aws/resources/services/glue/workflows.go | 50 +- .../services/guardduty/detector_members.go | 45 +- .../resources/services/guardduty/detectors.go | 45 +- .../aws/resources/services/iam/accounts.go | 140 +---- .../services/iam/credential_reports.go | 74 +-- .../resources/services/iam/group_policies.go | 20 +- .../aws/resources/services/iam/groups.go | 25 +- .../aws/resources/services/iam/models/iam.go | 3 +- .../iam/openid_connect_identity_providers.go | 30 +- .../services/iam/password_policies.go | 60 +- .../aws/resources/services/iam/policies.go | 55 +- .../resources/services/iam/role_policies.go | 20 +- .../aws/resources/services/iam/roles.go | 45 +- .../services/iam/saml_identity_providers.go | 21 +- .../iam/saml_identity_providers_fetch.go | 6 +- .../services/iam/server_certificates.go | 30 +- .../resources/services/iam/ssh_public_keys.go | 20 +- .../services/iam/user_access_keys.go | 30 +- .../services/iam/user_attached_policies.go | 15 +- .../aws/resources/services/iam/user_groups.go | 30 +- .../resources/services/iam/user_policies.go | 20 +- .../aws/resources/services/iam/users.go | 30 +- .../services/iam/virtual_mfa_devices.go | 25 +- .../identitystore/group_memberships.go | 22 +- .../services/identitystore/groups.go | 32 +- .../services/identitystore/instance_fetch.go | 2 +- .../resources/services/identitystore/users.go | 87 +-- .../resources/services/inspector/findings.go | 80 +-- .../resources/services/inspector2/findings.go | 95 +-- .../resources/services/iot/billing_groups.go | 35 +- .../resources/services/iot/ca_certificates.go | 60 +- .../resources/services/iot/certificates.go | 70 +-- .../source/aws/resources/services/iot/jobs.go | 115 +--- .../aws/resources/services/iot/policies.go | 10 +- .../aws/resources/services/iot/streams.go | 40 +- .../resources/services/iot/thing_groups.go | 55 +- .../aws/resources/services/iot/thing_types.go | 20 +- .../aws/resources/services/iot/things.go | 25 +- .../aws/resources/services/iot/topic_rules.go | 15 +- .../services/kafka/cluster_operations.go | 50 +- .../aws/resources/services/kafka/clusters.go | 55 +- .../services/kafka/configurations.go | 35 +- .../aws/resources/services/kafka/nodes.go | 30 +- .../aws/resources/services/kinesis/streams.go | 55 +- .../aws/resources/services/kms/aliases.go | 25 +- .../aws/resources/services/kms/key_grants.go | 45 +- .../source/aws/resources/services/kms/keys.go | 120 +--- .../services/lambda/function_aliases.go | 35 +- .../lambda/function_concurrency_configs.go | 35 +- .../lambda/function_event_invoke_configs.go | 25 +- .../lambda/function_event_source_mappings.go | 125 +--- .../services/lambda/function_versions.go | 170 +----- .../resources/services/lambda/functions.go | 30 +- .../services/lambda/layer_version_policies.go | 20 +- .../services/lambda/layer_versions.go | 35 +- .../aws/resources/services/lambda/layers.go | 20 +- .../aws/resources/services/lambda/runtimes.go | 5 +- .../resources/services/lightsail/alarms.go | 100 +--- .../services/lightsail/bucket_access_keys.go | 30 +- .../resources/services/lightsail/buckets.go | 75 +-- .../services/lightsail/certificates.go | 105 +--- .../container_service_deployments.go | 30 +- .../lightsail/container_service_images.go | 20 +- .../services/lightsail/container_services.go | 90 +-- .../services/lightsail/database_events.go | 25 +- .../services/lightsail/database_log_events.go | 20 +- .../services/lightsail/database_parameters.go | 45 +- .../services/lightsail/database_snapshots.go | 70 +-- .../resources/services/lightsail/databases.go | 125 +--- .../services/lightsail/disk_snapshots.go | 75 +-- .../aws/resources/services/lightsail/disks.go | 80 +-- .../services/lightsail/distributions.go | 100 +--- .../lightsail/instance_port_states.go | 40 +- .../services/lightsail/instance_snapshots.go | 75 +-- .../resources/services/lightsail/instances.go | 105 +--- .../load_balancer_tls_certificates.go | 125 +--- .../services/lightsail/load_balancers.go | 90 +-- .../services/lightsail/static_ips.go | 45 +- .../mq/broker_configuration_revisions.go | 25 +- .../services/mq/broker_configurations.go | 55 +- .../aws/resources/services/mq/broker_users.go | 35 +- .../aws/resources/services/mq/brokers.go | 150 +---- .../resources/services/mwaa/environments.go | 130 +--- .../cluster_parameter_group_parameters.go | 55 +- .../neptune/cluster_parameter_groups.go | 20 +- .../services/neptune/cluster_snapshots.go | 100 +--- .../resources/services/neptune/clusters.go | 205 +------ .../db_parameter_group_db_parameters.go | 55 +- .../services/neptune/db_parameter_groups.go | 20 +- .../services/neptune/event_subscriptions.go | 50 +- .../services/neptune/global_clusters.go | 45 +- .../resources/services/neptune/instances.go | 265 +------- .../services/neptune/subnet_groups.go | 5 +- .../services/organizations/accounts.go | 35 +- .../services/organizations/organizations.go | 37 +- .../qldb/ledger_journal_kinesis_streams.go | 60 +- .../qldb/ledger_journal_s3_exports.go | 50 +- .../aws/resources/services/qldb/ledgers.go | 40 +- .../resources/services/quicksight/analyses.go | 51 +- .../services/quicksight/dashboards.go | 42 +- .../services/quicksight/data_sets.go | 51 +- .../services/quicksight/data_sources.go | 62 +- .../resources/services/quicksight/folders.go | 36 +- .../services/quicksight/group_members.go | 17 +- .../resources/services/quicksight/groups.go | 27 +- .../services/quicksight/ingestions.go | 62 +- .../services/quicksight/templates.go | 37 +- .../resources/services/quicksight/users.go | 62 +- .../aws/resources/services/ram/principals.go | 25 +- .../ram/resource_share_associations.go | 40 +- .../ram/resource_share_invitations.go | 45 +- .../ram/resource_share_permissions.go | 45 +- .../resources/services/ram/resource_shares.go | 45 +- .../resources/services/ram/resource_types.go | 10 +- .../aws/resources/services/ram/resources.go | 45 +- .../resources/services/rds/certificates.go | 40 +- .../rds/cluster_parameter_group_parameters.go | 60 +- .../services/rds/cluster_parameter_groups.go | 20 +- .../services/rds/cluster_parameters.go | 12 +- .../services/rds/cluster_snapshots.go | 110 +--- .../aws/resources/services/rds/clusters.go | 350 +---------- .../rds/db_parameter_group_db_parameters.go | 60 +- .../services/rds/db_parameter_groups.go | 20 +- .../services/rds/db_security_groups.go | 40 +- .../resources/services/rds/db_snapshots.go | 160 +---- .../resources/services/rds/engine_versions.go | 145 +---- .../services/rds/event_subscriptions.go | 50 +- .../aws/resources/services/rds/instances.go | 390 +----------- .../resources/services/rds/subnet_groups.go | 35 +- .../redshift/cluster_parameter_groups.go | 15 +- .../services/redshift/cluster_parameters.go | 45 +- .../resources/services/redshift/clusters.go | 260 +------- .../services/redshift/event_subscriptions.go | 55 +- .../resources/services/redshift/snapshots.go | 170 +----- .../services/redshift/subnet_groups.go | 30 +- .../resourcegroups/resource_groups.go | 30 +- .../services/route53/delegation_sets.go | 20 +- .../aws/resources/services/route53/domains.go | 115 +--- .../services/route53/health_checks.go | 34 +- .../hosted_zone_query_logging_configs.go | 20 +- .../hosted_zone_resource_record_sets.go | 75 +-- .../hosted_zone_traffic_policy_instances.go | 50 +- .../services/route53/hosted_zones.go | 58 +- .../services/route53/traffic_policies.go | 30 +- .../route53/traffic_policy_versions.go | 20 +- .../aws/resources/services/s3/accounts.go | 30 +- .../services/s3/bucket_cors_rules.go | 35 +- .../services/s3/bucket_encryption_rules.go | 15 +- .../resources/services/s3/bucket_grants.go | 15 +- .../services/s3/bucket_lifecycles.go | 45 +- .../aws/resources/services/s3/buckets.go | 85 +-- .../sagemaker/endpoint_configurations.go | 50 +- .../resources/services/sagemaker/models.go | 49 +- .../services/sagemaker/notebook_instances.go | 114 +--- .../services/sagemaker/training_jobs.go | 210 +------ .../services/scheduler/schedule_groups.go | 25 +- .../resources/services/scheduler/schedules.go | 70 +-- .../services/secretsmanager/secrets.go | 85 +-- .../services/servicecatalog/portfolios.go | 30 +- .../services/servicecatalog/products.go | 25 +- .../servicecatalog/provisioned_products.go | 90 +-- .../services/servicequotas/quotas.go | 60 +- .../services/servicequotas/services.go | 5 +- .../services/ses/active_receipt_rule_sets.go | 3 + .../configuration_set_event_destinations.go | 35 +- .../services/ses/configuration_sets.go | 46 +- .../resources/services/ses/contact_lists.go | 25 +- .../custom_verification_email_templates.go | 41 +- .../aws/resources/services/ses/identities.go | 55 +- .../aws/resources/services/ses/templates.go | 30 +- .../aws/resources/services/shield/attacks.go | 40 +- .../services/shield/protection_groups.go | 30 +- .../resources/services/shield/protections.go | 30 +- .../services/shield/subscriptions.go | 40 +- .../resources/services/sns/subscriptions.go | 50 +- .../aws/resources/services/sns/topics.go | 50 +- .../aws/resources/services/sqs/queues.go | 104 +--- .../resources/services/ssm/associations.go | 60 +- .../services/ssm/compliance_summary_items.go | 15 +- .../aws/resources/services/ssm/documents.go | 150 +---- .../services/ssm/instance_compliance_items.go | 45 +- .../services/ssm/instance_patches.go | 35 +- .../aws/resources/services/ssm/instances.go | 110 +--- .../aws/resources/services/ssm/inventories.go | 10 +- .../services/ssm/inventory_schemas.go | 15 +- .../aws/resources/services/ssm/parameters.go | 55 +- .../resources/services/ssm/patch_baselines.go | 25 +- .../services/ssoadmin/account_assignments.go | 27 +- .../resources/services/ssoadmin/instances.go | 17 +- .../services/ssoadmin/permission_sets.go | 35 +- .../services/stepfunctions/state_machines.go | 50 +- .../services/timestream/databases.go | 30 +- .../resources/services/timestream/tables.go | 44 +- .../resources/services/transfer/servers.go | 90 +-- .../aws/resources/services/waf/rule_groups.go | 15 +- .../aws/resources/services/waf/rules.go | 15 +- .../services/waf/subscribed_rule_groups.go | 15 +- .../aws/resources/services/waf/web_acls.go | 20 +- .../services/wafregional/rate_based_rules.go | 35 +- .../services/wafregional/rule_groups.go | 20 +- .../resources/services/wafregional/rules.go | 25 +- .../services/wafregional/web_acls.go | 30 +- .../aws/resources/services/wafv2/ipsets.go | 25 +- .../services/wafv2/managed_rule_groups.go | 25 +- .../services/wafv2/regex_pattern_sets.go | 25 +- .../resources/services/wafv2/rule_groups.go | 55 +- .../aws/resources/services/wafv2/web_acls.go | 85 +-- .../services/workspaces/directories.go | 95 +-- .../services/workspaces/workspaces.go | 85 +-- .../services/xray/encryption_configs.go | 20 +- .../aws/resources/services/xray/groups.go | 20 +- .../resources/services/xray/sampling_rules.go | 20 +- 778 files changed, 1823 insertions(+), 37018 deletions(-) delete mode 100644 plugins/source/aws/codegen/main.go delete mode 100644 plugins/source/aws/codegen/recipes/accessanalyzer.go delete mode 100644 plugins/source/aws/codegen/recipes/account.go delete mode 100644 plugins/source/aws/codegen/recipes/acm.go delete mode 100644 plugins/source/aws/codegen/recipes/amp.go delete mode 100644 plugins/source/aws/codegen/recipes/apigateway.go delete mode 100644 plugins/source/aws/codegen/recipes/apigatewayv2.go delete mode 100644 plugins/source/aws/codegen/recipes/applicationautoscaling.go delete mode 100644 plugins/source/aws/codegen/recipes/apprunner.go delete mode 100644 plugins/source/aws/codegen/recipes/appstream.go delete mode 100644 plugins/source/aws/codegen/recipes/appsync.go delete mode 100644 plugins/source/aws/codegen/recipes/athena.go delete mode 100644 plugins/source/aws/codegen/recipes/autoscaling.go delete mode 100644 plugins/source/aws/codegen/recipes/backup.go delete mode 100644 plugins/source/aws/codegen/recipes/base.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudformation.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudfront.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudhsmv2.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudtrail.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudwatch.go delete mode 100644 plugins/source/aws/codegen/recipes/cloudwatchlogs.go delete mode 100644 plugins/source/aws/codegen/recipes/codebuild.go delete mode 100644 plugins/source/aws/codegen/recipes/codepipeline.go delete mode 100644 plugins/source/aws/codegen/recipes/cognito.go delete mode 100644 plugins/source/aws/codegen/recipes/config.go delete mode 100644 plugins/source/aws/codegen/recipes/dax.go delete mode 100644 plugins/source/aws/codegen/recipes/directconnect.go delete mode 100644 plugins/source/aws/codegen/recipes/discover/discover.go delete mode 100644 plugins/source/aws/codegen/recipes/dms.go delete mode 100644 plugins/source/aws/codegen/recipes/docdb.go delete mode 100644 plugins/source/aws/codegen/recipes/dynamodb.go delete mode 100644 plugins/source/aws/codegen/recipes/ec2.go delete mode 100644 plugins/source/aws/codegen/recipes/ecr.go delete mode 100644 plugins/source/aws/codegen/recipes/ecrpublic.go delete mode 100644 plugins/source/aws/codegen/recipes/ecs.go delete mode 100644 plugins/source/aws/codegen/recipes/efs.go delete mode 100644 plugins/source/aws/codegen/recipes/eks.go delete mode 100644 plugins/source/aws/codegen/recipes/elasticache.go delete mode 100644 plugins/source/aws/codegen/recipes/elasticbeanstalk.go delete mode 100644 plugins/source/aws/codegen/recipes/elasticsearch.go delete mode 100644 plugins/source/aws/codegen/recipes/elastictranscoder.go delete mode 100644 plugins/source/aws/codegen/recipes/elbv1.go delete mode 100644 plugins/source/aws/codegen/recipes/elbv2.go delete mode 100644 plugins/source/aws/codegen/recipes/emr.go delete mode 100644 plugins/source/aws/codegen/recipes/eventbridge.go delete mode 100644 plugins/source/aws/codegen/recipes/firehose.go delete mode 100644 plugins/source/aws/codegen/recipes/frauddetector.go delete mode 100644 plugins/source/aws/codegen/recipes/fsx.go delete mode 100644 plugins/source/aws/codegen/recipes/glacier.go delete mode 100644 plugins/source/aws/codegen/recipes/glue.go delete mode 100644 plugins/source/aws/codegen/recipes/guardduty.go delete mode 100644 plugins/source/aws/codegen/recipes/iam.go delete mode 100644 plugins/source/aws/codegen/recipes/identitystore.go delete mode 100644 plugins/source/aws/codegen/recipes/inspector.go delete mode 100644 plugins/source/aws/codegen/recipes/inspector2.go delete mode 100644 plugins/source/aws/codegen/recipes/iot.go delete mode 100644 plugins/source/aws/codegen/recipes/kafka.go delete mode 100644 plugins/source/aws/codegen/recipes/kinesis.go delete mode 100644 plugins/source/aws/codegen/recipes/kms.go delete mode 100644 plugins/source/aws/codegen/recipes/lambda.go delete mode 100644 plugins/source/aws/codegen/recipes/lightsail.go delete mode 100644 plugins/source/aws/codegen/recipes/mq.go delete mode 100644 plugins/source/aws/codegen/recipes/mwaa.go delete mode 100644 plugins/source/aws/codegen/recipes/neptune.go delete mode 100644 plugins/source/aws/codegen/recipes/organizations.go delete mode 100644 plugins/source/aws/codegen/recipes/qldb.go delete mode 100644 plugins/source/aws/codegen/recipes/quicksight.go delete mode 100644 plugins/source/aws/codegen/recipes/ram.go delete mode 100644 plugins/source/aws/codegen/recipes/rds.go delete mode 100644 plugins/source/aws/codegen/recipes/redshift.go delete mode 100644 plugins/source/aws/codegen/recipes/resourcegroups.go delete mode 100644 plugins/source/aws/codegen/recipes/route53.go delete mode 100644 plugins/source/aws/codegen/recipes/s3.go delete mode 100644 plugins/source/aws/codegen/recipes/sagemaker.go delete mode 100644 plugins/source/aws/codegen/recipes/scheduler.go delete mode 100644 plugins/source/aws/codegen/recipes/secretsmanager.go delete mode 100644 plugins/source/aws/codegen/recipes/servicecatalog.go delete mode 100644 plugins/source/aws/codegen/recipes/servicequota.go delete mode 100644 plugins/source/aws/codegen/recipes/ses.go delete mode 100644 plugins/source/aws/codegen/recipes/shield.go delete mode 100644 plugins/source/aws/codegen/recipes/sns.go delete mode 100644 plugins/source/aws/codegen/recipes/sqs.go delete mode 100644 plugins/source/aws/codegen/recipes/ssm.go delete mode 100644 plugins/source/aws/codegen/recipes/ssoadmin.go delete mode 100644 plugins/source/aws/codegen/recipes/stepfunction.go delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/fetch.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/mock_test.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/fetch.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/mock_test.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/README.md delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/fetch.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/mock_test.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/templates/resource.go.tpl delete mode 100644 plugins/source/aws/codegen/recipes/timestream.go delete mode 100644 plugins/source/aws/codegen/recipes/transfer.go delete mode 100644 plugins/source/aws/codegen/recipes/waf.go delete mode 100644 plugins/source/aws/codegen/recipes/wafregional.go delete mode 100644 plugins/source/aws/codegen/recipes/wafv2.go delete mode 100644 plugins/source/aws/codegen/recipes/workspaces.go delete mode 100644 plugins/source/aws/codegen/recipes/xray.go delete mode 100644 plugins/source/aws/codegen/services/clients.go delete mode 100644 plugins/source/aws/codegen/services/custom/s3manager.go delete mode 100644 plugins/source/aws/codegen/services/generate.go delete mode 100644 plugins/source/aws/codegen/services/models/s3manager/s3manager.go delete mode 100644 plugins/source/aws/codegen/services/templates/service.go.tpl delete mode 100644 plugins/source/aws/codegen/services/templates/services.go.tpl delete mode 100644 plugins/source/aws/codegen/tables/generate.go delete mode 100644 plugins/source/aws/codegen/tables/templates/tables.go.tpl create mode 100644 plugins/source/aws/resources/services/docdb/pending_maintenance_actions_mock_test.go diff --git a/plugins/source/aws/Makefile b/plugins/source/aws/Makefile index 5f57c0151c122e..39b698269a9f68 100644 --- a/plugins/source/aws/Makefile +++ b/plugins/source/aws/Makefile @@ -13,13 +13,8 @@ install-tools: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - .PHONY: gen-mocks -gen-mocks: gen-code +gen-mocks: go install github.com/golang/mock/mockgen@v1.6.0 rm -rf ./client/mocks/* go generate ./client/... diff --git a/plugins/source/aws/client/helpers.go b/plugins/source/aws/client/helpers.go index 1fc1cd9ccb05f1..b75911f7b1b3dd 100644 --- a/plugins/source/aws/client/helpers.go +++ b/plugins/source/aws/client/helpers.go @@ -13,6 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/smithy-go" + "github.com/cloudquery/plugin-sdk/codegen" "github.com/cloudquery/plugin-sdk/schema" ) @@ -396,3 +397,31 @@ func Sleep(ctx context.Context, dur time.Duration) error { return nil } } + +func CreateTrimPrefixTransformer(prefixes ...string) func(field reflect.StructField) (string, error) { + return func(field reflect.StructField) (string, error) { + name, err := codegen.DefaultNameTransformer(field) + if err != nil { + return "", err + } + for _, v := range prefixes { + if strings.HasPrefix(name, v) { + return name[len(v):], nil + } + } + return name, nil + } +} + +func CreateReplaceTransformer(replace map[string]string) func(field reflect.StructField) (string, error) { + return func(field reflect.StructField) (string, error) { + name, err := codegen.DefaultNameTransformer(field) + if err != nil { + return "", err + } + for k, v := range replace { + name = strings.ReplaceAll(name, k, v) + } + return name, nil + } +} diff --git a/plugins/source/aws/codegen/main.go b/plugins/source/aws/codegen/main.go deleted file mode 100644 index f3ac714c217225..00000000000000 --- a/plugins/source/aws/codegen/main.go +++ /dev/null @@ -1,132 +0,0 @@ -package main - -import ( - "fmt" - "log" - - "github.com/cloudquery/cloudquery/plugins/source/aws/codegen/recipes" - "github.com/cloudquery/cloudquery/plugins/source/aws/codegen/services" - "github.com/cloudquery/cloudquery/plugins/source/aws/codegen/tables" - "golang.org/x/sync/errgroup" -) - -func generateResources() ([]*recipes.Resource, error) { - var resources []*recipes.Resource - resources = append(resources, recipes.AccessAnalyzerResources()...) - resources = append(resources, recipes.AccountResources()...) - resources = append(resources, recipes.ACMResources()...) - resources = append(resources, recipes.AMPResources()...) - resources = append(resources, recipes.APIGatewayResources()...) - resources = append(resources, recipes.APIGatewayV2Resources()...) - resources = append(resources, recipes.ApplicationAutoScalingResources()...) - resources = append(resources, recipes.ApprunnerResources()...) - resources = append(resources, recipes.AppstreamResources()...) - resources = append(resources, recipes.AppSync()...) - resources = append(resources, recipes.AthenaResources()...) - resources = append(resources, recipes.AutoscalingResources()...) - resources = append(resources, recipes.BackupResources()...) - resources = append(resources, recipes.CloudformationResources()...) - resources = append(resources, recipes.CloudfrontResources()...) - resources = append(resources, recipes.CloudHSMV2()...) - resources = append(resources, recipes.CloudtrailResources()...) - resources = append(resources, recipes.CloudWatchLogsResources()...) - resources = append(resources, recipes.CloudwatchResources()...) - resources = append(resources, recipes.CodeBuildResources()...) - resources = append(resources, recipes.CodePipelineResources()...) - resources = append(resources, recipes.CognitoResources()...) - resources = append(resources, recipes.ConfigResources()...) - resources = append(resources, recipes.DaxResources()...) - resources = append(resources, recipes.DirectConnectResources()...) - resources = append(resources, recipes.DMSResources()...) - resources = append(resources, recipes.DocumentDBResources()...) - resources = append(resources, recipes.DynamoDBResources()...) - resources = append(resources, recipes.EC2Resources()...) - resources = append(resources, recipes.ECRPublicResources()...) - resources = append(resources, recipes.ECRResources()...) - resources = append(resources, recipes.ECSResources()...) - resources = append(resources, recipes.EFSResources()...) - resources = append(resources, recipes.EKSResources()...) - resources = append(resources, recipes.ElastiCacheResources()...) - resources = append(resources, recipes.ElasticbeanstalkResources()...) - resources = append(resources, recipes.ElasticsearchResources()...) - resources = append(resources, recipes.ElastictranscoderResources()...) - resources = append(resources, recipes.ELBv1Resources()...) - resources = append(resources, recipes.ELBv2Resources()...) - resources = append(resources, recipes.EMRResources()...) - resources = append(resources, recipes.EventbridgeResources()...) - resources = append(resources, recipes.FirehoseResources()...) - resources = append(resources, recipes.FraudDetectorResources()...) - resources = append(resources, recipes.FSXResources()...) - resources = append(resources, recipes.GlacierResources()...) - resources = append(resources, recipes.GlueResources()...) - resources = append(resources, recipes.GuarddutyResources()...) - resources = append(resources, recipes.IAMResources()...) - resources = append(resources, recipes.IdentitystoreResources()...) - resources = append(resources, recipes.Inspector2Resources()...) - resources = append(resources, recipes.InspectorResources()...) - resources = append(resources, recipes.IOTResources()...) - resources = append(resources, recipes.KafkaResources()...) - resources = append(resources, recipes.KinesisResources()...) - resources = append(resources, recipes.KMSResources()...) - resources = append(resources, recipes.LambdaResources()...) - resources = append(resources, recipes.LightsailResources()...) - resources = append(resources, recipes.MQResources()...) - resources = append(resources, recipes.MWAAResources()...) - resources = append(resources, recipes.NeptuneResources()...) - resources = append(resources, recipes.OrganizationsResources()...) - resources = append(resources, recipes.QLDBResources()...) - resources = append(resources, recipes.QuickSightResources()...) - resources = append(resources, recipes.RAMResources()...) - resources = append(resources, recipes.RDSResources()...) - resources = append(resources, recipes.RedshiftResources()...) - resources = append(resources, recipes.ResourceGroupsResources()...) - resources = append(resources, recipes.Route53Resources()...) - resources = append(resources, recipes.S3Resources()...) - resources = append(resources, recipes.SagemakerResources()...) - resources = append(resources, recipes.SchedulerResources()...) - resources = append(resources, recipes.SecretsManagerResources()...) - resources = append(resources, recipes.ServiceCatalogResources()...) - resources = append(resources, recipes.ServiceQuotasResources()...) - resources = append(resources, recipes.SESResources()...) - resources = append(resources, recipes.ShieldResources()...) - resources = append(resources, recipes.SNSResources()...) - resources = append(resources, recipes.SQSResources()...) - resources = append(resources, recipes.SSMResources()...) - resources = append(resources, recipes.SSOAdminResources()...) - resources = append(resources, recipes.StepFunctionResources()...) - resources = append(resources, recipes.TimestreamResources()...) - resources = append(resources, recipes.TransferResources()...) - resources = append(resources, recipes.WAFRegionalResources()...) - resources = append(resources, recipes.WAFResources()...) - resources = append(resources, recipes.WAFv2Resources()...) - resources = append(resources, recipes.WorkspacesResources()...) - resources = append(resources, recipes.XRayResources()...) - - err := recipes.SetParentChildRelationships(resources) - if err != nil { - return nil, fmt.Errorf("failed to set parent-child relationships: %w", err) - } - grp := new(errgroup.Group) - for _, resource := range resources { - grp.Go(resource.Generate) - } - - return resources, grp.Wait() -} - -func main() { - err := services.Generate() - if err != nil { - log.Fatal(err) - } - - resources, err := generateResources() - if err != nil { - log.Fatal(err) - } - - err = tables.Generate(resources) - if err != nil { - log.Fatal(err) - } -} diff --git a/plugins/source/aws/codegen/recipes/accessanalyzer.go b/plugins/source/aws/codegen/recipes/accessanalyzer.go deleted file mode 100644 index e558366144cc86..00000000000000 --- a/plugins/source/aws/codegen/recipes/accessanalyzer.go +++ /dev/null @@ -1,70 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AccessAnalyzerResources() []*Resource { - resources := []*Resource{ - { - SubService: "analyzers", - Struct: &types.AnalyzerSummary{}, - Description: "https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_AnalyzerSummary.html", - SkipFields: []string{"Arn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("access-analyzer")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{"AnalyzerFindings()", "AnalyzerArchiveRules()"}, - }, - { - SubService: "analyzer_findings", - Struct: &types.FindingSummary{}, - Description: "https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_FindingSummary.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveFindingArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "analyzer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "analyzer_archive_rules", - Struct: &types.ArchiveRuleSummary{}, - Description: "https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_ArchiveRuleSummary.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "analyzer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "accessanalyzer" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/account.go b/plugins/source/aws/codegen/recipes/account.go deleted file mode 100644 index 018aaa6ef356b3..00000000000000 --- a/plugins/source/aws/codegen/recipes/account.go +++ /dev/null @@ -1,46 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/account/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AccountResources() []*Resource { - resources := []*Resource{ - { - SubService: "alternate_contacts", - Struct: &types.AlternateContact{}, - Description: "https://docs.aws.amazon.com/accounts/latest/reference/API_AlternateContact.html", - PKColumns: []string{"alternate_contact_type"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "contacts", - Struct: &types.ContactInformation{}, - Description: "https://docs.aws.amazon.com/accounts/latest/reference/API_ContactInformation.html", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - } - - for _, r := range resources { - r.Service = "account" - r.Multiplex = `client.AccountMultiplex` - - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/acm.go b/plugins/source/aws/codegen/recipes/acm.go deleted file mode 100644 index 4d2d4f68b06dee..00000000000000 --- a/plugins/source/aws/codegen/recipes/acm.go +++ /dev/null @@ -1,40 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/acm/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ACMResources() []*Resource { - resources := []*Resource{ - { - SubService: "certificates", - Struct: &types.CertificateDetail{}, - Description: "https://docs.aws.amazon.com/acm/latest/APIReference/API_CertificateDetail.html", - SkipFields: []string{"CertificateArn"}, - PreResourceResolver: "getCertificate", - Multiplex: `client.ServiceAccountRegionMultiplexer("acm")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CertificateArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveCertificateTags`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "acm" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/amp.go b/plugins/source/aws/codegen/recipes/amp.go deleted file mode 100644 index 68ca782a59fffc..00000000000000 --- a/plugins/source/aws/codegen/recipes/amp.go +++ /dev/null @@ -1,52 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/amp/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AMPResources() []*Resource { - return []*Resource{ - { - Service: "amp", - SubService: "workspaces", - Struct: new(types.WorkspaceDescription), - Description: "https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-APIReference.html#AMP-APIReference-WorkspaceDescription", - Multiplex: `client.ServiceAccountRegionMultiplexer("amp")`, - PreResourceResolver: "describeWorkspace", - PKColumns: []string{"arn"}, - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "alert_manager_definition", - Type: schema.TypeJSON, - Resolver: `describeAlertManagerDefinition`, - }, - codegen.ColumnDefinition{ - Name: "logging_configuration", - Type: schema.TypeJSON, - Resolver: `describeLoggingConfiguration`, - }, - ), - Relations: []string{"RuleGroupsNamespaces()"}, - }, - { - Service: "amp", - SubService: "rule_groups_namespaces", - Struct: new(types.RuleGroupsNamespaceDescription), - Description: "https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-APIReference.html#AMP-APIReference-RuleGroupsNamespaceDescription", - Multiplex: "", // relation for workspace - PreResourceResolver: "describeRuleGroupsNamespace", - PKColumns: []string{"arn"}, - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "workspace_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - ), - }, - } -} diff --git a/plugins/source/aws/codegen/recipes/apigateway.go b/plugins/source/aws/codegen/recipes/apigateway.go deleted file mode 100644 index ba05f7801db9ca..00000000000000 --- a/plugins/source/aws/codegen/recipes/apigateway.go +++ /dev/null @@ -1,355 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/apigateway/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func APIGatewayResources() []*Resource { - resources := []*Resource{ - { - SubService: "api_keys", - Struct: &types.ApiKey{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_ApiKey.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayAPIKeyArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "client_certificates", - Struct: &types.ClientCertificate{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_ClientCertificate.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayClientCertificateArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "domain_names", - Struct: &types.DomainName{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_DomainName.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayDomainNameArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "DomainNameBasePathMappings()", - }, - }, - { - SubService: "domain_name_base_path_mappings", - Struct: &types.BasePathMapping{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_BasePathMapping.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "domain_name_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayDomainNameBasePathMappingArn`, - }, - }...), - }, - { - SubService: "rest_apis", - Struct: &types.RestApi{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_RestApi.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "RestApiAuthorizers()", - "RestApiDeployments()", - "RestApiDocumentationParts()", - "RestApiDocumentationVersions()", - "RestApiGatewayResponses()", - "RestApiModels()", - "RestApiRequestValidators()", - "RestApiResources()", - "RestApiStages()", - }, - }, - { - SubService: "rest_api_authorizers", - Struct: &types.Authorizer{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Authorizer.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIAuthorizerArn`, - }, - }...), - }, - { - SubService: "rest_api_deployments", - Struct: &types.Deployment{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Deployment.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIDeploymentArn`, - }, - }...), - }, - { - SubService: "rest_api_documentation_parts", - Struct: &types.DocumentationPart{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationPart.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIDocumentationPartArn`, - }, - }...), - }, - { - SubService: "rest_api_documentation_versions", - Struct: &types.DocumentationVersion{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationVersion.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIDocumentationVersionArn`, - }, - }...), - }, - { - SubService: "rest_api_gateway_responses", - Struct: &types.GatewayResponse{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_GatewayResponse.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIGatewayResponseArn`, - }, - }...), - }, - { - SubService: "rest_api_models", - Struct: &types.Model{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Model.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIModelArn`, - }, - { - Name: "model_template", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIModelModelTemplate`, - }, - }...), - }, - { - SubService: "rest_api_request_validators", - Struct: &types.RequestValidator{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_RequestValidator.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIRequestValidatorArn`, - }, - }...), - }, - { - SubService: "rest_api_resources", - Struct: &types.Resource{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Resource.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIResourceArn`, - }, - }...), - }, - { - SubService: "rest_api_stages", - Struct: &types.Stage{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Stage.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rest_api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayRestAPIStageArn`, - }, - }...), - }, - { - SubService: "usage_plans", - Struct: &types.UsagePlan{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlan.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayUsagePlanArn`, - }, - }...), - Relations: []string{ - "UsagePlanKeys()", - }, - }, - { - SubService: "usage_plan_keys", - Struct: &types.UsagePlanKey{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlanKey.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "usage_plan_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayUsagePlanKeyArn`, - }, - }...), - }, - { - SubService: "vpc_links", - Struct: &types.VpcLink{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_VpcLink.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApigatewayVpcLinkArn`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "apigateway" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("apigateway")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/apigatewayv2.go b/plugins/source/aws/codegen/recipes/apigatewayv2.go deleted file mode 100644 index ba1c0a86d0524f..00000000000000 --- a/plugins/source/aws/codegen/recipes/apigatewayv2.go +++ /dev/null @@ -1,311 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func APIGatewayV2Resources() []*Resource { - resources := []*Resource{ - { - SubService: "apis", - Struct: &types.Api{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Api.html", - SkipFields: []string{"ApiId"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiArn()`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ApiId")`, - }, - }...), - Relations: []string{ - "ApiAuthorizers()", - "ApiDeployments()", - "ApiIntegrations()", - "ApiModels()", - "ApiRoutes()", - "ApiStages()", - }, - }, - { - SubService: "api_authorizers", - Struct: &types.Authorizer{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Authorizer.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiAuthorizerArn()`, - }, - }...), - }, - { - SubService: "api_deployments", - Struct: &types.Deployment{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Deployment.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiDeploymentArn()`, - }, - }...), - }, - { - SubService: "api_integrations", - Struct: &types.Integration{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Integration.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiIntegrationArn()`, - }, - }...), - Relations: []string{ - "ApiIntegrationResponses()", - }, - }, - { - SubService: "api_integration_responses", - Struct: &types.IntegrationResponse{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_IntegrationResponse.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_integration_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "integration_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("integration_id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiIntegrationResponseArn()`, - }, - }...), - }, - { - SubService: "api_models", - Struct: &types.Model{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Model.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiModelArn()`, - }, - { - Name: "model_template", - Type: schema.TypeString, - Resolver: `resolveApigatewayv2apiModelModelTemplate`, - }, - }...), - }, - { - SubService: "api_routes", - Struct: &types.Route{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Route.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiRouteArn()`, - }, - }...), - Relations: []string{ - "ApiRouteResponses()", - }, - }, - { - SubService: "api_route_responses", - Struct: &types.RouteResponse{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_RouteResponse.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_route_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "route_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("route_id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiRouteResponseArn()`, - }, - }...), - }, - { - SubService: "api_stages", - Struct: &types.Stage{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_Stage.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "api_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveApiStageArn()`, - }, - }...), - }, - { - SubService: "domain_names", - Struct: &types.DomainName{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_DomainName.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveDomainNameArn()`, - }, - }...), - Relations: []string{ - "DomainNameRestApiMappings()", - }, - }, - { - SubService: "domain_name_rest_api_mappings", - Struct: &types.ApiMapping{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_ApiMapping.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "domain_name_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveDomainNameRestApiMappingArn()`, - }, - }...), - }, - { - SubService: "vpc_links", - Struct: &types.VpcLink{}, - Description: "https://docs.aws.amazon.com/apigateway/latest/api/API_VpcLink.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcLinkArn()`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "apigatewayv2" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("apigateway")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/applicationautoscaling.go b/plugins/source/aws/codegen/recipes/applicationautoscaling.go deleted file mode 100644 index 6b2289eca7a369..00000000000000 --- a/plugins/source/aws/codegen/recipes/applicationautoscaling.go +++ /dev/null @@ -1,34 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ApplicationAutoScalingResources() []*Resource { - resources := []*Resource{ - { - SubService: "policies", - Struct: &types.ScalingPolicy{}, - Description: "https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPolicy.html", - SkipFields: []string{"PolicyARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("PolicyARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "applicationautoscaling" - r.Multiplex = `client.ServiceAccountRegionNamespaceMultiplexer("application-autoscaling")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/apprunner.go b/plugins/source/aws/codegen/recipes/apprunner.go deleted file mode 100644 index 0115bf3f0da8b3..00000000000000 --- a/plugins/source/aws/codegen/recipes/apprunner.go +++ /dev/null @@ -1,172 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/apprunner/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ApprunnerResources() []*Resource { - resources := []*Resource{ - { - SubService: "auto_scaling_configurations", - Struct: &types.AutoScalingConfiguration{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_AutoScalingConfiguration.html", - SkipFields: []string{"AutoScalingConfigurationArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - PreResourceResolver: "getAutoScalingConfiguration", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AutoScalingConfigurationArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("AutoScalingConfigurationArn")`, - }, - }...), - }, { - SubService: "custom_domains", - Struct: &types.CustomDomain{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_CustomDomain.html", - Multiplex: "", - ExtraColumns: defaultRegionalColumns, - }, { - SubService: "connections", - Struct: &types.ConnectionSummary{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_Connection.html", - SkipFields: []string{"ConnectionArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ConnectionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("ConnectionArn")`, - }, - }...), - }, { - SubService: "observability_configurations", - Struct: &types.ObservabilityConfiguration{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_ObservabilityConfiguration.html", - SkipFields: []string{"ObservabilityConfigurationArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - PreResourceResolver: "getObservabilityConfiguration", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ObservabilityConfigurationArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("ObservabilityConfigurationArn")`, - }, - }...), - }, { - SubService: "operations", - Struct: &types.OperationSummary{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_OperationSummary.html", - Multiplex: "", - ExtraColumns: defaultRegionalColumns, - }, { - SubService: "services", - Struct: &types.Service{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_Service.html", - SkipFields: []string{"ServiceArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - PreResourceResolver: "getService", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ServiceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("ServiceArn")`, - }, - }...), - Relations: []string{ - "Operations()", - "CustomDomains()"}, - }, - { - SubService: "vpc_connectors", - Struct: &types.VpcConnector{}, - Description: "https://docs.aws.amazon.com/apprunner/latest/api/API_VpcConnector.html", - SkipFields: []string{"VpcConnectorArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("VpcConnectorArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("VpcConnectorArn")`, - }, - }...), - }, { - SubService: "vpc_ingress_connections", - Struct: &types.VpcIngressConnection{}, - Description: `https://docs.aws.amazon.com/apprunner/latest/api/API_VpcIngressConnection.html - -Notes: -- 'account_id' has been renamed to 'source_account_id' to avoid conflict with the 'account_id' column that indicates what account this was synced from.`, - SkipFields: []string{"VpcIngressConnectionArn", "AccountId"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("apprunner")`, - PreResourceResolver: "getVpcIngressConnection", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("VpcIngressConnectionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "source_account_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AccountId")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveApprunnerTags("VpcIngressConnectionArn")`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "apprunner" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/appstream.go b/plugins/source/aws/codegen/recipes/appstream.go deleted file mode 100644 index db0fe609787e9e..00000000000000 --- a/plugins/source/aws/codegen/recipes/appstream.go +++ /dev/null @@ -1,253 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/appstream" - "github.com/aws/aws-sdk-go-v2/service/appstream/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AppstreamResources() []*Resource { - resources := []*Resource{ - { - SubService: "app_blocks", - Struct: &types.AppBlock{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_AppBlock.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "applications", - Struct: &types.Application{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Application.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - `ApplicationFleetAssociations()`, - }, - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "application_fleet_associations", - Struct: &types.ApplicationFleetAssociation{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ApplicationFleetAssociation.html", - SkipFields: []string{"ApplicationArn", "FleetName"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "application_arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ApplicationArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "fleet_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("FleetName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "directory_configs", - Struct: &types.DirectoryConfig{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_DirectoryConfig.html", - SkipFields: []string{"DirectoryName"}, - ExtraColumns: append(defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "directory_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DirectoryName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "fleets", - Struct: &types.Fleet{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Fleet.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "image_builders", - Struct: &types.ImageBuilder{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ImageBuilder.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "images", - Struct: &types.Image{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Image.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - CustomDescribeInput: `appstream.DescribeImagesInput{MaxResults: aws.Int32(25)}`, - }, - { - SubService: "stacks", - Struct: &types.Stack{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Stack.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - `StackEntitlements()`, - `StackUserAssociations()`, - }, - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "stack_entitlements", - Struct: &types.Entitlement{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Entitlement.html", - SkipFields: []string{"StackName", "Name"}, - ExtraColumns: append(defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "stack_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StackName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "stack_user_associations", - Struct: &types.UserStackAssociation{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UserStackAssociation.html", - SkipFields: []string{"StackName", "UserName", "AuthenticationType"}, - ExtraColumns: append(defaultRegionalColumnsPK, []codegen.ColumnDefinition{ - { - Name: "stack_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StackName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("UserName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "authentication_type", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AuthenticationType")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "usage_report_subscriptions", - Struct: &types.UsageReportSubscription{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UsageReportSubscription.html", - SkipFields: []string{"S3BucketName"}, - ExtraColumns: append(defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "s3_bucket_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("S3BucketName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "users", - Struct: &types.User{}, - Description: "https://docs.aws.amazon.com/appstream2/latest/APIReference/API_User.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - } - - for _, resource := range resources { - resource.Service = "appstream" - resource.Multiplex = `client.ServiceAccountRegionMultiplexer("appstream2")` - resource.Client = &appstream.Client{} - resource.ResolverAndMockTestTemplate = "describe_resources_1" - } - - return resources -} diff --git a/plugins/source/aws/codegen/recipes/appsync.go b/plugins/source/aws/codegen/recipes/appsync.go deleted file mode 100644 index 28070035f4f452..00000000000000 --- a/plugins/source/aws/codegen/recipes/appsync.go +++ /dev/null @@ -1,34 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/appsync/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AppSync() []*Resource { - resources := []*Resource{ - { - SubService: "graphql_apis", - Struct: &types.GraphqlApi{}, - Description: "https://docs.aws.amazon.com/appsync/latest/APIReference/API_GraphqlApi.html", - SkipFields: []string{"Arn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("appsync")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "appsync" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/athena.go b/plugins/source/aws/codegen/recipes/athena.go deleted file mode 100644 index b60eb9198798c8..00000000000000 --- a/plugins/source/aws/codegen/recipes/athena.go +++ /dev/null @@ -1,172 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/athena/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AthenaResources() []*Resource { - resources := []*Resource{ - { - SubService: "data_catalogs", - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_DataCatalog.html", - Struct: &types.DataCatalog{}, - SkipFields: []string{}, - PreResourceResolver: "getDataCatalog", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveAthenaDataCatalogArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveAthenaDataCatalogTags`, - }, - }...), - Relations: []string{ - "DataCatalogDatabases()", - }, - }, - { - SubService: "data_catalog_databases", - Struct: &types.Database{}, - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_Database.html", - SkipFields: []string{"Name"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "data_catalog_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "DataCatalogDatabaseTables()", - }, - }, - { - SubService: "data_catalog_database_tables", - Struct: &types.TableMetadata{}, - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_TableMetadata.html", - SkipFields: []string{"Name"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "data_catalog_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("data_catalog_arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "data_catalog_database_name", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "work_groups", - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_WorkGroup.html", - Struct: &types.WorkGroup{}, - SkipFields: []string{}, - PreResourceResolver: "getWorkGroup", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveAthenaWorkGroupArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveAthenaWorkGroupTags`, - }, - }...), - Relations: []string{ - "WorkGroupPreparedStatements()", - "WorkGroupQueryExecutions()", - "WorkGroupNamedQueries()", - }, - }, - { - SubService: "work_group_prepared_statements", - Struct: &types.PreparedStatement{}, - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_PreparedStatement.html", - PreResourceResolver: "getWorkGroupPreparedStatement", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "work_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "work_group_query_executions", - Struct: &types.QueryExecution{}, - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_QueryExecution.html", - PreResourceResolver: "getWorkGroupQueryExecution", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "work_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "work_group_named_queries", - Struct: &types.NamedQuery{}, - Description: "https://docs.aws.amazon.com/athena/latest/APIReference/API_NamedQuery.html", - PreResourceResolver: "getWorkGroupNamedQuery", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "work_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "athena" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("athena")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/autoscaling.go b/plugins/source/aws/codegen/recipes/autoscaling.go deleted file mode 100644 index dc6ef21a803587..00000000000000 --- a/plugins/source/aws/codegen/recipes/autoscaling.go +++ /dev/null @@ -1,125 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/autoscaling/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func AutoscalingResources() []*Resource { - resources := []*Resource{ - { - SubService: "launch_configurations", - Struct: &types.LaunchConfiguration{}, - Description: "https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LaunchConfiguration.html", - SkipFields: []string{"LaunchConfigurationARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("LaunchConfigurationARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "groups", - Struct: &models.AutoScalingGroupWrapper{}, - Description: "https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_AutoScalingGroup.html", - SkipFields: []string{"AutoScalingGroupARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "load_balancers", - Type: schema.TypeJSON, - Resolver: `resolveAutoscalingGroupLoadBalancers`, - }, - { - Name: "load_balancer_target_groups", - Type: schema.TypeJSON, - Resolver: `resolveAutoscalingGroupLoadBalancerTargetGroups`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AutoScalingGroupARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "GroupScalingPolicies()", - "GroupLifecycleHooks()", - }, - }, - { - SubService: "group_scaling_policies", - Struct: &types.ScalingPolicy{}, - Description: "https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScalingPolicy.html", - SkipFields: []string{"PolicyARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("PolicyARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "group_lifecycle_hooks", - Struct: &types.LifecycleHook{}, - Description: "https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LifecycleHook.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "scheduled_actions", - Struct: &types.ScheduledUpdateGroupAction{}, - Description: "https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScheduledUpdateGroupAction.html", - SkipFields: []string{"ScheduledActionARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ScheduledActionARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "autoscaling" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("autoscaling")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/backup.go b/plugins/source/aws/codegen/recipes/backup.go deleted file mode 100644 index b3ebec8b36227e..00000000000000 --- a/plugins/source/aws/codegen/recipes/backup.go +++ /dev/null @@ -1,156 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/backup" - "github.com/aws/aws-sdk-go-v2/service/backup/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func BackupResources() []*Resource { - resources := []*Resource{ - { - SubService: "global_settings", - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeGlobalSettings.html", - Struct: &backup.DescribeGlobalSettingsOutput{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "plans", - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_GetBackupPlan.html", - Struct: &backup.GetBackupPlanOutput{}, - SkipFields: []string{"BackupPlanArn"}, - PreResourceResolver: "getPlan", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BackupPlanArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolvePlanTags`, - }, - }...), - Relations: []string{ - "PlanSelections()", - }, - }, - { - SubService: "plan_selections", - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_GetBackupSelection.html", - Struct: &backup.GetBackupSelectionOutput{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "plan_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "region_settings", - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeRegionSettings.html", - Struct: &backup.DescribeRegionSettingsOutput{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "vaults", - Struct: &types.BackupVaultListMember{}, - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_BackupVaultListMember.html", - SkipFields: []string{"BackupVaultArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BackupVaultArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "access_policy", - Type: schema.TypeJSON, - Resolver: `resolveVaultAccessPolicy`, - IgnoreInTests: true, - }, - { - Name: "notifications", - Type: schema.TypeJSON, - Resolver: `resolveVaultNotifications`, - IgnoreInTests: true, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveVaultTags`, - }, - }...), - Relations: []string{ - "VaultRecoveryPoints()", - }, - }, - { - SubService: "vault_recovery_points", - Struct: &types.RecoveryPointByBackupVault{}, - Description: "https://docs.aws.amazon.com/aws-backup/latest/devguide/API_RecoveryPointByBackupVault.html", - SkipFields: []string{"RecoveryPointArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "vault_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RecoveryPointArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRecoveryPointTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "backup" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("backup")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/base.go b/plugins/source/aws/codegen/recipes/base.go deleted file mode 100644 index 22786501aefe1b..00000000000000 --- a/plugins/source/aws/codegen/recipes/base.go +++ /dev/null @@ -1,450 +0,0 @@ -package recipes - -import ( - "bytes" - "embed" - "errors" - "fmt" - "go/format" - "os" - "path" - "reflect" - "regexp" - "runtime" - "strings" - "text/template" - - "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - "github.com/cloudquery/cloudquery/plugins/source/aws/codegen/recipes/discover" - "github.com/cloudquery/plugin-sdk/caser" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/iancoleman/strcase" -) - -type Resource struct { - // Name overrides the table name: used only in rare cases for backwards-compatibility. - Name string - Service string - SubService string - Struct any - SkipFields []string - Description string - ExtraColumns []codegen.ColumnDefinition - PKColumns []string - Table *codegen.TableDefinition - Multiplex string - PreResourceResolver string - PostResourceResolver string - Relations []string - UnwrapEmbeddedStructs bool - - // NameTransformer custom name transformer for resource - NameTransformer func(field reflect.StructField) (string, error) - - // Used for generating the resolver and mock tests. - // -------------------------------- - ShouldGenerateResolverAndMockTest bool // if true, resolver and mock will be generated using the options below - ResolverAndMockTestTemplate string // required: name of template directory to use - Client any // required: AWS client struct to use, e.g. &ec2.Client{} - - // Applies only to list resources: - ListMethodName string // optional: List method on the Client to use. Only required if we need to disambiguate between multiple options. - CustomListInput string // optional: string to set List input to (otherwise empty input will be used) - - // Applies only to describe resources: - DescribeMethodName string // optional: Describe method on the Client to use. Only required if we need to disambiguate between multiple options. - CustomDescribeInput string // optional: string to set List input to (otherwise empty input will be used) - - // used for generating resolver and mock tests, but set automatically - parent *Resource - children []*Resource -} - -//go:embed templates/resolver_and_mock_test/*/*.go.tpl -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -var defaultAccountColumns = []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, -} - -var defaultRegionalColumns = []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, -} - -var defaultRegionalColumnsPK = []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, -} - -func awsNameTransformer(f reflect.StructField) (string, error) { - c := caser.New(caser.WithCustomInitialisms(map[string]bool{ - "EC2": true, - "VPC": true, - })) - return c.ToSnake(f.Name), nil -} - -func awsResolverTransformer(f reflect.StructField, path string) (string, error) { - if f.Type.String() == "[]types.Tag" { - if path == "Tags" { - return "client.ResolveTags", nil - } - return `client.ResolveTagField("` + path + `")`, nil - } - - if path == "Tags" || path == "TagSet" { - switch f.Type { - case reflect.TypeOf(map[string]string{}), reflect.TypeOf(map[string]*string{}), reflect.TypeOf(map[string]any{}), reflect.TypeOf([]types.TagDescription{}): - // valid tag types - default: - return "", fmt.Errorf("%q field is not of type []types.Tag or acceptable map: %s", path, f.Type.String()) - } - } - - return codegen.DefaultResolverTransformer(f, path) -} - -func (r *Resource) Generate() error { - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - - dir := path.Dir(filename) - dir = path.Join(dir, "../../resources/services", r.Service) - if err := os.MkdirAll(dir, os.ModePerm); err != nil { - return fmt.Errorf("failed to create directory %s: %w", dir, err) - } - - var err error - opts := []codegen.TableOption{ - codegen.WithSkipFields(r.SkipFields), - codegen.WithExtraColumns(r.ExtraColumns), - codegen.WithPKColumns(r.PKColumns...), - codegen.WithNameTransformer(awsNameTransformer), - codegen.WithResolverTransformer(awsResolverTransformer), - } - if r.UnwrapEmbeddedStructs { - opts = append(opts, codegen.WithUnwrapAllEmbeddedStructs()) - } - if r.NameTransformer != nil { - opts = append(opts, codegen.WithNameTransformer(r.NameTransformer)) - } - name := fmt.Sprintf("aws_%s_%s", r.Service, r.SubService) - if r.Name != "" { - name = r.Name - } - - // All table names must be plural - if !strings.HasSuffix(name, "s") { - return fmt.Errorf("invalid table name: %s. must be plural", name) - } - - r.Table, err = codegen.NewTableFromStruct( - name, - r.Struct, - opts..., - ) - if err != nil { - return fmt.Errorf("error generating %s: %w", name, err) - } - r.Table.Description = r.Description - r.Table.Resolver = "fetch" + strcase.ToCamel(r.Service) + strcase.ToCamel(r.SubService) - if r.Multiplex != "" { - r.Table.Multiplex = r.Multiplex - err = validateServiceMultiplex(r.Multiplex) - if err != nil { - return err - } - } - if r.PreResourceResolver != "" { - r.Table.PreResourceResolver = r.PreResourceResolver - } - if r.PostResourceResolver != "" { - r.Table.PostResourceResolver = r.PostResourceResolver - } - if r.Relations != nil { - r.Table.Relations = r.Relations - } - - if err := r.generateSchema(dir); err != nil { - return err - } - - if r.ShouldGenerateResolverAndMockTest { - if err := r.generateResolver(dir); err != nil { - return err - } - if err := r.generateMockTest(dir); err != nil { - return err - } - } - - return nil -} - -func (r *Resource) generateSchema(dir string) error { - tpl, err := template.New("resource.go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToLower": strings.ToLower, - }).ParseFS(templatesFS, "templates/resource.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse templates: %w", err) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse sdk template: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - - filePath := path.Join(dir, r.SubService+".go") - content := buff.Bytes() - formattedContent, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - - return nil -} - -func (r *Resource) generateResolver(dir string) error { - tpl, err := template.New("fetch.go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToLower": strings.ToLower, - }).ParseFS(templatesFS, - fmt.Sprintf("templates/resolver_and_mock_test/%s/fetch.go.tpl", r.ResolverAndMockTestTemplate)) - if err != nil { - return fmt.Errorf("failed to parse templates: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - return fmt.Errorf("failed to execute resolver template for %s.%s: %w", r.Service, r.SubService, err) - } - - filePath := path.Join(dir, r.SubService+"_fetch.go") - content := buff.Bytes() - formattedContent, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - - return nil -} - -func (r *Resource) generateMockTest(dir string) error { - tpl, err := template.New("mock_test.go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToLower": strings.ToLower, - }).ParseFS(templatesFS, - fmt.Sprintf("templates/resolver_and_mock_test/%s/mock_test.go.tpl", r.ResolverAndMockTestTemplate)) - if err != nil { - return fmt.Errorf("failed to parse gcp templates: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - return fmt.Errorf("failed to execute mock template for %s.%s: %w", r.Service, r.SubService, err) - } - - filePath := path.Join(dir, r.SubService+"_mock_test.go") - content := buff.Bytes() - formattedContent, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - - return nil -} - -// SetParentChildRelationships calculates and sets the parent and children fields on resources. -func SetParentChildRelationships(resources []*Resource) error { - m := map[string]*Resource{} - for _, r := range resources { - m[r.Service+"."+r.SubService] = r - } - csr := caser.New() - for _, r := range resources { - for _, ch := range r.Relations { - name := csr.ToSnake(strings.TrimSuffix(ch, "()")) - v, ok := m[r.Service+"."+name] - if !ok { - return errors.New("child not found for " + r.Service + "." + r.SubService + " : " + name) - } - r.children = append(r.children, v) - v.parent = r - } - } - return nil -} - -// These methods are called from the template. -// Because of this, we use a value receiver. -// ------------------------------------------------------------------------------- - -// StructName returns the name of the resource's Struct field -func (r Resource) StructName() string { - // because usually the 'Struct' field contains a pointer, we need to dereference with '.Elem()'. - return reflect.TypeOf(r.Struct).Elem().Name() -} - -type ListTagsMethodResponse struct { - Method reflect.Method - Found bool -} - -// ListTagsMethod finds a ListTags method for the service, if any -func (r Resource) ListTagsMethod() ListTagsMethodResponse { - if r.Client == nil || reflect.ValueOf(r.Client).IsNil() { - panic("Client needs to be set to generate resolvers and mocks") - } - m, err := discover.FindListTagsMethod(r.Client) - if err != nil { - return ListTagsMethodResponse{ - Found: false, - } - } - return ListTagsMethodResponse{ - Method: m.Method, - Found: true, - } -} - -// DescribeMethod finds a describe method for the resource -func (r Resource) DescribeMethod() discover.DiscoveredMethod { - if r.Client == nil || (reflect.ValueOf(r.Client).Kind() == reflect.Ptr && reflect.ValueOf(r.Client).IsNil()) { - panic("Client needs to be set to generate resolvers and mocks") - } - if r.DescribeMethodName != "" { - m, err := discover.MethodByName(r.Client, r.Struct, r.DescribeMethodName) - if err != nil { - panic(err) - } - return m - } - m, err := discover.FindDescribeMethod(r.Client, r.Struct) - if err != nil { - panic(err) - } - return m -} - -// ListMethod finds a list method for the resource -func (r Resource) ListMethod() discover.DiscoveredMethod { - if r.Client == nil { - panic("Client needs to be set to generate resolvers and mocks") - } - if r.ListMethodName != "" { - m, err := discover.MethodByName(r.Client, r.Struct, r.ListMethodName) - if err != nil { - panic(err) - } - return m - } - m, err := discover.FindListMethod(r.Client, r.Struct) - if err != nil { - panic(err) - } - return m -} - -// Parent returns the parent resource, if any -func (r Resource) Parent() *Resource { - return r.parent -} - -// Children returns the child resources, if any -func (r Resource) Children() []*Resource { - return r.children -} - -// CloudQueryServiceName is used for accessing 'client.Services().{{.CloudqueryServiceName}}' in templates -func (r Resource) CloudQueryServiceName() string { - csr := caser.New() - return csr.ToPascal(r.Service) -} - -// CreateReplaceTransformer allows overriding column names -func CreateReplaceTransformer(replace map[string]string) func(field reflect.StructField) (string, error) { - return func(field reflect.StructField) (string, error) { - name, err := codegen.DefaultNameTransformer(field) - if err != nil { - return "", err - } - for k, v := range replace { - name = strings.ReplaceAll(name, k, v) - } - return name, nil - } -} - -func validateServiceMultiplex(multiplexerCall string) error { - re := regexp.MustCompile(`\"(.*?)\"`) - // Find the value of the service parameter - submatchAll := re.FindStringSubmatch(multiplexerCall) - if len(submatchAll) != 2 { - return nil - } - - t := client.ReadSupportedServiceRegions() - services := make(map[string]bool) - - for _, partition := range t.Partitions { - for service := range partition.Services { - if _, ok := services[service]; !ok { - services[service] = true - } - } - } - if _, ok := services[submatchAll[1]]; !ok { - return fmt.Errorf("invalid partition: %s", submatchAll[1]) - } - return nil -} diff --git a/plugins/source/aws/codegen/recipes/cloudformation.go b/plugins/source/aws/codegen/recipes/cloudformation.go deleted file mode 100644 index 8aaff6218c0ec2..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudformation.go +++ /dev/null @@ -1,53 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudformationResources() []*Resource { - resources := []*Resource{ - { - SubService: "stacks", - Struct: &types.Stack{}, - Description: "https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_Stack.html", - SkipFields: []string{"StackId"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StackId")`, - }, - { - // duplicated column "arn" because "StackId" actually contains an ARN, - // so we store it once as "id" and once as "arn" for consistency with other - // AWS resources - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StackId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "StackResources()", - }, - }, - { - SubService: "stack_resources", - Struct: &types.StackResourceSummary{}, - Description: "https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackResourceSummary.html", - SkipFields: []string{}, - ExtraColumns: defaultRegionalColumns, - }, - } - - // set default values - for _, r := range resources { - r.Service = "cloudformation" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("cloudformation")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cloudfront.go b/plugins/source/aws/codegen/recipes/cloudfront.go deleted file mode 100644 index 6a97e656461ac9..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudfront.go +++ /dev/null @@ -1,61 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudfrontResources() []*Resource { - resources := []*Resource{ - { - SubService: "cache_policies", - Struct: &types.CachePolicySummary{}, - Description: "https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_CachePolicySummary.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CachePolicy.Id")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveCachePolicyARN()`, - }, - }...), - }, - { - SubService: "distributions", - Struct: &types.Distribution{}, - Description: "https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_Distribution.html", - SkipFields: []string{"ARN"}, - PreResourceResolver: "getDistribution", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveCloudfrontDistributionTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "cloudfront" - r.Multiplex = `client.AccountMultiplex` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cloudhsmv2.go b/plugins/source/aws/codegen/recipes/cloudhsmv2.go deleted file mode 100644 index 2398c141d03d2d..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudhsmv2.go +++ /dev/null @@ -1,60 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudHSMV2() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Cluster.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("cloudhsmv2")`, - SkipFields: []string{"TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveClusterArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTagField("TagList")`, - }, - }...), - }, - { - SubService: "backups", - Struct: &types.Backup{}, - Description: "https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Backup.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("cloudhsmv2")`, - SkipFields: []string{"TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveBackupArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTagField("TagList")`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "cloudhsmv2" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cloudtrail.go b/plugins/source/aws/codegen/recipes/cloudtrail.go deleted file mode 100644 index a5e082c3154542..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudtrail.go +++ /dev/null @@ -1,69 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/cloudtrail/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudtrailResources() []*Resource { - resources := []*Resource{ - { - SubService: "trails", - Struct: &models.CloudTrailWrapper{}, - Description: "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_Trail.html", - SkipFields: []string{"TrailARN"}, - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{ - { - Name: "cloudwatch_logs_log_group_name", - Type: schema.TypeString, - Resolver: `resolveCloudtrailTrailCloudwatchLogsLogGroupName`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TrailARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: `resolveCloudTrailStatus`, - }, - }...), - Relations: []string{ - "TrailEventSelectors()", - }, - }, - { - SubService: "trail_event_selectors", - Struct: &types.EventSelector{}, - Description: "https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_EventSelector.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "trail_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "cloudtrail" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("cloudtrail")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cloudwatch.go b/plugins/source/aws/codegen/recipes/cloudwatch.go deleted file mode 100644 index 9aaee6bfd436bf..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudwatch.go +++ /dev/null @@ -1,45 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudwatchResources() []*Resource { - resources := []*Resource{ - { - SubService: "alarms", - Struct: &types.MetricAlarm{}, - Description: "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricAlarm.html", - SkipFields: []string{"AlarmArn", "Dimensions"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveCloudwatchAlarmTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AlarmArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "dimensions", - Type: schema.TypeJSON, - Resolver: `resolveCloudwatchAlarmDimensions`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "cloudwatch" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("logs")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cloudwatchlogs.go b/plugins/source/aws/codegen/recipes/cloudwatchlogs.go deleted file mode 100644 index 5d52554621e27b..00000000000000 --- a/plugins/source/aws/codegen/recipes/cloudwatchlogs.go +++ /dev/null @@ -1,69 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CloudWatchLogsResources() []*Resource { - resources := []*Resource{ - { - SubService: "resource_policies", - Struct: &types.ResourcePolicy{}, - Description: "https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_ResourcePolicy.html", - PKColumns: []string{"account_id", "region", "policy_name"}, - SkipFields: []string{"PolicyDocument"}, - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{ - { - Name: "policy_document", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("PolicyDocument")`, - }, - }...), - }, - { - SubService: "metric_filters", - Struct: &types.MetricFilter{}, - Description: "https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_MetricFilter.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveMetricFilterArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "log_groups", - Struct: &types.LogGroup{}, - Description: "https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_LogGroup.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveLogGroupTags`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "cloudwatchlogs" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("logs")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/codebuild.go b/plugins/source/aws/codegen/recipes/codebuild.go deleted file mode 100644 index ae4ed471e8ab96..00000000000000 --- a/plugins/source/aws/codegen/recipes/codebuild.go +++ /dev/null @@ -1,34 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/codebuild/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CodeBuildResources() []*Resource { - resources := []*Resource{ - { - SubService: "projects", - Struct: &types.Project{}, - Description: "https://docs.aws.amazon.com/codebuild/latest/APIReference/API_Project.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "codebuild" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("codebuild")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/codepipeline.go b/plugins/source/aws/codegen/recipes/codepipeline.go deleted file mode 100644 index 0a0686976d684e..00000000000000 --- a/plugins/source/aws/codegen/recipes/codepipeline.go +++ /dev/null @@ -1,57 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/codepipeline" - "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CodePipelineResources() []*Resource { - resources := []*Resource{ - { - SubService: "webhooks", - Struct: &types.ListWebhookItem{}, - Description: "https://docs.aws.amazon.com/codepipeline/latest/APIReference/API_ListWebhookItem.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("codepipeline")`, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "pipelines", - Struct: &codepipeline.GetPipelineOutput{}, - Multiplex: `client.ServiceAccountRegionMultiplexer("codepipeline")`, - PreResourceResolver: "getPipeline", - SkipFields: []string{"ResultMetadata"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolvePipelineArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolvePipelineTags`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "codepipeline" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/cognito.go b/plugins/source/aws/codegen/recipes/cognito.go deleted file mode 100644 index 848ff7aa5aea2d..00000000000000 --- a/plugins/source/aws/codegen/recipes/cognito.go +++ /dev/null @@ -1,97 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" - "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func CognitoResources() []*Resource { - resources := []*Resource{ - { - SubService: "identity_pools", - Struct: &cognitoidentity.DescribeIdentityPoolOutput{}, - SkipFields: []string{"IdentityPoolId"}, - PreResourceResolver: "getIdentityPool", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveIdentityPoolARN()`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("IdentityPoolId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "user_pools", - Struct: &types.UserPoolType{}, - Description: "https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_UserPoolType.html", - SkipFields: []string{"Id"}, - PreResourceResolver: "getUserPool", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Id")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - Relations: []string{ - "UserPoolIdentityProviders()", - }, - }, - { - SubService: "user_pool_identity_providers", - Struct: &types.IdentityProviderType{}, - Description: "https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_IdentityProviderType.html", - SkipFields: []string{}, - PreResourceResolver: "getUserPoolIdentityProvider", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "user_pool_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "cognito" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("cognito-identity")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/config.go b/plugins/source/aws/codegen/recipes/config.go deleted file mode 100644 index 9683e7d2020cac..00000000000000 --- a/plugins/source/aws/codegen/recipes/config.go +++ /dev/null @@ -1,95 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/configservice/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/config/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ConfigResources() []*Resource { - resources := []*Resource{ - { - SubService: "configuration_recorders", - Struct: &models.ConfigurationRecorderWrapper{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `generateConfigRecorderArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "conformance_packs", - Struct: &types.ConformancePackDetail{}, - Description: "https://docs.aws.amazon.com/config/latest/APIReference/API_ConformancePackDetail.html", - SkipFields: []string{"ConformancePackArn", "ConformancePackInputParameters"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ConformancePackArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ConformancePackRuleCompliances()", - }, - }, - { - SubService: "conformance_pack_rule_compliances", - Struct: &models.ConformancePackComplianceWrapper{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "conformance_pack_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "config_rules", - Struct: new(types.ConfigRule), - SkipFields: []string{"ConfigRuleArn"}, - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ConfigRuleArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{"ConfigRuleCompliances()"}, - }, - { - SubService: "config_rule_compliances", - Struct: new(types.ComplianceByConfigRule), - ExtraColumns: defaultRegionalColumns, - }, - } - - // set default values - for _, r := range resources { - r.Service = "config" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("config")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/dax.go b/plugins/source/aws/codegen/recipes/dax.go deleted file mode 100644 index 7b34c62d5abd53..00000000000000 --- a/plugins/source/aws/codegen/recipes/dax.go +++ /dev/null @@ -1,39 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/dax/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DaxResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_dax_Cluster.html", - SkipFields: []string{"ClusterArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("dax")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveClusterTags`, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "dax" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/directconnect.go b/plugins/source/aws/codegen/recipes/directconnect.go deleted file mode 100644 index c0bf9ef792dd65..00000000000000 --- a/plugins/source/aws/codegen/recipes/directconnect.go +++ /dev/null @@ -1,179 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/directconnect/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DirectConnectResources() []*Resource { - resources := []*Resource{ - { - SubService: "connections", - Struct: &types.Connection{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Connection.html", - SkipFields: []string{"ConnectionId", "Region"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveConnectionARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ConnectionId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "gateways", - Struct: &types.DirectConnectGateway{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGateway.html", - SkipFields: []string{"DirectConnectGatewayId"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGatewayARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DirectConnectGatewayId")`, - }, - }...), - Relations: []string{ - "GatewayAssociations()", - "GatewayAttachments()", - }, - }, - { - SubService: "gateway_associations", - Struct: &types.DirectConnectGatewayAssociation{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAssociation.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "gateway_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - { - SubService: "gateway_attachments", - Struct: &types.DirectConnectGatewayAttachment{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAttachment.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "gateway_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - { - SubService: "lags", - Struct: &types.Lag{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Lag.html", - SkipFields: []string{"LagId", "Tags", "Region"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveLagARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("LagId")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - }...), - }, - { - SubService: "virtual_gateways", - Struct: &types.VirtualGateway{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualGateway.html", - SkipFields: []string{"VirtualGatewayId"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("VirtualGatewayId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "virtual_interfaces", - Struct: &types.VirtualInterface{}, - Description: "https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualInterface.html", - SkipFields: []string{"VirtualInterfaceId", "Region"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVirtualInterfaceARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("VirtualInterfaceId")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "directconnect" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("directconnect")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/discover/discover.go b/plugins/source/aws/codegen/recipes/discover/discover.go deleted file mode 100644 index a9459f39b0b3c1..00000000000000 --- a/plugins/source/aws/codegen/recipes/discover/discover.go +++ /dev/null @@ -1,133 +0,0 @@ -package discover - -import ( - "fmt" - "reflect" - "strings" -) - -// DiscoveredMethod is a method on the Client struct that was discovered -// to have the right output type. If the output type was found in a return struct field, -// that name is specified in OutputFieldName. -type DiscoveredMethod struct { - Method reflect.Method - OutputFieldName string // field name on the output struct -} - -// MethodByName returns a method on the client that matches a specific name. -func MethodByName(client any, targetStruct any, name string) (DiscoveredMethod, error) { - methods := FindMethods(client, targetStruct, []string{name}) - for _, m := range methods { - if m.Method.Name == name { - return m, nil - } - } - tt := reflect.TypeOf(targetStruct).Elem() - return DiscoveredMethod{}, fmt.Errorf("method %v that returns %v not found", name, tt.Name()) -} - -// FindMethods returns a slice of methods that return the targetStruct (either directly or as a field -// of the returned struct) and start with one of the given prefixes. -func FindMethods(client, targetStruct any, prefixes []string) []DiscoveredMethod { - v := reflect.ValueOf(client) - t := v.Type() - var tt reflect.Type - if targetStruct != nil { - tt = reflect.TypeOf(targetStruct).Elem() - } - found := make([]DiscoveredMethod, 0) - // iterate over the methods of the given client - for i := 0; i < t.NumMethod(); i++ { - method := t.Method(i) - hasPrefix := false - for _, prefix := range prefixes { - if strings.HasPrefix(method.Name, prefix) { - hasPrefix = true - } - } - if len(prefixes) > 0 && !hasPrefix { - // skip methods that don't start with any of the given prefixes - continue - } - - if tt == nil { - // no specific target struct was requested, so return any method - // that matches the prefix requirements - found = append(found, DiscoveredMethod{ - Method: method, - }) - continue - } - - // iterate over the output types of the method to find matches for targetStruct - f := v.Method(i).Interface() - ft := reflect.TypeOf(f) - for u := 0; u < ft.NumOut(); u++ { - e := ft.Out(u) - if ft.Out(u).Kind() == reflect.Ptr || ft.Out(u).Kind() == reflect.Slice { - e = e.Elem() - } - if e.Kind() != reflect.Struct { - continue - } - if tt == nil || reflect.TypeOf(e) == tt { - // struct is directly returned by the method - found = append(found, DiscoveredMethod{ - Method: method, - }) - continue - } - for x := 0; x < e.NumField(); x++ { - ef := e.Field(x) - eft := ef.Type - if eft.Kind() == reflect.Ptr || eft.Kind() == reflect.Slice { - eft = ef.Type.Elem() - } - if tt == nil || eft == tt { - // struct is returned by the method as a field in an Output struct - found = append(found, DiscoveredMethod{ - Method: method, - OutputFieldName: ef.Name, - }) - } - } - } - } - return found -} - -// FindMethod finds a single method and errors out if zero or more than one is discovered. -func FindMethod(client, targetStruct any, prefixes []string) (DiscoveredMethod, error) { - f := FindMethods(client, targetStruct, prefixes) - if len(f) == 0 { - if targetStruct == nil { - return DiscoveredMethod{}, fmt.Errorf("found no method with prefix in %v", prefixes) - } - name := reflect.TypeOf(targetStruct).Elem().Name() - return DiscoveredMethod{}, fmt.Errorf("found no method with prefix in %v that also returns %v", prefixes, name) - } - if len(f) > 1 { - if targetStruct == nil { - return DiscoveredMethod{}, fmt.Errorf("found %d potential methods for prefix: %v", len(f), prefixes) - } - name := reflect.TypeOf(targetStruct).Elem().Name() - names := make([]string, len(f)) - for i := range f { - names[i] = f[i].Method.Name - } - return DiscoveredMethod{}, fmt.Errorf("found %d potential methods that also return %s: %v", len(f), name, strings.Join(names, ",")) - } - return f[0], nil -} - -func FindDescribeMethod(client, targetStruct any) (DiscoveredMethod, error) { - return FindMethod(client, targetStruct, []string{"Describe", "Get"}) -} - -func FindListMethod(client, targetStruct any) (DiscoveredMethod, error) { - return FindMethod(client, targetStruct, []string{"List"}) -} - -func FindListTagsMethod(client any) (DiscoveredMethod, error) { - return FindMethod(client, nil, []string{"ListTagsForResource", "ListTagsOfResource"}) -} diff --git a/plugins/source/aws/codegen/recipes/dms.go b/plugins/source/aws/codegen/recipes/dms.go deleted file mode 100644 index 46e65380b33938..00000000000000 --- a/plugins/source/aws/codegen/recipes/dms.go +++ /dev/null @@ -1,42 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/dms/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DMSResources() []*Resource { - resources := []*Resource{ - { - SubService: "replication_instances", - Struct: &models.ReplicationInstanceWrapper{}, - Description: "https://docs.aws.amazon.com/dms/latest/APIReference/API_ReplicationInstance.html", - SkipFields: []string{"ReplicationInstanceArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ReplicationInstanceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "dms" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("dms")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/docdb.go b/plugins/source/aws/codegen/recipes/docdb.go deleted file mode 100644 index c15a193e6f83e7..00000000000000 --- a/plugins/source/aws/codegen/recipes/docdb.go +++ /dev/null @@ -1,238 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/docdb/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DocumentDBResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.DBCluster{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBCluster.html", - SkipFields: []string{"DBClusterArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDBClusterTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ClusterSnapshots()", - "Instances()", - }, - }, - { - SubService: "cluster_snapshots", - Struct: &types.DBClusterSnapshot{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterSnapshot.html", - SkipFields: []string{"DBClusterSnapshotArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDBClusterSnapshotTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterSnapshotArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: `resolveDocdbClusterSnapshotAttributes`, - }, - }...), - }, - { - SubService: "cluster_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Parameter.html", - SkipFields: []string{"DBClusterParameterGroupArn"}, - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "cluster_parameter_groups", - Struct: &types.DBClusterParameterGroup{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterParameterGroup.html", - SkipFields: []string{"DBClusterParameterGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDBClusterParameterGroupTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterParameterGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: `resolveDocdbClusterParameterGroupParameters`, - }, - }...), - }, - { - SubService: "certificates", - Struct: &types.Certificate{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Certificate.html", - SkipFields: []string{"CertificateArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CertificateArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "engine_versions", - Struct: &types.DBEngineVersion{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html", - Multiplex: `client.AccountMultiplex`, - SkipFields: []string{"Engine", "EngineVersion"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Engine")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EngineVersion")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - Relations: []string{ - "ClusterParameters()", - "OrderableDbInstanceOptions()", - }, - }, - - { - SubService: "instances", - Struct: &types.DBInstance{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBInstance.html", - SkipFields: []string{"DBInstanceArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDBInstanceTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBInstanceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "subnet_groups", - Struct: &types.DBSubnetGroup{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBSubnetGroup.html", - SkipFields: []string{"DBSubnetGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDBSubnetGroupTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBSubnetGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "global_clusters", - Struct: &types.GlobalCluster{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_GlobalCluster.html", - SkipFields: []string{"GlobalClusterArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GlobalClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "events", - Struct: &types.Event{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Event.html", - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "event_subscriptions", - Struct: &types.EventSubscription{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventSubscription.html", - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "event_categories", - Struct: &types.EventCategoriesMap{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventCategoriesMap.html", - ExtraColumns: defaultAccountColumns, - }, - { - SubService: "pending_maintenance_actions", - Struct: &types.PendingMaintenanceAction{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_PendingMaintenanceAction.html", - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "orderable_db_instance_options", - Struct: &types.OrderableDBInstanceOption{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_OrderableDBInstanceOption.html", - }, - } - - // set default values - for _, r := range resources { - r.Service = "docdb" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("docdb")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/dynamodb.go b/plugins/source/aws/codegen/recipes/dynamodb.go deleted file mode 100644 index a567cc155319bd..00000000000000 --- a/plugins/source/aws/codegen/recipes/dynamodb.go +++ /dev/null @@ -1,75 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DynamoDBResources() []*Resource { - resources := []*Resource{ - { - SubService: "tables", - Struct: &types.TableDescription{}, - Description: "https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TableDescription.html", - SkipFields: []string{"TableArn"}, - PreResourceResolver: "getTable", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDynamodbTableTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TableArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "TableReplicaAutoScalings()", - "TableContinuousBackups()", - }, - }, - { - SubService: "table_replica_auto_scalings", - Struct: &types.ReplicaAutoScalingDescription{}, - Description: "https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ReplicaAutoScalingDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "table_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "table_continuous_backups", - Struct: &types.ContinuousBackupsDescription{}, - Description: "https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ContinuousBackupsDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "table_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "dynamodb" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("dynamodb")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ec2.go b/plugins/source/aws/codegen/recipes/ec2.go deleted file mode 100644 index 1df95cc7ba2cab..00000000000000 --- a/plugins/source/aws/codegen/recipes/ec2.go +++ /dev/null @@ -1,564 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ec2/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ec2/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func EC2Resources() []*Resource { - resources := []*Resource{ - { - SubService: "byoip_cidrs", - Struct: &types.ByoipCidr{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ByoipCidr.html", - SkipFields: []string{"Cidr"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "cidr", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "customer_gateways", - Struct: &types.CustomerGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CustomerGateway.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveCustomerGatewayArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "ebs_snapshots", - Struct: &types.Snapshot{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Snapshot.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveEbsSnapshotArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "attribute", - Type: schema.TypeJSON, - Resolver: "resolveEbsSnapshotAttribute", - }, - }...), - }, - { - SubService: "ebs_volumes", - Struct: &types.Volume{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Volume.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveEbsVolumeArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "egress_only_internet_gateways", - Struct: &types.EgressOnlyInternetGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EgressOnlyInternetGateway.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveEgressOnlyInternetGatewaysArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "eips", - Struct: &types.Address{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Address.html", - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "flow_logs", - Struct: &types.FlowLog{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_FlowLog.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveFlowLogArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "hosts", - Struct: &types.Host{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Host.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveHostArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "images", - Struct: &types.Image{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Image.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveImageArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "instance_statuses", - Struct: &types.InstanceStatus{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceStatus.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveInstanceStatusArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "instances", - Struct: &types.Instance{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Instance.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveInstanceArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "state_transition_reason_time", - Type: schema.TypeTimestamp, - Resolver: "resolveEc2InstanceStateTransitionReasonTime", - IgnoreInTests: true, - }, - }...), - }, - { - SubService: "instance_types", - Struct: &types.InstanceTypeInfo{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceTypeInfo.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveInstanceTypeArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "internet_gateways", - Struct: &types.InternetGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InternetGateway.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveInternetGatewayArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "key_pairs", - Struct: &types.KeyPairInfo{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_KeyPairInfo.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveKeyPairArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "nat_gateways", - Struct: &types.NatGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NatGateway.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveNatGatewayArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "network_acls", - Struct: &types.NetworkAcl{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkAcl.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveNetworkAclArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "network_interfaces", - Struct: &types.NetworkInterface{}, - SkipFields: []string{"TagSet"}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkInterface.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveNetworkInterfaceArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTagField("TagSet")`, - }, - }...), - }, - { - Name: "aws_regions", // rename table for backwards-compatibility - SubService: "regions", - Struct: &types.Region{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Region.html", - SkipFields: []string{"RegionName"}, - Multiplex: `client.AccountMultiplex`, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: `resolveRegionEnabled`, - }, - { - Name: "partition", - Type: schema.TypeString, - Resolver: `resolveRegionPartition`, - }, - // for backwards-compatibility: renamed "region_name" to "region" - { - Name: "region", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RegionName")`, - }, - }, - }, - { - SubService: "regional_configs", - Struct: &models.RegionalConfig{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "reserved_instances", - Struct: &types.ReservedInstances{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReservedInstances.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveReservedInstanceArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "route_tables", - Struct: &types.RouteTable{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RouteTable.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveRouteTableArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "security_groups", - Struct: &types.SecurityGroup{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveSecurityGroupArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "subnets", - Struct: &types.Subnet{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SubnetArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "transit_gateways", - Struct: &types.TransitGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGateway.html", - SkipFields: []string{"TransitGatewayId", "TransitGatewayArn"}, - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TransitGatewayId")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TransitGatewayArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "TransitGatewayAttachments()", - "TransitGatewayRouteTables()", - "TransitGatewayVpcAttachments()", - "TransitGatewayPeeringAttachments()", - "TransitGatewayMulticastDomains()", - }, - }, - { - SubService: "transit_gateway_attachments", - Struct: &types.TransitGatewayAttachment{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayAttachment.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "transit_gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "transit_gateway_route_tables", - Struct: &types.TransitGatewayRouteTable{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayRouteTable.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "transit_gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "transit_gateway_vpc_attachments", - Struct: &types.TransitGatewayVpcAttachment{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayVpcAttachment.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "transit_gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "transit_gateway_peering_attachments", - Struct: &types.TransitGatewayPeeringAttachment{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayPeeringAttachment.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "transit_gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "transit_gateway_multicast_domains", - Struct: &types.TransitGatewayMulticastDomain{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayMulticastDomain.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "transit_gateway_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "vpc_endpoint_service_configurations", - Struct: &types.ServiceConfiguration{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceConfiguration.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcEndpointServiceConfigurationArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "vpc_endpoint_services", - Struct: &types.ServiceDetail{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceDetail.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcEndpointServiceArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "vpc_endpoints", - Struct: &types.VpcEndpoint{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcEndpoint.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcEndpointArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "vpc_peering_connections", - Struct: &types.VpcPeeringConnection{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcPeeringConnection.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcPeeringConnectionArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "vpcs", - Struct: &types.Vpc{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Vpc.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpcArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "vpn_gateways", - Struct: &types.VpnGateway{}, - Description: "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpnGateway.html", - ExtraColumns: append(defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveVpnGatewayArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - for _, r := range resources { - r.Service = "ec2" - if r.Multiplex == "" { - r.Multiplex = `client.ServiceAccountRegionMultiplexer("ec2")` - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ecr.go b/plugins/source/aws/codegen/recipes/ecr.go deleted file mode 100644 index 83d16707d50230..00000000000000 --- a/plugins/source/aws/codegen/recipes/ecr.go +++ /dev/null @@ -1,108 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ecr" - "github.com/aws/aws-sdk-go-v2/service/ecr/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ecr/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ECRResources() []*Resource { - resources := []*Resource{ - { - SubService: "registries", - Struct: &ecr.DescribeRegistryOutput{}, - SkipFields: []string{"RegistryId", "ResultMetadata"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("api.ecr")`, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "registry_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RegistryId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "registry_policies", - Struct: &ecr.GetRegistryPolicyOutput{}, - SkipFields: []string{"RegistryId", "PolicyText", "ResultMetadata"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("api.ecr")`, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "registry_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RegistryId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policy_text", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("PolicyText")`, - }, - }...), - }, - { - SubService: "repositories", - Struct: &types.Repository{}, - Description: "https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html", - SkipFields: []string{"RepositoryArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("api.ecr")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RepositoryArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRepositoryTags`, - }, - { - Name: "policy_text", - Type: schema.TypeJSON, - Resolver: `resolveRepositoryPolicy`, - }, - }...), - Relations: []string{ - "RepositoryImages()", - }, - }, - { - SubService: "repository_images", - Struct: &types.ImageDetail{}, - Description: "https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageDetail.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveImageArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{"RepositoryImageScanFindings()"}, - }, - { - SubService: "repository_image_scan_findings", - Struct: &models.ImageScanWrapper{}, - Description: "https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageScanFindings.html", - ExtraColumns: defaultRegionalColumns, - }, - } - - for _, r := range resources { - r.Service = "ecr" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ecrpublic.go b/plugins/source/aws/codegen/recipes/ecrpublic.go deleted file mode 100644 index 512be7514c3750..00000000000000 --- a/plugins/source/aws/codegen/recipes/ecrpublic.go +++ /dev/null @@ -1,55 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ecrpublic/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ECRPublicResources() []*Resource { - resources := []*Resource{ - { - SubService: "repositories", - Struct: &types.Repository{}, - Description: "https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_Repository.html", - SkipFields: []string{"RepositoryArn"}, - Multiplex: `client.ServiceAccountRegionMultiplexer("api.ecr-public")`, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RepositoryArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRepositoryTags`, - }, - }...), - Relations: []string{"RepositoryImages()"}, - }, - { - SubService: "repository_images", - Struct: &types.ImageDetail{}, - Description: "https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_ImageDetail.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveImageArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "ecrpublic" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ecs.go b/plugins/source/aws/codegen/recipes/ecs.go deleted file mode 100644 index 91fd0a86a1e279..00000000000000 --- a/plugins/source/aws/codegen/recipes/ecs.go +++ /dev/null @@ -1,130 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/ecs/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ecs/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ECSResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Cluster.html", - SkipFields: []string{"ClusterArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ClusterTasks()", - "ClusterServices()", - "ClusterContainerInstances()", - }, - }, - { - SubService: "cluster_tasks", - Struct: &types.Task{}, - Description: "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Task.html", - SkipFields: []string{"Tags", "TaskArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TaskArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - { - Name: "task_protection", - Type: schema.TypeJSON, - Resolver: `getEcsTaskProtection`, - }, - }...), - Relations: []string{}, - }, - { - SubService: "cluster_services", - Struct: &types.Service{}, - Description: "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Service.html", - SkipFields: []string{"ServiceArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ServiceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{}, - }, - { - SubService: "cluster_container_instances", - Struct: &types.ContainerInstance{}, - Description: "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerInstance.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "cluster_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - Relations: []string{}, - }, - { - SubService: "task_definitions", - Struct: &models.TaskDefinitionWrapper{}, - Description: "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskDefinition.html", - SkipFields: []string{"TaskDefinitionArn", "Tags"}, - PreResourceResolver: "getTaskDefinition", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TaskDefinitionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveEcsTaskDefinitionTags`, - }, - }...), - Relations: []string{}, - }, - } - - // set default values - for _, r := range resources { - r.Service = "ecs" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("ecs")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/efs.go b/plugins/source/aws/codegen/recipes/efs.go deleted file mode 100644 index 8f8af46dae8168..00000000000000 --- a/plugins/source/aws/codegen/recipes/efs.go +++ /dev/null @@ -1,39 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/efs/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -var efsResources = []*Resource{ - { - SubService: "filesystems", - Struct: &types.FileSystemDescription{}, - Description: "https://docs.aws.amazon.com/efs/latest/ug/API_FileSystemDescription.html", - SkipFields: []string{"FileSystemArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("FileSystemArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "backup_policy_status", - Type: schema.TypeString, - Resolver: `ResolveEfsFilesystemBackupPolicyStatus`, - }, - }...), - }, -} - -func EFSResources() []*Resource { - for _, r := range efsResources { - r.Service = "efs" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticfilesystem")` - } - return efsResources -} diff --git a/plugins/source/aws/codegen/recipes/eks.go b/plugins/source/aws/codegen/recipes/eks.go deleted file mode 100644 index da9634b22ca6e3..00000000000000 --- a/plugins/source/aws/codegen/recipes/eks.go +++ /dev/null @@ -1,35 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/eks/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func EKSResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/eks/latest/APIReference/API_Cluster.html", - SkipFields: []string{"Arn"}, - PreResourceResolver: "getEksCluster", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "eks" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("eks")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/elasticache.go b/plugins/source/aws/codegen/recipes/elasticache.go deleted file mode 100644 index 76f432fd859d86..00000000000000 --- a/plugins/source/aws/codegen/recipes/elasticache.go +++ /dev/null @@ -1,231 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/elasticache/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ElastiCacheResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.CacheCluster{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheCluster.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveClusterTags`, - }, - }...), - }, - { - SubService: "engine_versions", - Struct: &types.CacheEngineVersion{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheEngineVersion.html", - SkipFields: []string{"Engine", "EngineVersion"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Description: "The AWS Account ID of the resource.", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Description: "The AWS Region of the resource.", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Engine")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EngineVersion")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "global_replication_groups", - Struct: &types.GlobalReplicationGroup{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_GlobalReplicationGroup.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "parameter_groups", - Struct: &types.CacheParameterGroup{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheParameterGroup.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "replication_groups", - Struct: &types.ReplicationGroup{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReplicationGroup.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "reserved_cache_nodes_offerings", - Struct: &types.ReservedCacheNodesOffering{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNodesOffering.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveCacheNodesOfferingArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "reserved_cache_nodes", - Struct: &types.ReservedCacheNode{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNode.html", - SkipFields: []string{"ReservationARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ReservationARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "service_updates", - Struct: &types.ServiceUpdate{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ServiceUpdate.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveServiceUpdateArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "snapshots", - Struct: &types.Snapshot{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_Snapshot.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "user_groups", - Struct: &types.UserGroup{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_UserGroup.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "users", - Struct: &types.User{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_User.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, { - SubService: "subnet_groups", - Struct: &types.CacheSubnetGroup{}, - Description: "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheSubnetGroup.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "elasticache" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticache")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/elasticbeanstalk.go b/plugins/source/aws/codegen/recipes/elasticbeanstalk.go deleted file mode 100644 index ef8995c8ce9b94..00000000000000 --- a/plugins/source/aws/codegen/recipes/elasticbeanstalk.go +++ /dev/null @@ -1,138 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/elasticbeanstalk/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ElasticbeanstalkResources() []*Resource { - resources := []*Resource{ - { - SubService: "application_versions", - Struct: &types.ApplicationVersionDescription{}, - Description: "https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationVersionDescription.html", - SkipFields: []string{"ApplicationVersionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ApplicationVersionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "applications", - Struct: &types.ApplicationDescription{}, - Description: "https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationDescription.html", - SkipFields: []string{"ApplicationArn", "DateCreated"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ApplicationArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "date_created", - Type: schema.TypeTimestamp, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "environments", - Struct: &types.EnvironmentDescription{}, - Description: "https://docs.aws.amazon.com/elasticbeanstalk/latest/APIReference/API_EnvironmentDescription.html", - SkipFields: []string{"EnvironmentId", "EnvironmentArn"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EnvironmentArn")`, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveElasticbeanstalkEnvironmentTags`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EnvironmentId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "listeners", - Type: schema.TypeJSON, - Resolver: `resolveElasticbeanstalkEnvironmentListeners`, - }, - }, - Relations: []string{ - "ConfigurationSettings()", - "ConfigurationOptions()", - }, - }, - { - SubService: "configuration_settings", - Struct: &models.ConfigurationSettingsDescriptionWrapper{}, - Description: "https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationSettingsDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "environment_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - { - SubService: "configuration_options", - Struct: &models.ConfigurationOptionDescriptionWrapper{}, - Description: "https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationOptionDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "environment_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "elasticbeanstalk" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticbeanstalk")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/elasticsearch.go b/plugins/source/aws/codegen/recipes/elasticsearch.go deleted file mode 100644 index a590083ca90581..00000000000000 --- a/plugins/source/aws/codegen/recipes/elasticsearch.go +++ /dev/null @@ -1,73 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ElasticsearchResources() []*Resource { - resources := []*Resource{ - { - SubService: "domains", - Struct: new(types.ElasticsearchDomainStatus), - Description: "https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_DomainStatus.html", - PreResourceResolver: "getDomain", - PKColumns: []string{"arn"}, - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "authorized_principals", - Type: schema.TypeJSON, - Resolver: `resolveAuthorizedPrincipals`, - }, - codegen.ColumnDefinition{ - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveDomainTags`, - }, - ), - }, - { - SubService: "packages", - Struct: new(types.PackageDetails), - Description: "https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_PackageDetails.html", - NameTransformer: CreateReplaceTransformer(map[string]string{"package_id": "id"}), - PKColumns: []string{"id"}, - ExtraColumns: defaultRegionalColumnsPK, - }, - { - SubService: "versions", - Struct: new(struct{}), - Description: "https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_ListVersions.html", - PKColumns: []string{"version"}, - ExtraColumns: append(defaultRegionalColumnsPK, - codegen.ColumnDefinition{ - Name: "version", - Type: schema.TypeString, - Resolver: `resolveVersion`, - }, - codegen.ColumnDefinition{ - Name: "instance_types", - Type: schema.TypeJSON, - Resolver: `resolveInstanceTypes`, - }, - ), - }, - { - SubService: "vpc_endpoints", - Struct: new(types.VpcEndpoint), - Description: "https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_VpcEndpoint.html", - NameTransformer: CreateReplaceTransformer(map[string]string{"vpc_endpoint_id": "id"}), - PKColumns: []string{"id"}, - ExtraColumns: defaultRegionalColumns, - }, - } - - // set default values - for _, r := range resources { - r.Service = "elasticsearch" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("es")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/elastictranscoder.go b/plugins/source/aws/codegen/recipes/elastictranscoder.go deleted file mode 100644 index 6ac3accf43785b..00000000000000 --- a/plugins/source/aws/codegen/recipes/elastictranscoder.go +++ /dev/null @@ -1,38 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" -) - -func ElastictranscoderResources() []*Resource { - return []*Resource{ - { - Service: "elastictranscoder", - SubService: "pipeline_jobs", - Struct: new(types.Job), - Description: "https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-jobs-by-pipeline.html", - Multiplex: "", // relation for pipelines - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - }, - { - Service: "elastictranscoder", - SubService: "pipelines", - Struct: new(types.Pipeline), - Description: "https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-pipelines.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("elastictranscoder")`, - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - Relations: []string{"PipelineJobs()"}, - }, - { - Service: "elastictranscoder", - SubService: "presets", - Struct: new(types.Preset), - Description: "https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-presets.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("elastictranscoder")`, - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - }, - } -} diff --git a/plugins/source/aws/codegen/recipes/elbv1.go b/plugins/source/aws/codegen/recipes/elbv1.go deleted file mode 100644 index f8056b0540efce..00000000000000 --- a/plugins/source/aws/codegen/recipes/elbv1.go +++ /dev/null @@ -1,72 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/elbv1/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ELBv1Resources() []*Resource { - resources := []*Resource{ - { - SubService: "load_balancers", - Struct: &models.ELBv1LoadBalancerWrapper{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_LoadBalancerDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveLoadBalancerARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }..., - ), - Relations: []string{ - "LoadBalancerPolicies()", - }, - }, - { - SubService: "load_balancer_policies", - Struct: &types.PolicyDescription{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_PolicyDescription.html", - SkipFields: []string{"PolicyAttributeDescriptions"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "load_balancer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "load_balancer_name", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("load_balancer_name")`, - }, - { - Name: "policy_attribute_descriptions", - Type: schema.TypeJSON, - Resolver: `resolveElbv1loadBalancerPolicyAttributeDescriptions`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "elbv1" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticloadbalancing")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/elbv2.go b/plugins/source/aws/codegen/recipes/elbv2.go deleted file mode 100644 index 42fa719c0a28f7..00000000000000 --- a/plugins/source/aws/codegen/recipes/elbv2.go +++ /dev/null @@ -1,150 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ELBv2Resources() []*Resource { - resources := []*Resource{ - { - SubService: "load_balancers", - Struct: &types.LoadBalancer{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancer.html", - SkipFields: []string{"LoadBalancerArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "web_acl_arn", - Type: schema.TypeString, - Resolver: `resolveElbv2loadBalancerWebACLArn`, - IgnoreInTests: true, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveElbv2loadBalancerTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("LoadBalancerArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "Listeners()", - "LoadBalancerAttributes()", - }, - }, - { - SubService: "listeners", - Struct: &types.Listener{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Listener.html", - SkipFields: []string{"ListenerArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ListenerArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveElbv2listenerTags`, - }, - }...), - Relations: []string{ - "ListenerCertificates()", - }, - }, - { - SubService: "listener_certificates", - Struct: &types.Certificate{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Certificate.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "listener_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "load_balancer_attributes", - Struct: &types.LoadBalancerAttribute{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancerAttribute.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "load_balancer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "target_groups", - Struct: &types.TargetGroup{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetGroup.html", - SkipFields: []string{"TargetGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveElbv2targetGroupTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TargetGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "TargetGroupTargetHealthDescriptions()", - }, - }, - { - SubService: "target_group_target_health_descriptions", - Struct: &types.TargetHealthDescription{}, - Description: "https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetHealthDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "target_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "elbv2" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticloadbalancing")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/emr.go b/plugins/source/aws/codegen/recipes/emr.go deleted file mode 100644 index db01827ff31184..00000000000000 --- a/plugins/source/aws/codegen/recipes/emr.go +++ /dev/null @@ -1,56 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/emr" - "github.com/aws/aws-sdk-go-v2/service/emr/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func EMRResources() []*Resource { - resources := []*Resource{ - { - SubService: "block_public_access_configs", - Struct: &emr.GetBlockPublicAccessConfigurationOutput{}, - SkipFields: []string{"_"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/emr/latest/APIReference/API_Cluster.html", - SkipFields: []string{"ClusterArn"}, - PreResourceResolver: "getCluster", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "emr" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("elasticmapreduce")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/eventbridge.go b/plugins/source/aws/codegen/recipes/eventbridge.go deleted file mode 100644 index 5cc17629b67490..00000000000000 --- a/plugins/source/aws/codegen/recipes/eventbridge.go +++ /dev/null @@ -1,167 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/eventbridge" - "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func EventbridgeResources() []*Resource { - regionalResources := []*Resource{ - { - SubService: "event_buses", - Struct: &types.EventBus{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventBus.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveEventbridgeEventBusTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "EventBusRules()", - }, - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "event_bus_rules", - Struct: &types.Rule{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Rule.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "event_bus_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveEventbridgeEventBusRuleTags`, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "api_destinations", - Struct: &types.ApiDestination{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_ApiDestination.html", - SkipFields: []string{"ApiDestinationArn"}, - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("ApiDestinationArn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "archives", - Struct: &types.Archive{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Archive.html", - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `resolveArchiveArn`, - }}...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "connections", - Struct: &types.Connection{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Connection.html", - SkipFields: []string{"ConnectionArn"}, - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("ConnectionArn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "event_sources", - Struct: &types.EventSource{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventSource.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("Arn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - { - SubService: "replays", - Struct: &types.Replay{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Replay.html", - ExtraColumns: append(defaultRegionalColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `resolveReplayArn`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - } - - globalResources := []*Resource{ - { - SubService: "endpoints", - Struct: &types.Endpoint{}, - Description: "https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Endpoint.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append(defaultAccountColumns, []codegen.ColumnDefinition{{ - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("Arn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - }, - } - - // set default values - for _, r := range regionalResources { - r.Service = "eventbridge" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("events")` - - // Parameters for autogenerating the resolver and mock-test. - /// Only used when `ShouldGenerateResolverAndMockTest = true` - r.ResolverAndMockTestTemplate = "list_resources_1" - r.Client = &eventbridge.Client{} - } - - for _, r := range globalResources { - r.Service = "eventbridge" - r.Multiplex = `client.AccountMultiplex` - - // Parameters for autogenerating the resolver and mock-test. - /// Only used when `ShouldGenerateResolverAndMockTest = true` - r.ResolverAndMockTestTemplate = "list_resources_1" - r.Client = &eventbridge.Client{} - } - - resources := append(regionalResources, globalResources...) - - return resources -} diff --git a/plugins/source/aws/codegen/recipes/firehose.go b/plugins/source/aws/codegen/recipes/firehose.go deleted file mode 100644 index 6c04bcae9aeb66..00000000000000 --- a/plugins/source/aws/codegen/recipes/firehose.go +++ /dev/null @@ -1,41 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/firehose/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func FirehoseResources() []*Resource { - resources := []*Resource{ - { - SubService: "delivery_streams", - Struct: &types.DeliveryStreamDescription{}, - Description: "https://docs.aws.amazon.com/firehose/latest/APIReference/API_DeliveryStreamDescription.html", - SkipFields: []string{"DeliveryStreamARN"}, - PreResourceResolver: "getDeliveryStream", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveFirehoseDeliveryStreamTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DeliveryStreamARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "firehose" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("firehose")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/frauddetector.go b/plugins/source/aws/codegen/recipes/frauddetector.go deleted file mode 100644 index 7ddb8b3d766b0a..00000000000000 --- a/plugins/source/aws/codegen/recipes/frauddetector.go +++ /dev/null @@ -1,138 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func FraudDetectorResources() []*Resource { - const arnField = "Arn" - skipFields := []string{arnField} - extraColumns := append(defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("` + arnField + `")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ) - tagsCol := codegen.ColumnDefinition{ - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveResourceTags`, - } - - return []*Resource{ - { - Service: "frauddetector", - SubService: "batch_imports", - Struct: new(types.BatchImport), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchImport.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "batch_predictions", - Struct: new(types.BatchPrediction), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchPrediction.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "detectors", - Struct: new(types.Detector), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_Detector.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - Relations: []string{"Rules()"}, - }, - { - Service: "frauddetector", - SubService: "entity_types", - Struct: new(types.EntityType), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_EntityType.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "event_types", - Struct: new(types.EventType), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_EventType.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "external_models", - Struct: new(types.ExternalModel), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_ExternalModel.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "labels", - Struct: new(types.Label), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_Label.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "models", - Struct: new(types.Model), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_Model.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - Relations: []string{"ModelVersions()"}, - }, - { - Service: "frauddetector", - SubService: "model_versions", // relation for models - Struct: new(types.ModelVersionDetail), - Multiplex: "", // we skip multiplexing here as it's a relation - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_ModelVersionDetail.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "outcomes", - Struct: new(types.Outcome), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_Outcome.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "rules", // relation for detectors - Struct: new(types.RuleDetail), - Multiplex: "", // we skip multiplexing here as it's a relation - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_RuleDetail.html", - ExtraColumns: extraColumns, - SkipFields: skipFields, - }, - { - Service: "frauddetector", - SubService: "variables", - Struct: new(types.Variable), - Multiplex: `client.ServiceAccountRegionMultiplexer("frauddetector")`, - Description: "https://docs.aws.amazon.com/frauddetector/latest/api/API_Variable.html", - ExtraColumns: append(extraColumns, tagsCol), - SkipFields: skipFields, - }, - } -} diff --git a/plugins/source/aws/codegen/recipes/fsx.go b/plugins/source/aws/codegen/recipes/fsx.go deleted file mode 100644 index d60044c5cad97b..00000000000000 --- a/plugins/source/aws/codegen/recipes/fsx.go +++ /dev/null @@ -1,185 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/fsx/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func FSXResources() []*Resource { - resources := []*Resource{ - { - SubService: "backups", - Struct: &types.Backup{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_Backup.html", - SkipFields: []string{"BackupId"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BackupId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "data_repository_associations", - Struct: &types.DataRepositoryAssociation{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryAssociation.html", - SkipFields: []string{"ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "data_repository_tasks", - Struct: &types.DataRepositoryTask{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryTask.html", - SkipFields: []string{"ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "file_caches", - Struct: &types.FileCache{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileCache.html", - SkipFields: []string{"ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveFileCacheTags`, - }, - }...), - }, - { - SubService: "file_systems", - Struct: &types.FileSystem{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileSystem.html", - SkipFields: []string{"AdministrativeActions", "ResourceARN", "Tags"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - { - Name: "administrative_actions", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("AdministrativeActions")`, - IgnoreInTests: true, - }, - }...), - }, - { - SubService: "snapshots", - Struct: &types.Snapshot{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_Snapshot.html", - SkipFields: []string{"AdministrativeActions", "ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "administrative_actions", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("AdministrativeActions")`, - IgnoreInTests: true, - }, - }...), - }, - { - SubService: "storage_virtual_machines", - Struct: &types.StorageVirtualMachine{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_StorageVirtualMachine.html", - SkipFields: []string{"ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "volumes", - Struct: &types.Volume{}, - Description: "https://docs.aws.amazon.com/fsx/latest/APIReference/API_Volume.html", - SkipFields: []string{"AdministrativeActions", "ResourceARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ResourceARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "administrative_actions", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("AdministrativeActions")`, - IgnoreInTests: true, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "fsx" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("fsx")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/glacier.go b/plugins/source/aws/codegen/recipes/glacier.go deleted file mode 100644 index 68bd234b50c093..00000000000000 --- a/plugins/source/aws/codegen/recipes/glacier.go +++ /dev/null @@ -1,103 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/glacier/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func GlacierResources() []*Resource { - resources := []*Resource{ - { - SubService: "vaults", - Struct: &types.DescribeVaultOutput{}, - SkipFields: []string{"VaultARN"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlacierVaultTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("VaultARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "VaultAccessPolicies()", - "VaultLockPolicies()", - "VaultNotifications()", - }, - }, - { - SubService: "vault_access_policies", - Struct: &types.VaultAccessPolicy{}, - SkipFields: []string{"Policy"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "vault_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("Policy")`, - }, - }...), - }, - { - SubService: "vault_lock_policies", - Struct: &types.VaultLockPolicy{}, - SkipFields: []string{"Policy"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "vault_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("Policy")`, - }, - }...), - }, - { - SubService: "vault_notifications", - Struct: &types.VaultNotificationConfig{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "vault_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "data_retrieval_policies", - Struct: &types.DataRetrievalPolicy{}, - ExtraColumns: defaultRegionalColumnsPK, - }, - } - - // set default values - for _, r := range resources { - r.Service = "glacier" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("glacier")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/glue.go b/plugins/source/aws/codegen/recipes/glue.go deleted file mode 100644 index 0fd8be96fa2500..00000000000000 --- a/plugins/source/aws/codegen/recipes/glue.go +++ /dev/null @@ -1,403 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/glue" - "github.com/aws/aws-sdk-go-v2/service/glue/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func GlueResources() []*Resource { - resources := []*Resource{ - { - SubService: "classifiers", - Struct: &types.Classifier{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: `resolveGlueClassifierName`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "connections", - Struct: &types.Connection{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueConnectionArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "crawlers", - Struct: &types.Crawler{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueCrawlerArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueCrawlerTags`, - }, - }...), - }, - { - SubService: "databases", - Struct: &types.Database{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueDatabaseArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueDatabaseTags`, - }, - }...), - Relations: []string{ - "DatabaseTables()", - }, - }, - { - SubService: "database_tables", - Struct: &types.Table{}, - SkipFields: []string{"Name"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "database_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "DatabaseTableIndexes()", - }, - }, - { - SubService: "database_table_indexes", - Struct: &types.PartitionIndexDescriptor{}, - SkipFields: []string{"IndexName"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "database_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("database_arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "database_table_name", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "index_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("IndexName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "datacatalog_encryption_settings", - Struct: &types.DataCatalogEncryptionSettings{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - }, - }, - { - SubService: "dev_endpoints", - Struct: &types.DevEndpoint{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueDevEndpointArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueDevEndpointTags`, - }, - }...), - }, - { - SubService: "jobs", - Struct: &types.Job{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueJobArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueJobTags`, - }, - }...), - Relations: []string{ - "JobRuns()", - }, - }, - { - SubService: "job_runs", - Struct: &types.JobRun{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "job_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "ml_transforms", - Struct: &types.MLTransform{}, - SkipFields: []string{"Schema"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueMlTransformArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueMlTransformTags`, - }, - { - Name: "schema", - Type: schema.TypeJSON, - Resolver: `resolveMlTransformsSchema`, - }, - }...), - Relations: []string{ - "MlTransformTaskRuns()", - }, - }, - { - SubService: "ml_transform_task_runs", - Struct: &types.TaskRun{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "ml_transform_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "registries", - Struct: &types.RegistryListItem{}, - SkipFields: []string{"RegistryArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueRegistryTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RegistryArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "RegistrySchemas()", - }, - }, - { - SubService: "registry_schemas", - Struct: &glue.GetSchemaOutput{}, - SkipFields: []string{"SchemaArn"}, - PreResourceResolver: "getRegistrySchema", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SchemaArn")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueRegistrySchemaTags`, - }, - }...), - Relations: []string{ - "RegistrySchemaVersions()", - }, - }, - { - SubService: "registry_schema_versions", - Struct: &glue.GetSchemaVersionOutput{}, - SkipFields: []string{}, - PreResourceResolver: "getRegistrySchemaVersion", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "registry_schema_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "metadata", - Type: schema.TypeJSON, - Resolver: `resolveGlueRegistrySchemaVersionMetadata`, - }, - }...), - }, - { - SubService: "security_configurations", - Struct: &types.SecurityConfiguration{}, - SkipFields: []string{"Name"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "name", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "triggers", - Struct: &types.Trigger{}, - SkipFields: []string{}, - PreResourceResolver: "getTrigger", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueTriggerArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueTriggerTags`, - }, - }...), - }, - { - SubService: "workflows", - Struct: &types.Workflow{}, - SkipFields: []string{}, - PreResourceResolver: "getWorkflow", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGlueWorkflowArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveGlueWorkflowTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "glue" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("glue")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/guardduty.go b/plugins/source/aws/codegen/recipes/guardduty.go deleted file mode 100644 index ddf9d5f23581ba..00000000000000 --- a/plugins/source/aws/codegen/recipes/guardduty.go +++ /dev/null @@ -1,79 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/guardduty/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/guardduty/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func GuarddutyResources() []*Resource { - resources := []*Resource{ - { - SubService: "detectors", - Struct: &models.DetectorWrapper{}, - Description: "https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetDetector.html", - SkipFields: []string{"Id"}, - PreResourceResolver: "getDetector", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveGuarddutyARN()`, - }, - { - Name: "id", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - Relations: []string{ - "DetectorMembers()", - }, - }, - { - SubService: "detector_members", - Struct: &types.Member{}, - Description: "https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Member.html", - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "region", - Type: schema.TypeString, - Resolver: `client.ResolveAWSRegion`, - }, - { - Name: "detector_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }, - }, - } - - // set default values - for _, r := range resources { - r.Service = "guardduty" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("guardduty")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/iam.go b/plugins/source/aws/codegen/recipes/iam.go deleted file mode 100644 index 72591b4100935b..00000000000000 --- a/plugins/source/aws/codegen/recipes/iam.go +++ /dev/null @@ -1,490 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/iam" - "github.com/aws/aws-sdk-go-v2/service/iam/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func IAMResources() []*Resource { - resources := []*Resource{ - { - SubService: "accounts", - Struct: &models.Account{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "credential_reports", - Struct: &models.CredentialReportEntry{}, - SkipFields: []string{ - "Arn", - "UserCreationTime", - "PasswordLastChanged", - "PasswordNextRotation", - "AccessKey1LastRotated", - "AccessKey2LastRotated", - "Cert1LastRotated", - "Cert2LastRotated", - "AccessKey1LastUsedDate", - "AccessKey2LastUsedDate", - "PasswordLastUsed", - }, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "user_creation_time", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("UserCreationTime")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "password_last_changed", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("PasswordLastChanged")`, - }, - { - Name: "password_next_rotation", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("PasswordNextRotation")`, - }, - { - Name: "access_key_1_last_rotated", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("AccessKey1LastRotated")`, - }, - { - Name: "access_key_2_last_rotated", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("AccessKey2LastRotated")`, - }, - { - Name: "cert_1_last_rotated", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("Cert1LastRotated")`, - }, - { - Name: "cert_2_last_rotated", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("Cert2LastRotated")`, - }, - { - Name: "access_key_1_last_used_date", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("AccessKey1LastUsedDate")`, - }, - { - Name: "access_key_2_last_used_date", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("AccessKey2LastUsedDate")`, - }, - { - Name: "password_last_used", - Type: schema.TypeTimestamp, - Resolver: `timestampPathResolver("PasswordLastUsed")`, - }, - // password_enabled is an alias for the (now deprecated) password_status - https://github.com/cloudquery/cloudquery/issues/3145 - { - Name: "password_enabled", - Type: schema.TypeString, - Resolver: `schema.PathResolver("PasswordStatus")`, - }, - }, - Relations: []string{}, - }, - { - SubService: "groups", - Struct: &types.Group{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html", - SkipFields: []string{"GroupId"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: `resolveIamGroupPolicies`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GroupId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - Relations: []string{"GroupPolicies()"}, - }, - { - SubService: "group_policies", - Struct: &iam.GetGroupPolicyOutput{}, - SkipFields: []string{"PolicyDocument"}, - PreResourceResolver: "getGroupPolicy", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "group_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "policy_document", - Type: schema.TypeJSON, - Resolver: `resolveIamGroupPolicyPolicyDocument`, - }, - }...), - }, - { - SubService: "openid_connect_identity_providers", - Struct: &models.IamOpenIdIdentityProviderWrapper{}, - SkipFields: []string{"Arn"}, - PreResourceResolver: "getOpenIdConnectIdentityProvider", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "password_policies", - Struct: &models.PasswordPolicyWrapper{}, - SkipFields: []string{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "policies", - Struct: &types.ManagedPolicyDetail{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_ManagedPolicyDetail.html", - SkipFields: []string{"PolicyId", "Tags", "PolicyVersionList"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("PolicyId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveIamPolicyTags`, - }, - { - Name: "policy_version_list", - Type: schema.TypeJSON, - Resolver: `resolveIamPolicyVersionList`, - }, - }, - }, - { - SubService: "roles", - Struct: &types.Role{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_Role.html", - SkipFields: []string{"RoleId", "AssumeRolePolicyDocument"}, - PreResourceResolver: "getRole", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: `resolveIamRolePolicies`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RoleId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "assume_role_policy_document", - Type: schema.TypeJSON, - Resolver: `resolveRolesAssumeRolePolicyDocument`, - }, - }, - Relations: []string{ - "RolePolicies()", - }, - }, - { - SubService: "role_policies", - Struct: &iam.GetRolePolicyOutput{}, - SkipFields: []string{"PolicyDocument"}, - PreResourceResolver: "getRolePolicy", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "policy_document", - Type: schema.TypeJSON, - Resolver: `resolveRolePoliciesPolicyDocument`, - }, - }...), - }, - { - SubService: "saml_identity_providers", - Struct: &types.SAMLProviderListEntry{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_SAMLProviderListEntry.html", - SkipFields: []string{"Arn"}, - PreResourceResolver: "getSamlIdentityProvider", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "server_certificates", - Struct: &types.ServerCertificateMetadata{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServerCertificateMetadata.html", - SkipFields: []string{"ServerCertificateId"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ServerCertificateId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "users", - Struct: &types.User{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_User.html", - SkipFields: []string{"Arn", "AccountId", "UserId"}, - PreResourceResolver: "getUser", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("UserId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - Relations: []string{ - "UserAccessKeys()", - "UserGroups()", - "UserAttachedPolicies()", - "UserPolicies()", - "SshPublicKeys()", - }, - }, - { - SubService: "user_access_keys", - Struct: &models.AccessKeyWrapper{}, - SkipFields: []string{}, - PostResourceResolver: `postIamUserAccessKeyResolver`, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "last_used", - Type: schema.TypeTimestamp, - }, - { - Name: "last_used_service_name", - Type: schema.TypeString, - }, - }...), - }, - { - SubService: "user_groups", - Struct: &types.Group{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - { - SubService: "user_attached_policies", - Struct: &types.AttachedPolicy{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }...), - }, - { - SubService: "user_policies", - Struct: &iam.GetUserPolicyOutput{}, - SkipFields: []string{"PolicyDocument"}, - PreResourceResolver: "getUserPolicy", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "policy_document", - Type: schema.TypeJSON, - Resolver: `resolveIamUserPolicyPolicyDocument`, - }, - }...), - }, - { - SubService: "virtual_mfa_devices", - Struct: &types.VirtualMFADevice{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_VirtualMFADevice.html", - SkipFields: []string{"SerialNumber"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "serial_number", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "ssh_public_keys", - Struct: &types.SSHPublicKeyMetadata{}, - Description: "https://docs.aws.amazon.com/IAM/latest/APIReference/API_SSHPublicKeyMetadata.html", - SkipFields: []string{"SSHPublicKeyId"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - { - Name: "ssh_public_key_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SSHPublicKeyId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "iam" - r.Multiplex = `client.AccountMultiplex` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/identitystore.go b/plugins/source/aws/codegen/recipes/identitystore.go deleted file mode 100644 index c1dba2acbcb860..00000000000000 --- a/plugins/source/aws/codegen/recipes/identitystore.go +++ /dev/null @@ -1,30 +0,0 @@ -package recipes - -import ( - types "github.com/aws/aws-sdk-go-v2/service/identitystore/types" -) - -func IdentitystoreResources() []*Resource { - resources := []*Resource{ - { - SubService: "groups", - Struct: &types.Group{}, - Relations: []string{"GroupMemberships()"}, - }, - { - SubService: "users", - Struct: &types.User{}, - }, - { - SubService: "group_memberships", - Struct: &types.GroupMembership{}, - }, - } - - // set default values - for _, r := range resources { - r.Service = "identitystore" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("identitystore")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/inspector.go b/plugins/source/aws/codegen/recipes/inspector.go deleted file mode 100644 index 7905758422a283..00000000000000 --- a/plugins/source/aws/codegen/recipes/inspector.go +++ /dev/null @@ -1,44 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/inspector/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func InspectorResources() []*Resource { - resources := []*Resource{ - { - SubService: "findings", - Struct: &types.Finding{}, - Description: "https://docs.aws.amazon.com/inspector/v1/APIReference/API_Finding.html", - SkipFields: []string{"Arn", "Attributes", "UserAttributes"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: `client.ResolveTagField("Attributes")`, - }, - { - Name: "user_attributes", - Type: schema.TypeJSON, - Resolver: `client.ResolveTagField("UserAttributes")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "inspector" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("inspector")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/inspector2.go b/plugins/source/aws/codegen/recipes/inspector2.go deleted file mode 100644 index ab3e5635ccacf7..00000000000000 --- a/plugins/source/aws/codegen/recipes/inspector2.go +++ /dev/null @@ -1,35 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/inspector2/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func Inspector2Resources() []*Resource { - resources := []*Resource{ - { - SubService: "findings", - Struct: &types.Finding{}, - Description: "https://docs.aws.amazon.com/inspector/v2/APIReference/API_Finding.html", - SkipFields: []string{"FindingArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("FindingArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "inspector2" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("inspector2")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/iot.go b/plugins/source/aws/codegen/recipes/iot.go deleted file mode 100644 index 253fa2263f24c9..00000000000000 --- a/plugins/source/aws/codegen/recipes/iot.go +++ /dev/null @@ -1,264 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/iot" - "github.com/aws/aws-sdk-go-v2/service/iot/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func IOTResources() []*Resource { - resources := []*Resource{ - { - SubService: "billing_groups", - Struct: &iot.DescribeBillingGroupOutput{}, - SkipFields: []string{"BillingGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "things_in_group", - Type: schema.TypeStringArray, - Resolver: `resolveIotBillingGroupThingsInGroup`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveIotBillingGroupTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BillingGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "ca_certificates", - Struct: &types.CACertificateDescription{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_CACertificateDescription.html", - SkipFields: []string{"CertificateArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "certificates", - Type: schema.TypeStringArray, - Resolver: `ResolveIotCaCertificateCertificates`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CertificateArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "certificates", - Struct: &types.CertificateDescription{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_CertificateDescription.html", - SkipFields: []string{"CertificateArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "policies", - Type: schema.TypeStringArray, - Resolver: `ResolveIotCertificatePolicies`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CertificateArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "jobs", - Struct: &types.Job{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_Job.html", - SkipFields: []string{"JobArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotJobTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("JobArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "policies", - Struct: &types.Policy{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_Policy.html", - SkipFields: []string{"PolicyArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotPolicyTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("PolicyArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "security_profiles", - Struct: &iot.DescribeSecurityProfileOutput{}, - SkipFields: []string{"SecurityProfileArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "targets", - Type: schema.TypeStringArray, - Resolver: `ResolveIotSecurityProfileTargets`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotSecurityProfileTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SecurityProfileArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "streams", - Struct: &types.StreamInfo{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_StreamInfo.html", - SkipFields: []string{"StreamArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StreamArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "thing_groups", - Struct: &iot.DescribeThingGroupOutput{}, - SkipFields: []string{"ThingGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "things_in_group", - Type: schema.TypeStringArray, - Resolver: `ResolveIotThingGroupThingsInGroup`, - }, - { - Name: "policies", - Type: schema.TypeStringArray, - Resolver: `ResolveIotThingGroupPolicies`, - IgnoreInTests: true, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotThingGroupTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ThingGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "thing_types", - Struct: &types.ThingTypeDefinition{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_ThingTypeDefinition.html", - SkipFields: []string{"ThingTypeArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotThingTypeTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ThingTypeArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "things", - Struct: &types.ThingAttribute{}, - Description: "https://docs.aws.amazon.com/iot/latest/apireference/API_ThingAttribute.html", - SkipFields: []string{"ThingArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "principals", - Type: schema.TypeStringArray, - Resolver: `ResolveIotThingPrincipals`, - IgnoreInTests: true, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ThingArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "topic_rules", - Struct: &iot.GetTopicRuleOutput{}, - SkipFields: []string{"RuleArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `ResolveIotTopicRuleTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("RuleArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "iot" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("iot")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/kafka.go b/plugins/source/aws/codegen/recipes/kafka.go deleted file mode 100644 index 4723186922e28f..00000000000000 --- a/plugins/source/aws/codegen/recipes/kafka.go +++ /dev/null @@ -1,105 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/kafka" - "github.com/aws/aws-sdk-go-v2/service/kafka/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func KafkaResources() []*Resource { - resources := []*Resource{ - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/MSK/2.0/APIReference/v2-clusters-clusterarn.html#v2-clusters-clusterarn-properties", - SkipFields: []string{"ClusterArn"}, - PreResourceResolver: "getCluster", - ExtraColumns: append(defaultAccountColumns, []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("ClusterArn")`, - }, - }...), - Relations: []string{ - "Nodes()", - "ClusterOperations()", - }, - ShouldGenerateResolverAndMockTest: true, - ResolverAndMockTestTemplate: "list_and_describe_resources_1", - CustomDescribeInput: `describeClustersInput(resource)`, - }, - { - SubService: "nodes", - Struct: &types.NodeInfo{}, - Description: "https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-nodes.html#ListNodes", - SkipFields: []string{"NodeARN"}, - ExtraColumns: append(defaultAccountColumns, []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("NodeARN")`, - }, - { - Name: "cluster_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "cluster_operations", - Struct: &types.ClusterOperationInfo{}, - Description: "https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-operations.html", - SkipFields: []string{"OperationArn", "ClusterArn"}, - ExtraColumns: append(defaultAccountColumns, []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("OperationArn")`, - }, - { - Name: "cluster_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveKafkaTags("OperationArn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: false, - }, - { - SubService: "configurations", - Struct: &types.Configuration{}, - Description: "https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-configuration.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append(defaultAccountColumns, []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("Arn")`, - }, - }...), - ShouldGenerateResolverAndMockTest: true, - ResolverAndMockTestTemplate: "list_resources_1", - }, - } - - // set default values - for _, r := range resources { - r.Service = "kafka" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("kafka")` - r.Client = &kafka.Client{} - } - - return resources -} diff --git a/plugins/source/aws/codegen/recipes/kinesis.go b/plugins/source/aws/codegen/recipes/kinesis.go deleted file mode 100644 index 59240fa3b2e6ef..00000000000000 --- a/plugins/source/aws/codegen/recipes/kinesis.go +++ /dev/null @@ -1,41 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/kinesis/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func KinesisResources() []*Resource { - resources := []*Resource{ - { - SubService: "streams", - Struct: &types.StreamDescriptionSummary{}, - Description: "https://docs.aws.amazon.com/kinesis/latest/APIReference/API_StreamDescriptionSummary.html", - SkipFields: []string{"StreamARN"}, - PreResourceResolver: "getStream", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StreamARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveKinesisStreamTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "kinesis" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("kinesis")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/kms.go b/plugins/source/aws/codegen/recipes/kms.go deleted file mode 100644 index 32d0575d2abb5d..00000000000000 --- a/plugins/source/aws/codegen/recipes/kms.go +++ /dev/null @@ -1,88 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func KMSResources() []*Resource { - resources := []*Resource{ - { - SubService: "aliases", - Struct: &types.AliasListEntry{}, - Description: "https://docs.aws.amazon.com/kms/latest/APIReference/API_AliasListEntry.html", - SkipFields: []string{"AliasArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("AliasArn")`, - }, - }...), - }, { - SubService: "keys", - Struct: &types.KeyMetadata{}, - Description: "https://docs.aws.amazon.com/kms/latest/APIReference/API_KeyMetadata.html", - PreResourceResolver: "getKey", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "rotation_enabled", - Type: schema.TypeBool, - Resolver: `resolveKeysRotationEnabled`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveKeysTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "replica_keys", - Type: schema.TypeJSON, - Resolver: `resolveKeysReplicaKeys`, - IgnoreInTests: true, - }, - }...), - Relations: []string{"KeyGrants()"}, - }, { - SubService: "key_grants", - Struct: &types.GrantListEntry{}, - Description: "https://docs.aws.amazon.com/kms/latest/APIReference/API_GrantListEntry.html", - SkipFields: []string{"GrantId"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "key_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "grant_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GrantId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "kms" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("kms")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/lambda.go b/plugins/source/aws/codegen/recipes/lambda.go deleted file mode 100644 index cf6225bbdb935f..00000000000000 --- a/plugins/source/aws/codegen/recipes/lambda.go +++ /dev/null @@ -1,224 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/lambda" - "github.com/aws/aws-sdk-go-v2/service/lambda/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lambda/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func LambdaResources() []*Resource { - resources := []*Resource{ - { - SubService: "functions", - Struct: &lambda.GetFunctionOutput{}, - SkipFields: []string{}, - PreResourceResolver: "getFunction", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Configuration.FunctionArn")`, - }, - { - Name: "policy_revision_id", - Type: schema.TypeString, - }, - { - Name: "policy_document", - Type: schema.TypeJSON, - }, - { - Name: "code_signing_config", - Type: schema.TypeJSON, - }, - { - Name: "code_repository_type", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Code.RepositoryType")`, - }, - }...), - PostResourceResolver: `resolvePolicyCodeSigningConfig`, - Relations: []string{ - "FunctionEventInvokeConfigs()", - "FunctionAliases()", - "FunctionVersions()", - "FunctionConcurrencyConfigs()", - "FunctionEventSourceMappings()", - }, - }, - { - SubService: "function_event_invoke_configs", - Struct: &types.FunctionEventInvokeConfig{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionEventInvokeConfig.html", - SkipFields: []string{"FunctionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "function_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "function_aliases", - Struct: &models.AliasWrapper{}, - SkipFields: []string{"AliasArn"}, - PreResourceResolver: "getFunctionAliasURLConfig", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "function_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AliasArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "function_versions", - Struct: &types.FunctionConfiguration{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionConfiguration.html", - SkipFields: []string{"FunctionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "function_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "function_concurrency_configs", - Struct: &types.ProvisionedConcurrencyConfigListItem{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_ProvisionedConcurrencyConfigListItem.html", - SkipFields: []string{"FunctionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "function_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "function_event_source_mappings", - Struct: &types.EventSourceMappingConfiguration{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_EventSourceMappingConfiguration.html", - SkipFields: []string{"FunctionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "function_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "layers", - Struct: &types.LayersListItem{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_LayersListItem.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("LayerArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "LayerVersions()", - }, - }, - { - SubService: "layer_versions", - Struct: &types.LayerVersionsListItem{}, - Description: "https://docs.aws.amazon.com/lambda/latest/dg/API_LayerVersionsListItem.html", - SkipFields: []string{"LayerVersionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("LayerVersionArn")`, - }, - { - Name: "layer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - Relations: []string{ - "LayerVersionPolicies()", - }, - }, - { - SubService: "layer_version_policies", - Struct: &lambda.GetLayerVersionPolicyOutput{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "layer_version_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "layer_version", - Type: schema.TypeInt, - Resolver: `schema.ParentColumnResolver("version")`, - }, - }...), - }, - { - SubService: "runtimes", - Struct: &models.RuntimeWrapper{}, - SkipFields: []string{"Name"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "name", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "lambda" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("lambda")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/lightsail.go b/plugins/source/aws/codegen/recipes/lightsail.go deleted file mode 100644 index b1f18286f3dd75..00000000000000 --- a/plugins/source/aws/codegen/recipes/lightsail.go +++ /dev/null @@ -1,351 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/lightsail/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lightsail/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func LightsailResources() []*Resource { - resources := []*Resource{ - { - SubService: "alarms", - Struct: &types.Alarm{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Alarm.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "buckets", - Struct: &types.Bucket{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Bucket.html", - ExtraColumns: defaultRegionalColumns, - Relations: []string{ - "BucketAccessKeys()", - }, - }, - { - SubService: "bucket_access_keys", - Struct: &types.AccessKey{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_AccessKey.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "bucket_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "certificates", - Struct: &types.Certificate{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Certificate.html", - SkipFields: []string{"Tags"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - }...), - }, - { - SubService: "container_services", - Struct: &types.ContainerService{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerService.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ContainerServiceDeployments()", - "ContainerServiceImages()", - }, - }, - { - SubService: "container_service_deployments", - Struct: &types.ContainerServiceDeployment{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerServiceDeployment.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "container_service_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "container_service_images", - Struct: &types.ContainerImage{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerImage.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "container_service_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "database_snapshots", - Struct: &types.RelationalDatabaseSnapshot{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseSnapshot.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "databases", - Struct: &types.RelationalDatabase{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabase.html", - ExtraColumns: defaultRegionalColumns, - Relations: []string{ - "DatabaseParameters()", - "DatabaseEvents()", - "DatabaseLogEvents()", - }, - }, - { - SubService: "database_parameters", - Struct: &types.RelationalDatabaseParameter{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseParameter.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "database_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "database_events", - Struct: &types.RelationalDatabaseEvent{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseEvent.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "database_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "database_log_events", - Struct: &models.LogEventWrapper{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "database_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "disks", - Struct: &types.Disk{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Disk.html", - SkipFields: []string{"Arn", "Tags"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - }...), - Relations: []string{ - "DiskSnapshots()", - }, - }, - { - SubService: "disk_snapshots", - Struct: &types.DiskSnapshot{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_DiskSnapshot.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "disk_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "distributions", - Struct: &models.DistributionWrapper{}, - SkipFields: []string{"Arn", "Tags"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - }...), - }, - { - SubService: "instance_snapshots", - Struct: &types.InstanceSnapshot{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstanceSnapshot.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "instances", - Struct: &types.Instance{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Instance.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "access_details", - Type: schema.TypeJSON, - Resolver: `resolveLightsailInstanceAccessDetails`, - }, - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "InstancePortStates()", - }, - }, - { - SubService: "instance_port_states", - Struct: &types.InstancePortState{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstancePortState.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "instance_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "load_balancers", - Struct: &types.LoadBalancer{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancer.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "LoadBalancerTlsCertificates()", - }, - }, - { - SubService: "load_balancer_tls_certificates", - Struct: &types.LoadBalancerTlsCertificate{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancerTlsCertificate.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "load_balancer_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "static_ips", - Struct: &types.StaticIp{}, - Description: "https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_StaticIp.html", - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "lightsail" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("lightsail")` - r.UnwrapEmbeddedStructs = true - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/mq.go b/plugins/source/aws/codegen/recipes/mq.go deleted file mode 100644 index 5aab99a8846044..00000000000000 --- a/plugins/source/aws/codegen/recipes/mq.go +++ /dev/null @@ -1,94 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/mq" - "github.com/aws/aws-sdk-go-v2/service/mq/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func MQResources() []*Resource { - resources := []*Resource{ - { - SubService: "brokers", - Struct: &mq.DescribeBrokerOutput{}, - Description: "https://docs.aws.amazon.com/amazon-mq/latest/api-reference/brokers.html", - SkipFields: []string{"BrokerArn"}, - PreResourceResolver: "getMqBroker", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BrokerArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "BrokerConfigurations()", - "BrokerUsers()", - }, - }, - { - SubService: "broker_configurations", - Struct: &types.Configuration{}, - Description: "https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "broker_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - Relations: []string{ - "BrokerConfigurationRevisions()", - }, - }, - { - SubService: "broker_configuration_revisions", - Struct: &mq.DescribeConfigurationRevisionOutput{}, - Description: "https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id-revisions.html", - SkipFields: []string{"Data"}, - PreResourceResolver: "getMqBrokerConfigurationRevision", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "broker_configuration_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - { - Name: "data", - Type: schema.TypeJSON, - Resolver: `resolveBrokerConfigurationRevisionsData`, - }, - }...), - }, - { - SubService: "broker_users", - Struct: &mq.DescribeUserOutput{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "broker_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "mq" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("mq")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/mwaa.go b/plugins/source/aws/codegen/recipes/mwaa.go deleted file mode 100644 index 48642f1c6532df..00000000000000 --- a/plugins/source/aws/codegen/recipes/mwaa.go +++ /dev/null @@ -1,36 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/mwaa/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func MWAAResources() []*Resource { - resources := []*Resource{ - { - SubService: "environments", - Description: "https://docs.aws.amazon.com/mwaa/latest/API/API_Environment.html", - Struct: &types.Environment{}, - SkipFields: []string{"Arn"}, - PreResourceResolver: "getEnvironment", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "mwaa" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("airflow")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/neptune.go b/plugins/source/aws/codegen/recipes/neptune.go deleted file mode 100644 index 3de06d49ea69e3..00000000000000 --- a/plugins/source/aws/codegen/recipes/neptune.go +++ /dev/null @@ -1,224 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/neptune/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func NeptuneResources() []*Resource { - resources := []*Resource{ - { - SubService: "cluster_parameter_groups", - Struct: &types.DBClusterParameterGroup{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameters", - SkipFields: []string{"DBClusterParameterGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterParameterGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneClusterParameterGroupTags`, - }, - }...), - Relations: []string{"ClusterParameterGroupParameters()"}, - }, - { - SubService: "cluster_parameter_group_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameterGroups", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "cluster_parameter_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "cluster_snapshots", - Struct: &types.DBClusterSnapshot{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-snapshots.html#DescribeDBClusterSnapshots", - SkipFields: []string{"DBClusterSnapshotArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterSnapshotArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneClusterSnapshotAttributes`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneClusterSnapshotTags`, - }, - }...), - }, - { - SubService: "clusters", - Struct: &types.DBCluster{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-clusters.html#DescribeDBClusters", - SkipFields: []string{"DBClusterArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneClusterTags`, - }, - }...), - }, - { - SubService: "db_parameter_groups", - Struct: &types.DBParameterGroup{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameterGroups", - SkipFields: []string{"DBParameterGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBParameterGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneDbParameterGroupTags`, - }, - }...), - Relations: []string{"DbParameterGroupDbParameters()"}, - }, - { - SubService: "db_parameter_group_db_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameters", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "db_parameter_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "global_clusters", - Struct: &types.GlobalCluster{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#DescribeDBInstances", - SkipFields: []string{"GlobalClusterArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GlobalClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneGlobalClusterTags`, - }, - }...), - }, - { - SubService: "event_subscriptions", - Struct: &types.EventSubscription{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-events.html#DescribeEventSubscriptions", - SkipFields: []string{"EventSubscriptionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EventSubscriptionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneEventSubscriptionTags`, - }, - }...), - }, - { - SubService: "instances", - Struct: &types.DBInstance{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#DescribeDBInstances", - SkipFields: []string{"DBInstanceArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBInstanceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneInstanceTags`, - }, - }...), - }, - { - SubService: "subnet_groups", - Struct: &types.DBSubnetGroup{}, - Description: "https://docs.aws.amazon.com/neptune/latest/userguide/api-subnets.html#DescribeDBSubnetGroups", - SkipFields: []string{"DBSubnetGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBSubnetGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveNeptuneSubnetGroupTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "neptune" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("neptune")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/organizations.go b/plugins/source/aws/codegen/recipes/organizations.go deleted file mode 100644 index 7b0d23add5cd86..00000000000000 --- a/plugins/source/aws/codegen/recipes/organizations.go +++ /dev/null @@ -1,49 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/organizations/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func OrganizationsResources() []*Resource { - resources := []*Resource{ - { - SubService: "accounts", - Struct: &types.Account{}, - Description: "https://docs.aws.amazon.com/organizations/latest/APIReference/API_Account.html", - SkipFields: []string{"Arn"}, - Multiplex: `client.AccountMultiplex`, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveAccountTags`, - }, - }...), - }, - { - SubService: "organizations", - Name: "aws_organizations", - Struct: &types.Organization{}, - Description: "https://docs.aws.amazon.com/organizations/latest/APIReference/API_Organization.html", - SkipFields: []string{"AvailablePolicyTypes"}, // deprecated and misleading field according to docs - PKColumns: []string{"account_id", "arn"}, - Multiplex: `client.AccountMultiplex`, - ExtraColumns: defaultAccountColumns, - }, - } - - for _, r := range resources { - r.Service = "organizations" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/qldb.go b/plugins/source/aws/codegen/recipes/qldb.go deleted file mode 100644 index 0285eaab2966b5..00000000000000 --- a/plugins/source/aws/codegen/recipes/qldb.go +++ /dev/null @@ -1,75 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/qldb" - "github.com/aws/aws-sdk-go-v2/service/qldb/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func QLDBResources() []*Resource { - resources := []*Resource{ - { - SubService: "ledgers", - Struct: &qldb.DescribeLedgerOutput{}, - SkipFields: []string{"Arn"}, - PreResourceResolver: "getLedger", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Description: "The tags associated with the pipeline.", - Type: schema.TypeJSON, - Resolver: `resolveQldbLedgerTags`, - }, - { - Name: "arn", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "LedgerJournalKinesisStreams()", - "LedgerJournalS3Exports()", - }, - }, - { - SubService: "ledger_journal_kinesis_streams", - Struct: &types.JournalKinesisStreamDescription{}, - Description: "https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalKinesisStreamDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "ledger_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "ledger_journal_s3_exports", - Struct: &types.JournalS3ExportDescription{}, - Description: "https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalS3ExportDescription.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "ledger_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "qldb" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("qldb")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/quicksight.go b/plugins/source/aws/codegen/recipes/quicksight.go deleted file mode 100644 index fe3aa15bb985d7..00000000000000 --- a/plugins/source/aws/codegen/recipes/quicksight.go +++ /dev/null @@ -1,240 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/quicksight/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func QuickSightResources() []*Resource { - resources := []*Resource{ - { - SubService: "analyses", - Struct: &types.Analysis{}, - SkipFields: []string{"Arn"}, - PreResourceResolver: "getAnalysis", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "dashboards", - Struct: types.DashboardSummary{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "data_sets", - Struct: types.DataSetSummary{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "Ingestions()", - }, - }, - { - SubService: "data_sources", - Struct: types.DataSource{}, - SkipFields: []string{"Arn", "AlternateDataSourceParameters"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - //{ - // Name: "alternate_data_source_parameters", - // Type: schema.TypeJSON, - // Resolver: `schema.PathResolver("AlternateDataSourceParameters")`, - // IgnoreInTests: true, - //}, - }...), - }, - { - SubService: "folders", - Struct: types.Folder{}, - SkipFields: []string{"Arn"}, - PreResourceResolver: "getFolder", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "groups", - Struct: types.Group{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "GroupMembers()", - }, - }, - { - SubService: "group_members", - Struct: types.GroupMember{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "ingestions", - Struct: types.Ingestion{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "data_set_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "templates", - Struct: types.TemplateSummary{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "users", - Struct: types.User{}, - SkipFields: []string{"Arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveTags()`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "quicksight" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("quicksight")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ram.go b/plugins/source/aws/codegen/recipes/ram.go deleted file mode 100644 index 4369ae27d596ce..00000000000000 --- a/plugins/source/aws/codegen/recipes/ram.go +++ /dev/null @@ -1,88 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ram" - "github.com/aws/aws-sdk-go-v2/service/ram/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func RAMResources() []*Resource { - mx := `client.ServiceAccountRegionMultiplexer("ram")` - resources := []*Resource{ - { - SubService: "principals", - Struct: new(types.Principal), - Multiplex: mx, - PKColumns: []string{"id", "account_id"}, - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "resources", - Struct: new(types.Resource), - Multiplex: mx, - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "resource_shares", - Struct: new(types.ResourceShare), - Multiplex: mx, - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - Relations: []string{ - "ResourceSharePermissions()", - }, - NameTransformer: CreateReplaceTransformer(map[string]string{"resource_share_arn": "arn"}), - }, - { - SubService: "resource_share_associations", - Struct: new(types.ResourceShareAssociation), - Multiplex: mx, - PKColumns: []string{"associated_entity", "resource_share_arn"}, - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "resource_share_invitations", - Struct: new(types.ResourceShareInvitation), - Multiplex: mx, - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - ResolverAndMockTestTemplate: "describe_resources_1", - NameTransformer: CreateReplaceTransformer(map[string]string{"resource_share_invitation_arn": "arn"}), - CustomDescribeInput: `getResourceShareInvitationsInput()`, - }, - { - SubService: "resource_share_permissions", - Struct: new(types.ResourceSharePermissionSummary), - Multiplex: "", // it's a relation for resource_shares - PKColumns: []string{"arn"}, - ExtraColumns: append(defaultRegionalColumns, - codegen.ColumnDefinition{ - // grabbed from types.ResourceSharePermissionDetail - Name: "permission", - Type: schema.TypeJSON, - Resolver: `resolveResourceSharePermissionDetailPermission`, - }, - ), - CustomListInput: `listResourceSharePermissionsInput()`, - }, - { - SubService: "resource_types", - Struct: new(types.ServiceNameAndResourceType), - Multiplex: mx, - PKColumns: []string{"account_id", "resource_type", "service_name"}, - ExtraColumns: defaultRegionalColumns, - CustomListInput: `listResourceTypesInput()`, - }, - } - for _, r := range resources { - r.Service = "ram" - r.Description = "https://docs.aws.amazon.com/ram/latest/APIReference/API_" + r.StructName() + ".html" - if len(r.ResolverAndMockTestTemplate) > 0 { - r.ShouldGenerateResolverAndMockTest = true - r.Client = &ram.Client{} - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/rds.go b/plugins/source/aws/codegen/recipes/rds.go deleted file mode 100644 index 3280e5e01a6aed..00000000000000 --- a/plugins/source/aws/codegen/recipes/rds.go +++ /dev/null @@ -1,295 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/rds/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func RDSResources() []*Resource { - resources := []*Resource{ - { - SubService: "certificates", - Struct: &types.Certificate{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Certificate.html", - SkipFields: []string{"CertificateArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("CertificateArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "engine_versions", - Struct: &types.DBEngineVersion{}, - Description: "https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html", - SkipFields: []string{"Engine", "EngineVersion"}, - ExtraColumns: append(defaultRegionalColumnsPK, []codegen.ColumnDefinition{ - { - Name: "engine", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Engine")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EngineVersion")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ClusterParameters()", - }, - }, - { - SubService: "cluster_parameters", - Struct: &types.Parameter{}, - SkipFields: []string{"DBClusterParameterGroupArn"}, - ExtraColumns: defaultRegionalColumns, - }, - { - SubService: "cluster_parameter_groups", - Struct: &types.DBClusterParameterGroup{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterParameterGroup.html", - SkipFields: []string{"DBClusterParameterGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterParameterGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRdsClusterParameterGroupTags`, - }, - }...), - Relations: []string{"ClusterParameterGroupParameters()"}, - }, - { - SubService: "cluster_parameter_group_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "cluster_parameter_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "cluster_snapshots", - Struct: &types.DBClusterSnapshot{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterSnapshot.html", - SkipFields: []string{"DBClusterSnapshotArn", "TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterSnapshotArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRDSClusterSnapshotTags`, - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: `resolveRDSClusterSnapshotAttributes`, - }, - }...), - }, - { - SubService: "clusters", - Struct: &types.DBCluster{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBCluster.html", - SkipFields: []string{"DBClusterArn", "TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBClusterArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRdsClusterTags`, - }, - }...), - }, - { - SubService: "db_parameter_groups", - Struct: &types.DBParameterGroup{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBParameterGroup.html", - SkipFields: []string{"DBParameterGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBParameterGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRdsDbParameterGroupTags`, - }, - }...), - Relations: []string{"DbParameterGroupDbParameters()"}, - }, - { - SubService: "db_parameter_group_db_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "db_parameter_group_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "db_security_groups", - Struct: &types.DBSecurityGroup{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSecurityGroup.html", - SkipFields: []string{"DBSecurityGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBSecurityGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRdsDbSecurityGroupTags`, - }, - }...), - }, - { - SubService: "db_snapshots", - Struct: &types.DBSnapshot{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSnapshot.html", - SkipFields: []string{"DBSnapshotArn", "TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBSnapshotArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRDSDBSnapshotTags`, - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: `resolveRDSDBSnapshotAttributes`, - }, - }...), - }, - { - SubService: "event_subscriptions", - Struct: &types.EventSubscription{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_EventSubscription.html", - SkipFields: []string{"EventSubscriptionArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EventSubscriptionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRDSEventSubscriptionTags`, - }, - }...), - }, - { - SubService: "instances", - Struct: &types.DBInstance{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBInstance.html", - SkipFields: []string{"DBInstanceArn", "ProcessorFeatures", "TagList"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBInstanceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "processor_features", - Type: schema.TypeJSON, - Resolver: `resolveRdsInstanceProcessorFeatures`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveRdsInstanceTags`, - }, - }...), - }, - { - SubService: "subnet_groups", - Struct: &types.DBSubnetGroup{}, - Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSubnetGroup.html", - SkipFields: []string{"DBSubnetGroupArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("DBSubnetGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "rds" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("rds")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/redshift.go b/plugins/source/aws/codegen/recipes/redshift.go deleted file mode 100644 index db151609df8962..00000000000000 --- a/plugins/source/aws/codegen/recipes/redshift.go +++ /dev/null @@ -1,154 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/redshift/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func RedshiftResources() []*Resource { - resources := []*Resource{ - - { - SubService: "clusters", - Struct: &types.Cluster{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_Cluster.html", - SkipFields: []string{"ClusterParameterGroups"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "The Amazon Resource Name (ARN) for the resource.", - Type: schema.TypeString, - Resolver: `resolveClusterArn()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "logging_status", - Description: "Describes the status of logging for a cluster.", - Type: schema.TypeJSON, - Resolver: `resolveRedshiftClusterLoggingStatus`, - }, - }...), - Relations: []string{ - "Snapshots()", - "ClusterParameterGroups()", - }, - }, - { - SubService: "cluster_parameter_groups", - Struct: &types.ClusterParameterGroupStatus{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterParameterGroupStatus.html", - SkipFields: []string{"ParameterGroupName"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "cluster_arn", - Description: "The Amazon Resource Name (ARN) for the resource.", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "parameter_group_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ParameterGroupName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "ClusterParameters()", - }, - }, - { - SubService: "cluster_parameters", - Struct: &types.Parameter{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_Parameter.html", - SkipFields: []string{"ParameterName"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "cluster_arn", - Description: "The Amazon Resource Name (ARN) for the resource.", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("cluster_arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ParameterName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - - { - SubService: "event_subscriptions", - Struct: &types.EventSubscription{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_EventSubscription.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "ARN of the event subscription.", - Type: schema.TypeString, - Resolver: `resolveEventSubscriptionARN`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - - { - SubService: "snapshots", - Struct: &types.Snapshot{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_Snapshot.html", - SkipFields: []string{"Tags"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "ARN of the snapshot.", - Type: schema.TypeString, - Resolver: `resolveSnapshotARN`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "Tags consisting of a name/value pair for a resource.", - Type: schema.TypeJSON, - Resolver: `client.ResolveTags`, - }, - }...), - }, - - { - SubService: "subnet_groups", - Struct: &types.ClusterSubnetGroup{}, - Description: "https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterSubnetGroup.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "The Amazon Resource Name (ARN) for the resource.", - Type: schema.TypeString, - Resolver: `resolveSubnetGroupArn()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "redshift" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("redshift")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/resourcegroups.go b/plugins/source/aws/codegen/recipes/resourcegroups.go deleted file mode 100644 index d39523ababc7c1..00000000000000 --- a/plugins/source/aws/codegen/recipes/resourcegroups.go +++ /dev/null @@ -1,48 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/resourcegroups/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ResourceGroupsResources() []*Resource { - resources := []*Resource{ - - { - SubService: "resource_groups", - Struct: &models.ResourceGroupWrapper{}, - SkipFields: []string{}, - PreResourceResolver: "getResourceGroup", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveResourcegroupsResourceGroupTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "resourcegroups" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("resource-groups")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/route53.go b/plugins/source/aws/codegen/recipes/route53.go deleted file mode 100644 index fd4768c2dc96f5..00000000000000 --- a/plugins/source/aws/codegen/recipes/route53.go +++ /dev/null @@ -1,234 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/route53/types" - "github.com/aws/aws-sdk-go-v2/service/route53domains" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/route53/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func Route53Resources() []*Resource { - resources := []*Resource{ - - { - SubService: "delegation_sets", - Struct: &types.DelegationSet{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_DelegationSet.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "The Amazon Resource Name (ARN) for the resource.", - Type: schema.TypeString, - Resolver: `resolveDelegationSetArn()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - - { - SubService: "domains", - Struct: &route53domains.GetDomainDetailOutput{}, - SkipFields: []string{"DomainName", "_"}, - PreResourceResolver: "getDomain", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "domain_name", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "A list of tags", - Type: schema.TypeJSON, - Resolver: `resolveRoute53DomainTags`, - }, - { - Name: "transfer_lock", - Type: schema.TypeBool, - }, - }, - }, - - { - SubService: "health_checks", - Struct: &types.HealthCheck{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheck.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveHealthCheckArn()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "The tags associated with the health check.", - Type: schema.TypeJSON, - }, - { - Name: "cloud_watch_alarm_configuration_dimensions", - Type: schema.TypeJSON, - Resolver: `resolveRoute53healthCheckCloudWatchAlarmConfigurationDimensions`, - }, - }...), - }, - - { - SubService: "hosted_zones", - Struct: &models.Route53HostedZoneWrapper{}, - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveRoute53HostedZoneArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "HostedZoneQueryLoggingConfigs()", - "HostedZoneResourceRecordSets()", - "HostedZoneTrafficPolicyInstances()", - }, - }, - { - SubService: "hosted_zone_query_logging_configs", - Struct: &types.QueryLoggingConfig{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_QueryLoggingConfig.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveRoute53HostedZoneQueryLoggingConfigsArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "hosted_zone_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "hosted_zone_resource_record_sets", - Struct: &types.ResourceRecordSet{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "hosted_zone_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "hosted_zone_traffic_policy_instances", - Struct: &types.TrafficPolicyInstance{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicyInstance.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Description: "Amazon Resource Name (ARN) of the route53 hosted zone traffic policy instance.", - Type: schema.TypeString, - Resolver: `resolveRoute53HostedZoneTrafficPolicyInstancesArn`, - }, - { - Name: "hosted_zone_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - - { - SubService: "traffic_policies", - Struct: &types.TrafficPolicySummary{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicySummary.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveTrafficPolicyArn()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - `TrafficPolicyVersions()`, - }, - }, - { - SubService: "traffic_policy_versions", - Struct: &types.TrafficPolicy{}, - Description: "https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicy.html", - SkipFields: []string{"Version", "Id", "Document"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "traffic_policy_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Id")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("Version")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "document", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("Document")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "route53" - r.Multiplex = "client.AccountMultiplex" - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/s3.go b/plugins/source/aws/codegen/recipes/s3.go deleted file mode 100644 index e46944f19895e3..00000000000000 --- a/plugins/source/aws/codegen/recipes/s3.go +++ /dev/null @@ -1,122 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/s3/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func S3Resources() []*Resource { - resources := []*Resource{ - - { - SubService: "accounts", - Struct: &models.PublicAccessBlockConfigurationWrapper{}, - SkipFields: []string{"ARN"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "buckets", - Struct: &models.WrappedBucket{}, - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveBucketARN()`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "BucketEncryptionRules()", - "BucketLifecycles()", - "BucketGrants()", - "BucketCorsRules()", - }, - }, - { - SubService: "bucket_encryption_rules", - Struct: &types.ServerSideEncryptionRule{}, - Description: "https://docs.aws.amazon.com/AmazonS3/latest/API/API_ServerSideEncryptionRule.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "bucket_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "bucket_lifecycles", - Struct: &types.LifecycleRule{}, - Description: "https://docs.aws.amazon.com/AmazonS3/latest/API/API_LifecycleRule.html", - SkipFields: []string{"Filter"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "bucket_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "bucket_grants", - Struct: &types.Grant{}, - Description: "https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grant.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "bucket_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - { - SubService: "bucket_cors_rules", - Struct: &types.CORSRule{}, - Description: "https://docs.aws.amazon.com/AmazonS3/latest/API/API_CORSRule.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "bucket_arn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("arn")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "s3" - r.Multiplex = "client.AccountMultiplex" - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/sagemaker.go b/plugins/source/aws/codegen/recipes/sagemaker.go deleted file mode 100644 index 1d1d785bd3dfd0..00000000000000 --- a/plugins/source/aws/codegen/recipes/sagemaker.go +++ /dev/null @@ -1,111 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/sagemaker" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SagemakerResources() []*Resource { - resources := []*Resource{ - - { - SubService: "endpoint_configurations", - Struct: &sagemaker.DescribeEndpointConfigOutput{}, - SkipFields: []string{"EndpointConfigArn"}, - PreResourceResolver: "getEndpointConfiguration", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("EndpointConfigArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "The tags associated with the model.", - Type: schema.TypeJSON, - Resolver: `resolveSagemakerEndpointConfigurationTags`, - }, - }...), - }, - - { - SubService: "models", - Struct: &sagemaker.DescribeModelOutput{}, - SkipFields: []string{"ModelArn"}, - PreResourceResolver: "getModel", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ModelArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "The tags associated with the model.", - Type: schema.TypeJSON, - Resolver: `resolveSagemakerModelTags`, - }, - }...), - }, - - { - SubService: "notebook_instances", - Struct: &sagemaker.DescribeNotebookInstanceOutput{}, - SkipFields: []string{"NotebookInstanceArn"}, - PreResourceResolver: "getNotebookInstance", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("NotebookInstanceArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "The tags associated with the notebook instance.", - Type: schema.TypeJSON, - Resolver: `resolveSagemakerNotebookInstanceTags`, - }, - }...), - }, - - { - SubService: "training_jobs", - Struct: &sagemaker.DescribeTrainingJobOutput{}, - SkipFields: []string{"TrainingJobArn"}, - PreResourceResolver: "getTrainingJob", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TrainingJobArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "The tags associated with the model.", - Type: schema.TypeJSON, - Resolver: `resolveSagemakerTrainingJobTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "sagemaker" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("api.sagemaker")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/scheduler.go b/plugins/source/aws/codegen/recipes/scheduler.go deleted file mode 100644 index 75366b234951e4..00000000000000 --- a/plugins/source/aws/codegen/recipes/scheduler.go +++ /dev/null @@ -1,53 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/scheduler" - "github.com/aws/aws-sdk-go-v2/service/scheduler/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SchedulerResources() []*Resource { - mx := `client.ServiceAccountRegionMultiplexer("scheduler")` - resources := []*Resource{ - { - SubService: "schedule_groups", - Struct: new(types.ScheduleGroupSummary), - Multiplex: mx, - PKColumns: []string{"arn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveSchedulerScheduleTags()`, - }, - }...), - }, - { - SubService: "schedules", - Struct: new(scheduler.GetScheduleOutput), - Multiplex: mx, - PKColumns: []string{"arn"}, - SkipFields: []string{"ResultMetadata"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveSchedulerScheduleTags()`, - }, - }...), - PreResourceResolver: "getSchedule", - }, - } - for _, r := range resources { - r.Service = "scheduler" - r.Description = "https://docs.aws.amazon.com/scheduler/latest/APIReference/API_" + r.StructName() + ".html" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/secretsmanager.go b/plugins/source/aws/codegen/recipes/secretsmanager.go deleted file mode 100644 index 8993a131ddaddb..00000000000000 --- a/plugins/source/aws/codegen/recipes/secretsmanager.go +++ /dev/null @@ -1,42 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/secretsmanager" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SecretsManagerResources() []*Resource { - resources := []*Resource{ - { - SubService: "secrets", - Struct: &secretsmanager.DescribeSecretOutput{}, - Description: "https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecrets.html", - SkipFields: []string{"ARN", "ResultMetadata"}, - PreResourceResolver: "getSecret", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policy", - Description: "A JSON-formatted string that describes the permissions that are associated with the attached secret.", - Type: schema.TypeJSON, - Resolver: `fetchSecretsmanagerSecretPolicy`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "secretsmanager" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("secretsmanager")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/servicecatalog.go b/plugins/source/aws/codegen/recipes/servicecatalog.go deleted file mode 100644 index e2b6e95047bc58..00000000000000 --- a/plugins/source/aws/codegen/recipes/servicecatalog.go +++ /dev/null @@ -1,81 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ServiceCatalogResources() []*Resource { - resources := []*Resource{ - { - SubService: "portfolios", - Struct: &types.PortfolioDetail{}, - Description: "https://docs.aws.amazon.com/servicecatalog/latest/dg/API_PortfolioDetail.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolvePortfolioTags`, - }, - }...), - }, - { - SubService: "products", - Struct: &types.ProductViewDetail{}, - Description: "https://docs.aws.amazon.com/servicecatalog/latest/dg/API_ProductViewDetail.html", - SkipFields: []string{"ProductARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ProductARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveProductTags`, - }, - }...), - }, { - SubService: "provisioned_products", - Struct: &types.ProvisionedProductAttribute{}, - Description: "https://docs.aws.amazon.com/servicecatalog/latest/dg/API_ProvisionedProductAttribute.html", - SkipFields: []string{"Arn", "Tags"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveProvisionedProductTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "servicecatalog" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("servicecatalog")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/servicequota.go b/plugins/source/aws/codegen/recipes/servicequota.go deleted file mode 100644 index 9559b0827f7876..00000000000000 --- a/plugins/source/aws/codegen/recipes/servicequota.go +++ /dev/null @@ -1,59 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ServiceQuotasResources() []*Resource { - resources := []*Resource{ - { - SubService: "services", - Struct: &types.ServiceInfo{}, - SkipFields: []string{"ServiceCode", "ServiceName"}, - Description: "https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceInfo.html", - Multiplex: `client.ServiceAccountRegionMultiplexer("servicequotas")`, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "service_code", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ServiceCode")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, { - Name: "service_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ServiceName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - "Quotas()", - }, - }, - { - SubService: "quotas", - Struct: &types.ServiceQuota{}, - Description: "https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceQuota.html", - SkipFields: []string{"QuotaArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("QuotaArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "servicequotas" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ses.go b/plugins/source/aws/codegen/recipes/ses.go deleted file mode 100644 index c1ae535a163869..00000000000000 --- a/plugins/source/aws/codegen/recipes/ses.go +++ /dev/null @@ -1,135 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ses" - "github.com/aws/aws-sdk-go-v2/service/sesv2" - "github.com/aws/aws-sdk-go-v2/service/sesv2/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ses/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SESResources() []*Resource { - resources := []*Resource{ - { - SubService: "active_receipt_rule_sets", - Struct: &ses.DescribeActiveReceiptRuleSetOutput{}, - Description: `https://docs.aws.amazon.com/ses/latest/APIReference/API_DescribeActiveReceiptRuleSet.html`, - SkipFields: []string{"Metadata", "ResultMetadata"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - codegen.ColumnDefinition{ - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Metadata.Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - codegen.ColumnDefinition{ - Name: "created_timestamp", - Type: schema.TypeTimestamp, - Resolver: `schema.PathResolver("Metadata.CreatedTimestamp")`, - }, - ), - }, - { - SubService: "configuration_sets", - Struct: &sesv2.GetConfigurationSetOutput{}, - Description: "https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetConfigurationSet.html", - SkipFields: []string{"ResultMetadata"}, - PreResourceResolver: "getConfigurationSet", - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveConfigurationSetArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ), - NameTransformer: CreateReplaceTransformer(map[string]string{ - "configuration_set_name": "name", - }), - Relations: []string{"ConfigurationSetEventDestinations()"}, - }, - { - SubService: "configuration_set_event_destinations", - Struct: types.EventDestination{}, - Description: "https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_EventDestination.html", - PKColumns: []string{"name"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - codegen.ColumnDefinition{ - Name: "configuration_set_name", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ), - }, - { - SubService: "contact_lists", - Struct: &sesv2.GetContactListOutput{}, - Description: "https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetContactList.html", - PreResourceResolver: "getContactList", - PKColumns: []string{"name"}, - SkipFields: []string{"ResultMetadata"}, - ExtraColumns: defaultRegionalColumnsPK, - NameTransformer: CreateReplaceTransformer(map[string]string{"contact_list_name": "name"}), - }, - { - SubService: "custom_verification_email_templates", - Struct: &sesv2.GetCustomVerificationEmailTemplateOutput{}, - Description: "https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetCustomVerificationEmailTemplate.html", - PreResourceResolver: "getCustomVerificationEmailTemplate", - SkipFields: []string{"ResultMetadata"}, - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveCustomVerificationEmailTemplateArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ), - NameTransformer: CreateReplaceTransformer(map[string]string{"template_": ""}), - }, - { - SubService: "identities", - Struct: &models.EmailIdentity{}, - UnwrapEmbeddedStructs: true, - Description: "https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetEmailIdentity.html", - PreResourceResolver: "getIdentity", - SkipFields: []string{"ResultMetadata"}, - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "arn", - Type: schema.TypeString, - Resolver: "resolveIdentityArn", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ), - }, - { - SubService: "templates", - Struct: &models.Template{}, - PreResourceResolver: "getTemplate", - ExtraColumns: append( - defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveTemplateArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - ), - }, - } - - // set default values - for _, r := range resources { - r.Service = "ses" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("email")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/shield.go b/plugins/source/aws/codegen/recipes/shield.go deleted file mode 100644 index 59e030e1dbd991..00000000000000 --- a/plugins/source/aws/codegen/recipes/shield.go +++ /dev/null @@ -1,99 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/shield/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ShieldResources() []*Resource { - resources := []*Resource{ - - { - SubService: "attacks", - Struct: &types.AttackDetail{}, - Description: "https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_AttackDetail.html", - SkipFields: []string{"AttackId"}, - PreResourceResolver: "getAttack", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "id", - Description: "The unique identifier (ID) of the attack", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AttackId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - - { - SubService: "protection_groups", - Struct: &types.ProtectionGroup{}, - Description: "https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_ProtectionGroup.html", - SkipFields: []string{"ProtectionGroupArn"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ProtectionGroupArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveShieldProtectionGroupTags`, - }, - }...), - }, - - { - SubService: "protections", - Struct: &types.Protection{}, - Description: "https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Protection.html", - SkipFields: []string{"ProtectionArn"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ProtectionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveShieldProtectionTags`, - }, - }...), - }, - - { - SubService: "subscriptions", - Struct: &types.Subscription{}, - Description: "https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Subscription.html", - SkipFields: []string{"SubscriptionArn"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SubscriptionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "shield" - r.Multiplex = "client.AccountMultiplex" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/sns.go b/plugins/source/aws/codegen/recipes/sns.go deleted file mode 100644 index 12a029cf0c8977..00000000000000 --- a/plugins/source/aws/codegen/recipes/sns.go +++ /dev/null @@ -1,93 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/sns/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SNSResources() []*Resource { - resources := []*Resource{ - - { - SubService: "subscriptions", - Struct: &models.Subscription{}, - SkipFields: []string{"SubscriptionArn", "DeliveryPolicy", "EffectiveDeliveryPolicy", "FilterPolicy", "RedrivePolicy"}, - PreResourceResolver: "getSnsSubscription", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SubscriptionArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "delivery_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("DeliveryPolicy")`, - }, - { - Name: "effective_delivery_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("EffectiveDeliveryPolicy")`, - }, - { - Name: "filter_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("FilterPolicy")`, - }, - { - Name: "redrive_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("RedrivePolicy")`, - }, - }...), - }, - - { - SubService: "topics", - Struct: &models.Topic{}, - SkipFields: []string{"Arn", "Policy", "EffectiveDeliveryPolicy", "DeliveryPolicy"}, - PreResourceResolver: "getTopic", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveSnsTopicTags`, - }, - { - Name: "delivery_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("DeliveryPolicy")`, - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("Policy")`, - }, - { - Name: "effective_delivery_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("EffectiveDeliveryPolicy")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "sns" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("sns")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/sqs.go b/plugins/source/aws/codegen/recipes/sqs.go deleted file mode 100644 index 0fdfb3c23d1923..00000000000000 --- a/plugins/source/aws/codegen/recipes/sqs.go +++ /dev/null @@ -1,55 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/sqs/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SQSResources() []*Resource { - resources := []*Resource{ - { - SubService: "queues", - Struct: &models.Queue{}, - SkipFields: []string{"Arn", "Policy", "RedriveAllowPolicy", "RedrivePolicy"}, - PreResourceResolver: "getQueue", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveSqsQueueTags`, - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("Policy")`, - }, - { - Name: "redrive_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("RedrivePolicy")`, - }, - { - Name: "redrive_allow_policy", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("RedriveAllowPolicy")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "sqs" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("sqs")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ssm.go b/plugins/source/aws/codegen/recipes/ssm.go deleted file mode 100644 index 2715ec915af031..00000000000000 --- a/plugins/source/aws/codegen/recipes/ssm.go +++ /dev/null @@ -1,194 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/ssm/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SSMResources() []*Resource { - resources := []*Resource{ - { - SubService: "documents", - Struct: &types.DocumentDescription{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DocumentDescription.html", - PreResourceResolver: "getDocument", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveDocumentARN`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "permissions", - Type: schema.TypeJSON, - Resolver: `resolveDocumentPermission`, - }, - }...), - }, - { - SubService: "instances", - Struct: &types.InstanceInformation{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InstanceInformation.html", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveInstanceARN`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - Relations: []string{ - `InstanceComplianceItems()`, - `InstancePatches()`, - }, - }, - { - SubService: "instance_compliance_items", - Struct: &types.ComplianceItem{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceItem.html", - SkipFields: []string{"Id"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Id")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "instance_arn", - Type: schema.TypeString, - Resolver: `resolveInstanceComplianceItemInstanceARN`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "parameters", - Struct: &types.ParameterMetadata{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ParameterMetadata.html", - SkipFields: []string{"Name"}, - ExtraColumns: append(defaultRegionalColumnsPK, []codegen.ColumnDefinition{ - { - Name: "name", - Description: "The parameter name", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "compliance_summary_items", - Struct: &types.ComplianceSummaryItem{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceSummaryItem.html", - SkipFields: []string{"ComplianceType"}, - ExtraColumns: append(defaultRegionalColumnsPK, []codegen.ColumnDefinition{ - { - Name: "compliance_type", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "associations", - Struct: &types.Association{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_Association.html", - SkipFields: []string{"AssociationId"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "association_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("AssociationId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "inventories", - Struct: &types.InventoryResultEntity{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryResultEntity.html", - SkipFields: []string{"Id"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Id")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "inventory_schemas", - Struct: &types.InventoryItemSchema{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryItemSchema.html", - SkipFields: []string{"TypeName", "Version"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "type_name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("TypeName")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Version")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "patch_baselines", - Struct: &types.PatchBaselineIdentity{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchBaselineIdentity.html", - SkipFields: []string{"BaselineId"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "baseline_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("BaselineId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "instance_patches", - Struct: &types.PatchComplianceData{}, - Description: "https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchComplianceData.html", - SkipFields: []string{"KBId"}, - ExtraColumns: append( - defaultRegionalColumnsPK, - []codegen.ColumnDefinition{ - { - Name: "kb_id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("KBId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "ssm" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("ssm")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/ssoadmin.go b/plugins/source/aws/codegen/recipes/ssoadmin.go deleted file mode 100644 index b6f2a213627caf..00000000000000 --- a/plugins/source/aws/codegen/recipes/ssoadmin.go +++ /dev/null @@ -1,48 +0,0 @@ -package recipes - -import ( - types "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func SSOAdminResources() []*Resource { - resources := []*Resource{ - { - SubService: "instances", - Struct: &types.InstanceMetadata{}, - Description: "https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_InstanceMetadata.html", - Relations: []string{ - "PermissionSets()", - }, - }, - { - SubService: "permission_sets", - Struct: &types.PermissionSet{}, - Description: "https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_PermissionSet.html", - PreResourceResolver: "getSsoadminPermissionSet", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "inline_policy", - Type: schema.TypeJSON, - Resolver: "getSsoadminPermissionSetInlinePolicy", - }, - }, - Relations: []string{ - "AccountAssignments()", - }, - }, - { - SubService: "account_assignments", - Struct: &types.AccountAssignment{}, - Description: "https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_AccountAssignment.html", - }, - } - - // set default values - for _, r := range resources { - r.Service = "ssoadmin" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("identitystore")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/stepfunction.go b/plugins/source/aws/codegen/recipes/stepfunction.go deleted file mode 100644 index 1bb27fe00bfaec..00000000000000 --- a/plugins/source/aws/codegen/recipes/stepfunction.go +++ /dev/null @@ -1,40 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/sfn" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func StepFunctionResources() []*Resource { - mx := `client.ServiceAccountRegionMultiplexer("states")` - resources := []*Resource{ - { - SubService: "state_machines", - Struct: new(sfn.DescribeStateMachineOutput), - Description: "https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeStateMachine.html", - Multiplex: mx, - PKColumns: []string{"arn"}, - SkipFields: []string{"ResultMetadata", "StateMachineArn"}, - PreResourceResolver: "getStepFunction", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("StateMachineArn")`, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveStepFunctionTags`, - }, - }...), - }, - } - for _, r := range resources { - r.Service = "stepfunctions" - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/fetch.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/fetch.go.tpl deleted file mode 100644 index 0e4d468923e081..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/fetch.go.tpl +++ /dev/null @@ -1,35 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "context" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - "github.com/cloudquery/plugin-sdk/schema" -) - -func {{.Table.Resolver}}(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { - var input {{.Service}}.{{.DescribeMethod.Method.Name}}Input{{ if .CustomDescribeInput }} = {{.CustomDescribeInput}}{{ end }} - c := meta.(*client.Client) - svc := c.Services().{{.CloudQueryServiceName}} - for { - response, err := svc.{{.DescribeMethod.Method.Name}}(ctx, &input) - if err != nil { - return err - } - {{- if .DescribeMethod.OutputFieldName }} - res <- response.{{.DescribeMethod.OutputFieldName}} - {{- else }} - res <- response - {{- end }} - - if aws.ToString(response.NextToken) == "" { - break - } - input.NextToken = response.NextToken - } - return nil -} diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/mock_test.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/mock_test.go.tpl deleted file mode 100644 index 1223f027af9f8c..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/describe_resources_1/mock_test.go.tpl +++ /dev/null @@ -1,54 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "testing" - - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}/types" - {{- if not .Parent }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - {{- end }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client/mocks" - "github.com/cloudquery/plugin-sdk/faker" - "github.com/golang/mock/gomock" -) - -{{- if .Parent }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, m *mocks.MockKafkaClient) { -{{- else }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, ctrl *gomock.Controller) client.Services { - m := mocks.NewMock{{.CloudQueryServiceName}}Client(ctrl) -{{- end }} - object := types.{{.StructName}}{} - err := faker.FakeObject(&object) - if err != nil { - t.Fatal(err) - } - - m.EXPECT().{{.DescribeMethod.Method.Name}}(gomock.Any(), gomock.Any(), gomock.Any()).Return( - &{{.Service}}.{{.DescribeMethod.Method.Name}}Output{ - {{.DescribeMethod.OutputFieldName}}: []types.{{.StructName}}{object}, - }, nil) - -{{ $listTagsMethod := .ListTagsMethod}} -{{- if $listTagsMethod.Found }} - tagsOutput := {{.Service}}.{{$listTagsMethod.Method.Name}}Output{} - err = faker.FakeObject(&tagsOutput) - if err != nil { - t.Fatal(err) - } - m.EXPECT().{{$listTagsMethod.Method.Name}}(gomock.Any(), gomock.Any()).Return(&tagsOutput, nil).AnyTimes() -{{- end }} - - return client.Services{ - {{.Service | ToCamel}}: m, - } -} - -{{- if not .Parent }} -func Test{{.Service | ToCamel}}{{.SubService | ToCamel}}(t *testing.T) { - client.AwsMockTestHelper(t, {{.SubService | ToCamel}}(), build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock, client.TestOptions{}) -} -{{- end }} \ No newline at end of file diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/fetch.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/fetch.go.tpl deleted file mode 100644 index a7c6cf9c4520b3..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/fetch.go.tpl +++ /dev/null @@ -1,51 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "context" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - "github.com/cloudquery/plugin-sdk/schema" -) - -func {{.Table.Resolver}}(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { - var input {{.Service}}.{{.ListMethod.Method.Name}}Input{{ if .CustomListInput }} = {{.CustomListInput}}{{ end }} - c := meta.(*client.Client) - svc := c.Services().{{.CloudQueryServiceName}} - for { - response, err := svc.{{.ListMethod.Method.Name}}(ctx, &input) - if err != nil { - return err - } - {{- if .ListMethod.OutputFieldName }} - res <- response.{{.ListMethod.OutputFieldName}} - {{- else }} - res <- response - {{- end }} - - if aws.ToString(response.NextToken) == "" { - break - } - input.NextToken = response.NextToken - } - return nil -} - -func {{.Table.PreResourceResolver}}(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { - cl := meta.(*client.Client) - svc := cl.Services().{{.CloudQueryServiceName}} - var input {{.Service}}.{{.DescribeMethod.Method.Name}}Input{{ if .CustomDescribeInput }} = {{.CustomDescribeInput}}{{ end }} - output, err := svc.{{.DescribeMethod.Method.Name}}(ctx, &input) - if err != nil { - return err - } - {{- if .DescribeMethod.OutputFieldName }} - resource.Item = output.{{.DescribeMethod.OutputFieldName}} - {{- else }} - resource.Item = output - {{- end }} - return nil -} diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/mock_test.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/mock_test.go.tpl deleted file mode 100644 index 05b561e99dab47..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_and_describe_resources_1/mock_test.go.tpl +++ /dev/null @@ -1,63 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "testing" - - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}/types" - {{- if not .Parent }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - {{- end }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client/mocks" - "github.com/cloudquery/plugin-sdk/faker" - "github.com/golang/mock/gomock" -) - -{{- if .Parent }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, m *mocks.MockKafkaClient) { -{{- else }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, ctrl *gomock.Controller) client.Services { - m := mocks.NewMock{{.CloudQueryServiceName}}Client(ctrl) -{{- end }} - object := types.{{.StructName}}{} - err := faker.FakeObject(&object) - if err != nil { - t.Fatal(err) - } - -{{- range $i, $ch := .Children }} - build{{$ch.Service | ToCamel}}{{$ch.SubService | ToCamel}}Mock(t, m) -{{- end }} - - m.EXPECT().{{.ListMethod.Method.Name}}(gomock.Any(), gomock.Any(), gomock.Any()).Return( - &{{.Service}}.{{.ListMethod.Method.Name}}Output{ - {{.ListMethod.OutputFieldName}}: []types.{{.StructName}}{object}, - }, nil) - - m.EXPECT().{{.DescribeMethod.Method.Name}}(gomock.Any(), gomock.Any(), gomock.Any()).Return( - &{{.Service}}.{{.DescribeMethod.Method.Name}}Output{ - {{.DescribeMethod.OutputFieldName}}: &object, - }, nil) - -{{ $listTagsMethod := .ListTagsMethod}} -{{- if $listTagsMethod.Found }} - tagsOutput := {{.Service}}.{{$listTagsMethod.Method.Name}}Output{} - err = faker.FakeObject(&tagsOutput) - if err != nil { - t.Fatal(err) - } - m.EXPECT().{{$listTagsMethod.Method.Name}}(gomock.Any(), gomock.Any()).Return(&tagsOutput, nil).AnyTimes() -{{- end }} - - return client.Services{ - {{.CloudQueryServiceName}}: m, - } -} - -{{- if not .Parent }} -func Test{{.Service | ToCamel}}{{.SubService | ToCamel}}(t *testing.T) { - client.AwsMockTestHelper(t, {{.SubService | ToCamel}}(), build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock, client.TestOptions{}) -} -{{- end }} \ No newline at end of file diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/README.md b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/README.md deleted file mode 100644 index 18388033198954..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This folder contains templates for resolvers and mock-tests, for AWS APIs of the form `Lists` (e.g. `eventbridge.ListArchives`) - -See `eventbridge/archives_fetch.go` and `eventbridge/archives_mock_test.go` for an example of the files this template creates. diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/fetch.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/fetch.go.tpl deleted file mode 100644 index fc153a782db6ac..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/fetch.go.tpl +++ /dev/null @@ -1,34 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "context" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - "github.com/cloudquery/plugin-sdk/schema" -) - -func {{.Table.Resolver}}(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { - var input {{.Service}}.{{.ListMethod.Method.Name}}Input{{ if .CustomListInput }} = {{.CustomListInput}}{{ end }} - c := meta.(*client.Client) - svc := c.Services().{{.Service | ToCamel}} - for { - response, err := svc.{{.ListMethod.Method.Name}}(ctx, &input) - if err != nil { - return err - } - {{- if .ListMethod.OutputFieldName }} - res <- response.{{.ListMethod.OutputFieldName}} - {{- else }} - res <- response - {{- end }} - if aws.ToString(response.NextToken) == "" { - break - } - input.NextToken = response.NextToken - } - return nil -} diff --git a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/mock_test.go.tpl b/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/mock_test.go.tpl deleted file mode 100644 index eca3f4ce4cf5a4..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resolver_and_mock_test/list_resources_1/mock_test.go.tpl +++ /dev/null @@ -1,60 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "testing" - - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}" - "github.com/aws/aws-sdk-go-v2/service/{{.Service}}/types" - {{- if not .Parent }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client" - {{- end }} - "github.com/cloudquery/cloudquery/plugins/source/aws/client/mocks" - "github.com/cloudquery/plugin-sdk/faker" - "github.com/golang/mock/gomock" -) - -{{- if .Parent }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, m *mocks.MockKafkaClient) { -{{- else }} -func build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock(t *testing.T, ctrl *gomock.Controller) client.Services { - m := mocks.NewMock{{.CloudQueryServiceName}}Client(ctrl) -{{- end }} - object := types.{{.StructName}}{} - err := faker.FakeObject(&object) - if err != nil { - t.Fatal(err) - } - -{{- range $i, $ch := .Children }} - build{{$ch.Service | ToCamel}}{{$ch.SubService | ToCamel}}Mock(t, m) -{{- end }} - - m.EXPECT().{{.ListMethod.Method.Name}}(gomock.Any(), gomock.Any(), gomock.Any()).Return( - &{{.Service}}.{{.ListMethod.Method.Name}}Output{ - {{.ListMethod.OutputFieldName}}: []types.{{.StructName}}{object}, - }, nil) - -{{ $listTagsMethod := .ListTagsMethod}} -{{- if $listTagsMethod.Found }} - tagsOutput := {{.Service}}.{{$listTagsMethod.Method.Name}}Output{} - err = faker.FakeObject(&tagsOutput) - if err != nil { - t.Fatal(err) - } - m.EXPECT().{{$listTagsMethod.Method.Name}}(gomock.Any(), gomock.Any()).Return(&tagsOutput, nil).AnyTimes() -{{- end }} - -{{- if not .Parent }} - return client.Services{ - {{.Service | ToCamel}}: m, - } -{{- end }} -} - -{{- if not .Parent }} -func Test{{.Service | ToCamel}}{{.SubService | ToCamel}}(t *testing.T) { - client.AwsMockTestHelper(t, {{.SubService | ToCamel}}(), build{{.Service | ToCamel}}{{.SubService | ToCamel}}Mock, client.TestOptions{}) -} -{{- end }} \ No newline at end of file diff --git a/plugins/source/aws/codegen/recipes/templates/resource.go.tpl b/plugins/source/aws/codegen/recipes/templates/resource.go.tpl deleted file mode 100644 index 0a885a198a5f19..00000000000000 --- a/plugins/source/aws/codegen/recipes/templates/resource.go.tpl +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" - "github.com/cloudquery/cloudquery/plugins/source/aws/client" -) - -func {{.SubService | ToCamel}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} \ No newline at end of file diff --git a/plugins/source/aws/codegen/recipes/timestream.go b/plugins/source/aws/codegen/recipes/timestream.go deleted file mode 100644 index 35f53c6bd4b577..00000000000000 --- a/plugins/source/aws/codegen/recipes/timestream.go +++ /dev/null @@ -1,35 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/timestreamwrite/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func TimestreamResources() []*Resource { - return []*Resource{ - { - Service: "timestream", - SubService: "databases", - Struct: new(types.Database), - Multiplex: `client.ServiceAccountRegionMultiplexer("ingest.timestream")`, - PKColumns: []string{"arn"}, - ExtraColumns: append(defaultRegionalColumns, - codegen.ColumnDefinition{ - Name: "tags", - Type: schema.TypeJSON, - Resolver: "fetchDatabaseTags", - }, - ), - Relations: []string{"Tables()"}, - }, - { - Service: "timestream", - SubService: "tables", - Struct: new(types.Table), - Multiplex: "", // skip multiplexing as it's a relation for databases - PKColumns: []string{"arn"}, - ExtraColumns: defaultRegionalColumns, - }, - } -} diff --git a/plugins/source/aws/codegen/recipes/transfer.go b/plugins/source/aws/codegen/recipes/transfer.go deleted file mode 100644 index b44d9b0319ca43..00000000000000 --- a/plugins/source/aws/codegen/recipes/transfer.go +++ /dev/null @@ -1,43 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/transfer/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func TransferResources() []*Resource { - resources := []*Resource{ - - { - SubService: "servers", - Struct: &types.DescribedServer{}, - Description: "https://docs.aws.amazon.com/transfer/latest/userguide/API_DescribedServer.html", - SkipFields: []string{"Arn", "Tags"}, - PreResourceResolver: "getServer", - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Arn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "Specifies the key-value pairs that you can use to search for and group servers that were assigned to the server that was described", - Type: schema.TypeJSON, - Resolver: `resolveServersTags`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "transfer" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("transfer")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/waf.go b/plugins/source/aws/codegen/recipes/waf.go deleted file mode 100644 index e9048c8a3fd2b9..00000000000000 --- a/plugins/source/aws/codegen/recipes/waf.go +++ /dev/null @@ -1,119 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/waf/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func WAFResources() []*Resource { - resources := []*Resource{ - - { - SubService: "rule_groups", - Struct: &types.RuleGroupSummary{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleGroupSummary.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWafRuleGroupArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveWafRuleGroupTags`, - }, - { - Name: "rule_ids", - Type: schema.TypeStringArray, - Resolver: `resolveWafRuleGroupRuleIds`, - }, - }...), - }, - - { - SubService: "rules", - Struct: &types.RuleSummary{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleSummary.html", - SkipFields: []string{"ARN"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWafRuleArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveWafRuleTags`, - }, - }...), - }, - - { - SubService: "subscribed_rule_groups", - Struct: &types.SubscribedRuleGroupSummary{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_SubscribedRuleGroupSummary.html", - SkipFields: []string{"RuleGroupId"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Description: "The AWS Account ID of the resource.", - Type: schema.TypeString, - Resolver: `client.ResolveAWSAccount`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "rule_group_id", - Description: "A unique identifier for a RuleGroup.", - Type: schema.TypeString, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - Resolver: `schema.PathResolver("RuleGroupId")`, - }, - }, - }, - - { - SubService: "web_acls", - Struct: &types.WebACLSummary{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_WebACLSummary.html", - SkipFields: []string{"WebACLArn"}, - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("WebACLArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveWafWebACLTags`, - }, - { - Name: "logging_configuration", - Description: "The LoggingConfiguration for the specified web ACL.", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("LoggingConfiguration")`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "waf" - r.Multiplex = `client.AccountMultiplex` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/wafregional.go b/plugins/source/aws/codegen/recipes/wafregional.go deleted file mode 100644 index 6c55f3800ebe63..00000000000000 --- a/plugins/source/aws/codegen/recipes/wafregional.go +++ /dev/null @@ -1,112 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/wafregional/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func WAFRegionalResources() []*Resource { - resources := []*Resource{ - - { - SubService: "rate_based_rules", - Struct: &types.RateBasedRule{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RateBasedRule.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWafregionalRateBasedRuleArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveWafregionalRateBasedRuleTags`, - }, - }...), - }, - { - SubService: "rule_groups", - Struct: &types.RuleGroup{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RuleGroup.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWafregionalRuleGroupArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "Rule group tags.", - Type: schema.TypeJSON, - Resolver: `resolveWafregionalRuleGroupTags`, - }, - }...), - }, - { - SubService: "rules", - Struct: &types.Rule{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_Rule.html", - SkipFields: []string{}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWafregionalRuleArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "Rule tags.", - Type: schema.TypeJSON, - Resolver: `resolveWafregionalRuleTags`, - }, - }...), - }, - { - SubService: "web_acls", - Struct: &types.WebACL{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_WebACL.html", - SkipFields: []string{"WebACLArn"}, - ExtraColumns: append( - defaultRegionalColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("WebACLArn")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Description: "Web ACL tags.", - Type: schema.TypeJSON, - Resolver: `resolveWafregionalWebACLTags`, - }, - { - Name: "resources_for_web_acl", - Type: schema.TypeStringArray, - Resolver: `resolveWafregionalWebACLResourcesForWebACL`, - }, - }...), - }, - } - - // set default values - for _, r := range resources { - r.Service = "wafregional" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("waf-regional")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/wafv2.go b/plugins/source/aws/codegen/recipes/wafv2.go deleted file mode 100644 index 4b2e0094415d36..00000000000000 --- a/plugins/source/aws/codegen/recipes/wafv2.go +++ /dev/null @@ -1,192 +0,0 @@ -package recipes - -import ( - "reflect" - "strings" - - "github.com/aws/aws-sdk-go-v2/service/wafv2/types" - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/wafv2/models" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func WAFv2Resources() []*Resource { - resources := []*Resource{ - { - SubService: "ipsets", - Struct: &types.IPSet{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_IPSet.html", - SkipFields: []string{"Addresses", "ARN"}, - PreResourceResolver: "getIpset", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - { - Name: "addresses", - Type: schema.TypeInetArray, - Resolver: "resolveIpsetAddresses", - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: "resolveIpsetTags", - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "managed_rule_groups", - Struct: &types.ManagedRuleGroupSummary{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_ManagedRuleGroupSummary.html", - SkipFields: []string{"Scope"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "scope", - Type: schema.TypeString, - Resolver: "client.ResolveWAFScope", - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "properties", - Type: schema.TypeJSON, - Resolver: "resolveManageRuleGroupProperties", - }, - }, - }, - { - SubService: "regex_pattern_sets", - Struct: &types.RegexPatternSet{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_RegexPatternSet.html", - SkipFields: []string{"ARN"}, - PreResourceResolver: "getRegexPatternSet", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: "resolveRegexPatternSetTags", - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - { - SubService: "rule_groups", - Struct: &types.RuleGroup{}, - Description: "https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleGroup.html", - SkipFields: []string{"ARN"}, - PreResourceResolver: "getRuleGroup", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: "resolveRuleGroupTags", - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: `resolveWafv2ruleGroupPolicy`, - }, - }, - }, - { - SubService: "web_acls", - Struct: &models.WebACLWrapper{}, - SkipFields: []string{"ARN"}, - PreResourceResolver: "getWebAcl", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: "client.ResolveAWSAccount", - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: "client.ResolveAWSRegion", - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: "resolveWebACLTags", - }, - { - Name: "resources_for_web_acl", - Type: schema.TypeStringArray, - Resolver: `resolveWafv2webACLResourcesForWebACL`, - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - }, - } - - // set default values - for _, r := range resources { - r.Service = "wafv2" - r.Multiplex = `client.ServiceAccountRegionScopeMultiplexer("waf-regional")` - structName := reflect.ValueOf(r.Struct).Elem().Type().Name() - if strings.Contains(structName, "Wrapper") { - r.UnwrapEmbeddedStructs = true - } - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/workspaces.go b/plugins/source/aws/codegen/recipes/workspaces.go deleted file mode 100644 index 57839b2d976655..00000000000000 --- a/plugins/source/aws/codegen/recipes/workspaces.go +++ /dev/null @@ -1,48 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/workspaces/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func WorkspacesResources() []*Resource { - resources := []*Resource{ - { - SubService: "workspaces", - Struct: &types.Workspace{}, - Description: "https://docs.aws.amazon.com/workspaces/latest/api/API_Workspace.html", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveWorkspaceArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - { - SubService: "directories", - Struct: &types.WorkspaceDirectory{}, - Description: "https://docs.aws.amazon.com/workspaces/latest/api/API_WorkspaceDirectory.html", - ExtraColumns: append( - defaultAccountColumns, - []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `resolveDirectoryArn`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }...), - }, - } - - for _, r := range resources { - r.Service = "workspaces" - r.Multiplex = `client.ServiceAccountRegionMultiplexer("workspaces")` - } - return resources -} diff --git a/plugins/source/aws/codegen/recipes/xray.go b/plugins/source/aws/codegen/recipes/xray.go deleted file mode 100644 index d5d01c83eaf73f..00000000000000 --- a/plugins/source/aws/codegen/recipes/xray.go +++ /dev/null @@ -1,62 +0,0 @@ -package recipes - -import ( - "github.com/aws/aws-sdk-go-v2/service/xray/types" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func XRayResources() []*Resource { - resources := []*Resource{ - { - SubService: "encryption_configs", - Struct: &types.EncryptionConfig{}, - Description: "https://docs.aws.amazon.com/xray/latest/api/API_EncryptionConfig.html", - }, - { - SubService: "groups", - Struct: &types.Group{}, - Description: "https://docs.aws.amazon.com/xray/latest/api/API_Group.html", - SkipFields: []string{"GroupARN"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("GroupARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveXrayGroupTags`, - }, - }, - }, - { - SubService: "sampling_rules", - Struct: &types.SamplingRuleRecord{}, - Description: "https://docs.aws.amazon.com/xray/latest/api/API_SamplingRuleRecord.html", - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "arn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("SamplingRule.RuleARN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: `resolveXraySamplingRuleTags`, - }, - }, - }, - } - - // set default values - for _, r := range resources { - r.Service = "xray" - r.ExtraColumns = append(defaultRegionalColumns, r.ExtraColumns...) - r.Multiplex = `client.ServiceAccountRegionMultiplexer("xray")` - } - return resources -} diff --git a/plugins/source/aws/codegen/services/clients.go b/plugins/source/aws/codegen/services/clients.go deleted file mode 100644 index 4fc76d30becdd6..00000000000000 --- a/plugins/source/aws/codegen/services/clients.go +++ /dev/null @@ -1,207 +0,0 @@ -package services - -import ( - "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" - "github.com/aws/aws-sdk-go-v2/service/account" - "github.com/aws/aws-sdk-go-v2/service/acm" - "github.com/aws/aws-sdk-go-v2/service/amp" - "github.com/aws/aws-sdk-go-v2/service/apigateway" - "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" - "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" - "github.com/aws/aws-sdk-go-v2/service/apprunner" - "github.com/aws/aws-sdk-go-v2/service/appstream" - "github.com/aws/aws-sdk-go-v2/service/appsync" - "github.com/aws/aws-sdk-go-v2/service/athena" - "github.com/aws/aws-sdk-go-v2/service/autoscaling" - "github.com/aws/aws-sdk-go-v2/service/backup" - "github.com/aws/aws-sdk-go-v2/service/cloudformation" - "github.com/aws/aws-sdk-go-v2/service/cloudfront" - "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" - "github.com/aws/aws-sdk-go-v2/service/cloudtrail" - "github.com/aws/aws-sdk-go-v2/service/cloudwatch" - "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" - "github.com/aws/aws-sdk-go-v2/service/codebuild" - "github.com/aws/aws-sdk-go-v2/service/codepipeline" - "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" - "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" - "github.com/aws/aws-sdk-go-v2/service/configservice" - "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" - "github.com/aws/aws-sdk-go-v2/service/dax" - "github.com/aws/aws-sdk-go-v2/service/directconnect" - "github.com/aws/aws-sdk-go-v2/service/docdb" - "github.com/aws/aws-sdk-go-v2/service/dynamodb" - "github.com/aws/aws-sdk-go-v2/service/ec2" - "github.com/aws/aws-sdk-go-v2/service/ecr" - "github.com/aws/aws-sdk-go-v2/service/ecrpublic" - "github.com/aws/aws-sdk-go-v2/service/ecs" - "github.com/aws/aws-sdk-go-v2/service/efs" - "github.com/aws/aws-sdk-go-v2/service/eks" - "github.com/aws/aws-sdk-go-v2/service/elasticache" - "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" - "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" - "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" - "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" - "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" - "github.com/aws/aws-sdk-go-v2/service/emr" - "github.com/aws/aws-sdk-go-v2/service/eventbridge" - "github.com/aws/aws-sdk-go-v2/service/firehose" - "github.com/aws/aws-sdk-go-v2/service/frauddetector" - "github.com/aws/aws-sdk-go-v2/service/fsx" - "github.com/aws/aws-sdk-go-v2/service/glacier" - "github.com/aws/aws-sdk-go-v2/service/glue" - "github.com/aws/aws-sdk-go-v2/service/guardduty" - "github.com/aws/aws-sdk-go-v2/service/iam" - "github.com/aws/aws-sdk-go-v2/service/identitystore" - "github.com/aws/aws-sdk-go-v2/service/inspector" - "github.com/aws/aws-sdk-go-v2/service/inspector2" - "github.com/aws/aws-sdk-go-v2/service/iot" - "github.com/aws/aws-sdk-go-v2/service/kafka" - "github.com/aws/aws-sdk-go-v2/service/kinesis" - "github.com/aws/aws-sdk-go-v2/service/kms" - "github.com/aws/aws-sdk-go-v2/service/lambda" - "github.com/aws/aws-sdk-go-v2/service/lightsail" - "github.com/aws/aws-sdk-go-v2/service/mq" - "github.com/aws/aws-sdk-go-v2/service/mwaa" - "github.com/aws/aws-sdk-go-v2/service/neptune" - "github.com/aws/aws-sdk-go-v2/service/organizations" - "github.com/aws/aws-sdk-go-v2/service/qldb" - "github.com/aws/aws-sdk-go-v2/service/quicksight" - "github.com/aws/aws-sdk-go-v2/service/ram" - "github.com/aws/aws-sdk-go-v2/service/rds" - "github.com/aws/aws-sdk-go-v2/service/redshift" - "github.com/aws/aws-sdk-go-v2/service/resourcegroups" - "github.com/aws/aws-sdk-go-v2/service/route53" - "github.com/aws/aws-sdk-go-v2/service/route53domains" - "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/aws/aws-sdk-go-v2/service/s3control" - "github.com/aws/aws-sdk-go-v2/service/sagemaker" - "github.com/aws/aws-sdk-go-v2/service/scheduler" - "github.com/aws/aws-sdk-go-v2/service/secretsmanager" - "github.com/aws/aws-sdk-go-v2/service/servicecatalog" - "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" - "github.com/aws/aws-sdk-go-v2/service/servicequotas" - "github.com/aws/aws-sdk-go-v2/service/ses" - "github.com/aws/aws-sdk-go-v2/service/sesv2" - "github.com/aws/aws-sdk-go-v2/service/sfn" - "github.com/aws/aws-sdk-go-v2/service/shield" - "github.com/aws/aws-sdk-go-v2/service/sns" - "github.com/aws/aws-sdk-go-v2/service/sqs" - "github.com/aws/aws-sdk-go-v2/service/ssm" - "github.com/aws/aws-sdk-go-v2/service/ssoadmin" - "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" - "github.com/aws/aws-sdk-go-v2/service/transfer" - "github.com/aws/aws-sdk-go-v2/service/waf" - "github.com/aws/aws-sdk-go-v2/service/wafregional" - "github.com/aws/aws-sdk-go-v2/service/wafv2" - "github.com/aws/aws-sdk-go-v2/service/workspaces" - "github.com/aws/aws-sdk-go-v2/service/xray" -) - -var clients = []any{ - &accessanalyzer.Client{}, - &account.Client{}, - &acm.Client{}, - &.Client{}, - &apigateway.Client{}, - &apigatewayv2.Client{}, - &applicationautoscaling.Client{}, - &apprunner.Client{}, - &appstream.Client{}, - &appsync.Client{}, - &athena.Client{}, - &autoscaling.Client{}, - &backup.Client{}, - &cloudformation.Client{}, - &cloudfront.Client{}, - &cloudhsmv2.Client{}, - &cloudtrail.Client{}, - &cloudwatch.Client{}, - &cloudwatchlogs.Client{}, - &codebuild.Client{}, - &codepipeline.Client{}, - &cognitoidentity.Client{}, - &cognitoidentityprovider.Client{}, - &configservice.Client{}, - &databasemigrationservice.Client{}, - &dax.Client{}, - &directconnect.Client{}, - &docdb.Client{}, - &dynamodb.Client{}, - &ec2.Client{}, - &ecr.Client{}, - &ecrpublic.Client{}, - &ecs.Client{}, - &efs.Client{}, - &eks.Client{}, - &elasticache.Client{}, - &elasticbeanstalk.Client{}, - &elasticloadbalancing.Client{}, - &elasticloadbalancingv2.Client{}, - &elasticsearchservice.Client{}, - &elastictranscoder.Client{}, - &emr.Client{}, - &eventbridge.Client{}, - &firehose.Client{}, - &frauddetector.Client{}, - &fsx.Client{}, - &glacier.Client{}, - &glue.Client{}, - &guardduty.Client{}, - &iam.Client{}, - &identitystore.Client{}, - &inspector.Client{}, - &inspector2.Client{}, - &iot.Client{}, - &kafka.Client{}, - &kinesis.Client{}, - &kms.Client{}, - &lambda.Client{}, - &lightsail.Client{}, - &mq.Client{}, - &mwaa.Client{}, - &neptune.Client{}, - &organizations.Client{}, - &qldb.Client{}, - &quicksight.Client{}, - &ram.Client{}, - &rds.Client{}, - &redshift.Client{}, - &resourcegroups.Client{}, - &route53.Client{}, - &route53domains.Client{}, - &s3.Client{}, - &s3control.Client{}, - &sagemaker.Client{}, - &scheduler.Client{}, - &secretsmanager.Client{}, - &servicecatalog.Client{}, - &servicecatalogappregistry.Client{}, - &servicequotas.Client{}, - &ses.Client{}, - &sesv2.Client{}, - &sfn.Client{}, - &shield.Client{}, - &sns.Client{}, - &sqs.Client{}, - &ssm.Client{}, - &ssoadmin.Client{}, - ×treamwrite.Client{}, - &transfer.Client{}, - &waf.Client{}, - &wafregional.Client{}, - &wafv2.Client{}, - &workspaces.Client{}, - &xray.Client{}, -} - -// customClients will read files from the "custom" directory -// and copy the definitions from there. This is useful in some rare cases -// where we need to define our own interfaces or custom imports. -var customClients = []serviceInfo{ - { - Import: "github.com/cloudquery/cloudquery/plugins/source/aws/client/models/s3manager", - Name: "S3manager", - PackageName: "s3manager", - ClientName: "S3managerClient", - }, -} diff --git a/plugins/source/aws/codegen/services/custom/s3manager.go b/plugins/source/aws/codegen/services/custom/s3manager.go deleted file mode 100644 index 2d0bd1c74c69de..00000000000000 --- a/plugins/source/aws/codegen/services/custom/s3manager.go +++ /dev/null @@ -1,11 +0,0 @@ -package services - -import ( - "context" - "github.com/aws/aws-sdk-go-v2/service/s3" -) - -//go:generate mockgen -package=mocks -destination=../mocks/s3manager.go . S3managerClient -type S3managerClient interface { - GetBucketRegion(context.Context, string, ...func(*s3.Options)) (string, error) -} diff --git a/plugins/source/aws/codegen/services/generate.go b/plugins/source/aws/codegen/services/generate.go deleted file mode 100644 index 678b0d7f6c04c1..00000000000000 --- a/plugins/source/aws/codegen/services/generate.go +++ /dev/null @@ -1,206 +0,0 @@ -package services - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "io" - "os" - "path" - "reflect" - "runtime" - "strings" - "text/template" - - "github.com/cloudquery/plugin-sdk/caser" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -// these method name prefixes will be part of the generated client interface -var acceptedPrefixes = []string{ - "List", "Get", "Describe", "Search", "BatchGet", -} - -// these methods will be included despite not starting with an accepted prefix -var exceptions = []string{ - "QuerySchemaVersionMetadata", - "GenerateCredentialReport", -} - -// Adapted from https://stackoverflow.com/a/54129236 -func signature(name string, f any) string { - t := reflect.TypeOf(f) - if t.Kind() != reflect.Func { - return "" - } - - buf := strings.Builder{} - buf.WriteString(name + "(") - for i := 0; i < t.NumIn(); i++ { - if i > 0 { - buf.WriteString(", ") - } - if t.IsVariadic() && i == t.NumIn()-1 { - buf.WriteString("..." + strings.TrimPrefix(t.In(i).String(), "[]")) - } else { - buf.WriteString(t.In(i).String()) - } - } - buf.WriteString(")") - if numOut := t.NumOut(); numOut > 0 { - if numOut > 1 { - buf.WriteString(" (") - } else { - buf.WriteString(" ") - } - for i := 0; i < t.NumOut(); i++ { - if i > 0 { - buf.WriteString(", ") - } - buf.WriteString(t.Out(i).String()) - } - if numOut > 1 { - buf.WriteString(")") - } - } - - return buf.String() -} - -func shouldInclude(name string) bool { - for _, t := range acceptedPrefixes { - if strings.HasPrefix(name, t) { - return true - } - } - for _, e := range exceptions { - if name == e { - return true - } - } - return false -} - -type serviceInfo struct { - Import string - Name string - PackageName string - ClientName string - Signatures []string -} - -func getServiceInfo(client any) serviceInfo { - v := reflect.ValueOf(client) - t := v.Type() - pkgPath := t.Elem().PkgPath() - parts := strings.Split(pkgPath, "/") - pkgName := parts[len(parts)-1] - csr := caser.New() - name := csr.ToPascal(pkgName) - clientName := name + "Client" - signatures := make([]string, 0) - for i := 0; i < t.NumMethod(); i++ { - method := t.Method(i) - if shouldInclude(method.Name) { - sig := signature(method.Name, v.Method(i).Interface()) - signatures = append(signatures, sig) - } - } - return serviceInfo{ - Import: pkgPath, - Name: name, - PackageName: pkgName, - ClientName: clientName, - Signatures: signatures, - } -} - -// Generate generates a services.go file and individual service files from the clients defined in clients.go -func Generate() error { - services := make([]serviceInfo, 0) - for _, client := range clients { - services = append(services, getServiceInfo(client)) - } - - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - - // write services.go file - servicesTpl, err := template.New("services.go.tpl").ParseFS(templatesFS, "templates/services.go.tpl") - if err != nil { - return err - } - - var buff bytes.Buffer - all := append(services, customClients...) - if err := servicesTpl.Execute(&buff, all); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - filePath := path.Join(path.Dir(filename), "../../client/services.go") - formatAndWriteFile(filePath, buff) - - // write individual service files - serviceTpl, err := template.New("service.go.tpl").ParseFS(templatesFS, "templates/service.go.tpl") - if err != nil { - return err - } - - for _, service := range services { - buff = bytes.Buffer{} - if err := serviceTpl.Execute(&buff, service); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - filePath := path.Join(path.Dir(filename), fmt.Sprintf("../../client/services/%s.go", service.PackageName)) - err := formatAndWriteFile(filePath, buff) - if err != nil { - return fmt.Errorf("failed to format and write file for service %v: %w", service.Name, err) - } - } - - for _, custom := range customClients { - src := path.Join(path.Dir(filename), "custom", custom.PackageName+".go") - dst := path.Join(path.Dir(filename), "../../client/services/"+custom.PackageName+".go") - err := copyCustomFile(src, dst) - if err != nil { - return err - } - } - - return nil -} - -func copyCustomFile(src, dst string) error { - source, err := os.Open(src) - if err != nil { - return err - } - defer source.Close() - - destination, err := os.Create(dst) - if err != nil { - return err - } - defer destination.Close() - - _, err = io.Copy(destination, source) - return err -} - -func formatAndWriteFile(filePath string, buff bytes.Buffer) error { - content := buff.Bytes() - formattedContent, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - return nil -} diff --git a/plugins/source/aws/codegen/services/models/s3manager/s3manager.go b/plugins/source/aws/codegen/services/models/s3manager/s3manager.go deleted file mode 100644 index 09b07830f05e31..00000000000000 --- a/plugins/source/aws/codegen/services/models/s3manager/s3manager.go +++ /dev/null @@ -1,22 +0,0 @@ -package s3manager - -import ( - "context" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/feature/s3/manager" - "github.com/aws/aws-sdk-go-v2/service/s3" -) - -type Client struct { - s3Client *s3.Client -} - -func NewFromConfig(cfg aws.Config) Client { - return Client{ - s3Client: s3.NewFromConfig(cfg), - } -} - -func (c Client) GetBucketRegion(ctx context.Context, bucket string, optFns ...func(*s3.Options)) (string, error) { - return manager.GetBucketRegion(ctx, c.s3Client, bucket, optFns...) -} diff --git a/plugins/source/aws/codegen/services/templates/service.go.tpl b/plugins/source/aws/codegen/services/templates/service.go.tpl deleted file mode 100644 index fe09617a950b6c..00000000000000 --- a/plugins/source/aws/codegen/services/templates/service.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. -package services - -import ( - "context" - "{{ $.Import }}" -) - -//go:generate mockgen -package=mocks -destination=../mocks/{{$.PackageName}}.go -source={{$.PackageName}}.go {{$.ClientName}} -type {{$.ClientName}} interface { - {{- range $sig := $.Signatures }} - {{ $sig }} - {{- end }} -} \ No newline at end of file diff --git a/plugins/source/aws/codegen/services/templates/services.go.tpl b/plugins/source/aws/codegen/services/templates/services.go.tpl deleted file mode 100644 index 8b52bd23a23a05..00000000000000 --- a/plugins/source/aws/codegen/services/templates/services.go.tpl +++ /dev/null @@ -1,26 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. -package client - -import ( - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/cloudquery/cloudquery/plugins/source/aws/client/services" - {{- range $service := . }} - "{{ $service.Import }}" - {{- end }} -) - -func initServices(region string, c aws.Config) Services { - awsCfg := c.Copy() - awsCfg.Region = region - return Services{ - {{- range $service := . }} - {{$service.Name}}: {{$service.PackageName}}.NewFromConfig(awsCfg), - {{- end }} - } -} - -type Services struct { - {{- range $service := . }} - {{$service.Name}} services.{{$service.ClientName}} - {{- end }} -} \ No newline at end of file diff --git a/plugins/source/aws/codegen/tables/generate.go b/plugins/source/aws/codegen/tables/generate.go deleted file mode 100644 index 66085c82e64261..00000000000000 --- a/plugins/source/aws/codegen/tables/generate.go +++ /dev/null @@ -1,72 +0,0 @@ -package tables - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "os" - "path" - "runtime" - "strings" - "text/template" - - "github.com/iancoleman/strcase" - - "github.com/cloudquery/cloudquery/plugins/source/aws/codegen/recipes" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func Generate(resources []*recipes.Resource) error { - tpl, err := template.New("tables.go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - }).ParseFS(templatesFS, "templates/tables.go.tpl") - if err != nil { - return err - } - - resources = removeChildResources(resources) - var buff bytes.Buffer - if err := tpl.Execute(&buff, resources); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - - filePath := path.Join(path.Dir(filename), "../../resources/plugin/tables.go") - content := buff.Bytes() - formattedContent, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - - return nil -} - -func removeChildResources(resources []*recipes.Resource) []*recipes.Resource { - filtered := make([]*recipes.Resource, 0) - relations := map[string]bool{} - for _, r := range resources { - for _, rel := range r.Relations { - relations[r.Service+"."+strings.TrimSuffix(rel, "()")] = true - } - } - for _, r := range resources { - funcName := r.Service + "." + strcase.ToCamel(r.SubService) - if relations[funcName] { - continue - } - filtered = append(filtered, r) - } - return filtered -} diff --git a/plugins/source/aws/codegen/tables/templates/tables.go.tpl b/plugins/source/aws/codegen/tables/templates/tables.go.tpl deleted file mode 100644 index 64836a39971820..00000000000000 --- a/plugins/source/aws/codegen/tables/templates/tables.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package plugin - -import ( - "github.com/cloudquery/plugin-sdk/schema" -{{- range $resource := . }} - "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/{{ $resource.Service }}" -{{- end }} -) - -func tables() []*schema.Table { - return []*schema.Table{ - {{- range $resource := . }} - {{ $resource.Service }}.{{ $resource.SubService | ToCamel }}(), - {{- end }} - } -} diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md index 55f2a8c8e29936..33d7bf42aea703 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md @@ -31,6 +31,7 @@ The following tables depend on aws_apigatewayv2_apis: |route_selection_expression|String| |api_endpoint|String| |api_gateway_managed|Bool| +|api_id|String| |api_key_selection_expression|String| |cors_configuration|JSON| |created_date|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md b/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md index 17d74bae46ef01..6639b751ab7be8 100644 --- a/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md +++ b/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |creation_time|Timestamp| +|policy_arn|String| |policy_name|String| |policy_type|String| |resource_id|String| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_auto_scaling_configurations.md b/plugins/source/aws/docs/tables/aws_apprunner_auto_scaling_configurations.md index 1710c5ca524f97..4c6bf98c554978 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_auto_scaling_configurations.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_auto_scaling_configurations.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |tags|JSON| +|auto_scaling_configuration_arn|String| |auto_scaling_configuration_name|String| |auto_scaling_configuration_revision|Int| |created_at|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_connections.md b/plugins/source/aws/docs/tables/aws_apprunner_connections.md index 99e31c32139a91..7f12adb1ea2185 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_connections.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_connections.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |tags|JSON| +|connection_arn|String| |connection_name|String| |created_at|Timestamp| |provider_type|String| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md b/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md index 3afe8ec87e676a..acce0f582764e1 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md @@ -18,7 +18,7 @@ This table depends on [aws_apprunner_services](aws_apprunner_services.md). |_cq_parent_id|UUID| |account_id|String| |region|String| -|domain_name|String| |enable_www_subdomain|Bool| +|domain_name|String| |status|String| |certificate_validation_records|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md b/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md index 84af0de13b17a4..9e454e1a46b6d5 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md @@ -19,6 +19,7 @@ The primary key for this table is **arn**. |created_at|Timestamp| |deleted_at|Timestamp| |latest|Bool| +|observability_configuration_arn|String| |observability_configuration_name|String| |observability_configuration_revision|Int| |status|String| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_services.md b/plugins/source/aws/docs/tables/aws_apprunner_services.md index 51f164585d6ed2..e33ece3430b9f9 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_services.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_services.md @@ -26,6 +26,7 @@ The following tables depend on aws_apprunner_services: |created_at|Timestamp| |instance_configuration|JSON| |network_configuration|JSON| +|service_arn|String| |service_id|String| |service_name|String| |source_configuration|JSON| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md b/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md index 1476283f9c55a9..72d516dd3cb669 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md @@ -21,5 +21,6 @@ The primary key for this table is **arn**. |security_groups|StringArray| |status|String| |subnets|StringArray| +|vpc_connector_arn|String| |vpc_connector_name|String| |vpc_connector_revision|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_apprunner_vpc_ingress_connections.md b/plugins/source/aws/docs/tables/aws_apprunner_vpc_ingress_connections.md index 7c5a6bb602b0fb..dd87ee27e53c30 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_vpc_ingress_connections.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_vpc_ingress_connections.md @@ -26,4 +26,5 @@ The primary key for this table is **arn**. |ingress_vpc_configuration|JSON| |service_arn|String| |status|String| +|vpc_ingress_connection_arn|String| |vpc_ingress_connection_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_group_scaling_policies.md b/plugins/source/aws/docs/tables/aws_autoscaling_group_scaling_policies.md index 535685b92bcffd..745ffff1120563 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_group_scaling_policies.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_group_scaling_policies.md @@ -29,6 +29,7 @@ This table depends on [aws_autoscaling_groups](aws_autoscaling_groups.md). |metric_aggregation_type|String| |min_adjustment_magnitude|Int| |min_adjustment_step|Int| +|policy_arn|String| |policy_name|String| |policy_type|String| |predictive_scaling_configuration|JSON| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_groups.md b/plugins/source/aws/docs/tables/aws_autoscaling_groups.md index 9175a26d0b8ada..81df163e29e7b6 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_groups.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_groups.md @@ -31,6 +31,7 @@ The following tables depend on aws_autoscaling_groups: |health_check_type|String| |max_size|Int| |min_size|Int| +|auto_scaling_group_arn|String| |capacity_rebalance|Bool| |context|String| |default_instance_warmup|Int| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md b/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md index 6454a34866af9c..19c8d32edc4c26 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md @@ -28,6 +28,7 @@ The primary key for this table is **arn**. |instance_monitoring|JSON| |kernel_id|String| |key_name|String| +|launch_configuration_arn|String| |metadata_options|JSON| |placement_tenancy|String| |ramdisk_id|String| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md b/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md index a6de2dd939fa73..db1f4ff40c2fdf 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md @@ -21,6 +21,7 @@ The primary key for this table is **arn**. |max_size|Int| |min_size|Int| |recurrence|String| +|scheduled_action_arn|String| |scheduled_action_name|String| |start_time|Timestamp| |time|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_backup_plans.md b/plugins/source/aws/docs/tables/aws_backup_plans.md index 806d52fdd1f97a..e3e4366f7b9325 100644 --- a/plugins/source/aws/docs/tables/aws_backup_plans.md +++ b/plugins/source/aws/docs/tables/aws_backup_plans.md @@ -23,6 +23,7 @@ The following tables depend on aws_backup_plans: |tags|JSON| |advanced_backup_settings|JSON| |backup_plan|JSON| +|backup_plan_arn|String| |backup_plan_id|String| |creation_date|Timestamp| |creator_request_id|String| diff --git a/plugins/source/aws/docs/tables/aws_backup_vault_recovery_points.md b/plugins/source/aws/docs/tables/aws_backup_vault_recovery_points.md index 7d3f8e85775086..034b37fda431de 100644 --- a/plugins/source/aws/docs/tables/aws_backup_vault_recovery_points.md +++ b/plugins/source/aws/docs/tables/aws_backup_vault_recovery_points.md @@ -36,6 +36,7 @@ This table depends on [aws_backup_vaults](aws_backup_vaults.md). |last_restore_time|Timestamp| |lifecycle|JSON| |parent_recovery_point_arn|String| +|recovery_point_arn|String| |resource_arn|String| |resource_type|String| |source_backup_vault_arn|String| diff --git a/plugins/source/aws/docs/tables/aws_backup_vaults.md b/plugins/source/aws/docs/tables/aws_backup_vaults.md index 451b3a14b97cab..0a47b19e861e3a 100644 --- a/plugins/source/aws/docs/tables/aws_backup_vaults.md +++ b/plugins/source/aws/docs/tables/aws_backup_vaults.md @@ -23,6 +23,7 @@ The following tables depend on aws_backup_vaults: |access_policy|JSON| |notifications|JSON| |tags|JSON| +|backup_vault_arn|String| |backup_vault_name|String| |creation_date|Timestamp| |creator_request_id|String| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md b/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md index 4f65041a229509..ba7fe5698744db 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md @@ -39,6 +39,7 @@ The following tables depend on aws_cloudformation_stacks: |role_arn|String| |rollback_configuration|JSON| |root_id|String| +|stack_id|String| |stack_status_reason|String| |tags|JSON| |timeout_in_minutes|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md b/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md index de24dcad336cb4..a8445c91e05145 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md @@ -37,4 +37,5 @@ The following tables depend on aws_cloudtrail_trails: |s3_key_prefix|String| |sns_topic_arn|String| |sns_topic_name|String| +|trail_arn|String| |tags|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md index 9d31be81ed3a76..d0c8d0c0afde09 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md @@ -14,6 +14,6 @@ The composite primary key for this table is (**account_id**, **region**, **polic |_cq_parent_id|UUID| |account_id (PK)|String| |region (PK)|String| +|policy_name (PK)|String| |policy_document|JSON| -|last_updated_time|Int| -|policy_name (PK)|String| \ No newline at end of file +|last_updated_time|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md b/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md index 73e0936c948de2..db1051b384bb20 100644 --- a/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md +++ b/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md @@ -15,4 +15,5 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |metadata|JSON| -|pipeline|JSON| \ No newline at end of file +|pipeline|JSON| +|result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md b/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md index ef0c1d8831017a..7c7c9019ca566c 100644 --- a/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md +++ b/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md @@ -15,9 +15,9 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |definition|JSON| |url|String| |error_code|String| |error_message|String| -|last_triggered|Timestamp| -|tags|JSON| \ No newline at end of file +|last_triggered|Timestamp| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md b/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md index a3619f5e682a74..c3753457af19d3 100644 --- a/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md +++ b/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md @@ -14,13 +14,14 @@ The composite primary key for this table is (**account_id**, **region**, **id**) |region (PK)|String| |arn|String| |id (PK)|String| +|saml_provider_ar_ns|StringArray| |allow_unauthenticated_identities|Bool| +|identity_pool_id|String| |identity_pool_name|String| |allow_classic_flow|Bool| |cognito_identity_providers|JSON| |developer_provider_name|String| |identity_pool_tags|JSON| |open_id_connect_provider_ar_ns|StringArray| -|saml_provider_ar_ns|StringArray| |supported_login_providers|JSON| |result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_config_config_rules.md b/plugins/source/aws/docs/tables/aws_config_config_rules.md index c6e134f7288e0a..d587fff53a49aa 100644 --- a/plugins/source/aws/docs/tables/aws_config_config_rules.md +++ b/plugins/source/aws/docs/tables/aws_config_config_rules.md @@ -19,6 +19,7 @@ The following tables depend on aws_config_config_rules: |region|String| |arn (PK)|String| |source|JSON| +|config_rule_arn|String| |config_rule_id|String| |config_rule_name|String| |config_rule_state|String| diff --git a/plugins/source/aws/docs/tables/aws_config_conformance_packs.md b/plugins/source/aws/docs/tables/aws_config_conformance_packs.md index 42bacd301b5535..e534eb5920c6c8 100644 --- a/plugins/source/aws/docs/tables/aws_config_conformance_packs.md +++ b/plugins/source/aws/docs/tables/aws_config_conformance_packs.md @@ -20,8 +20,10 @@ The following tables depend on aws_config_conformance_packs: |account_id|String| |region|String| |arn (PK)|String| +|conformance_pack_arn|String| |conformance_pack_id|String| |conformance_pack_name|String| +|conformance_pack_input_parameters|JSON| |created_by|String| |delivery_s3_bucket|String| |delivery_s3_key_prefix|String| diff --git a/plugins/source/aws/docs/tables/aws_dax_clusters.md b/plugins/source/aws/docs/tables/aws_dax_clusters.md index 0c23cceae42289..808b3664ccf5a2 100644 --- a/plugins/source/aws/docs/tables/aws_dax_clusters.md +++ b/plugins/source/aws/docs/tables/aws_dax_clusters.md @@ -17,6 +17,7 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |active_nodes|Int| +|cluster_arn|String| |cluster_discovery_endpoint|JSON| |cluster_endpoint_encryption_type|String| |cluster_name|String| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_connections.md b/plugins/source/aws/docs/tables/aws_directconnect_connections.md index 4dde240cfc1171..b106d265379d2c 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_connections.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_connections.md @@ -20,6 +20,7 @@ The composite primary key for this table is (**arn**, **id**). |aws_device_v2|String| |aws_logical_device_id|String| |bandwidth|String| +|connection_id|String| |connection_name|String| |connection_state|String| |encryption_mode|String| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_gateways.md b/plugins/source/aws/docs/tables/aws_directconnect_gateways.md index cc6679db6a5f17..baa9ee30b1ec5a 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_gateways.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_gateways.md @@ -23,6 +23,7 @@ The following tables depend on aws_directconnect_gateways: |arn (PK)|String| |id|String| |amazon_side_asn|Int| +|direct_connect_gateway_id|String| |direct_connect_gateway_name|String| |direct_connect_gateway_state|String| |owner_account|String| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_lags.md b/plugins/source/aws/docs/tables/aws_directconnect_lags.md index 0bde1736dc7a65..5d7c6c257bf307 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_lags.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_lags.md @@ -26,6 +26,7 @@ The primary key for this table is **arn**. |encryption_mode|String| |has_logical_redundancy|String| |jumbo_frame_capable|Bool| +|lag_id|String| |lag_name|String| |lag_state|String| |location|String| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md b/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md index b797b6d5b3d8cf..1becfeb0413b21 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md @@ -15,4 +15,5 @@ The composite primary key for this table is (**account_id**, **region**, **id**) |account_id (PK)|String| |region (PK)|String| |id (PK)|String| +|virtual_gateway_id|String| |virtual_gateway_state|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md b/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md index 668e9da1e5f8ea..cefec4fc4a9891 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |id|String| +|tags|JSON| |address_family|String| |amazon_address|String| |amazon_side_asn|Int| @@ -34,8 +35,8 @@ The primary key for this table is **arn**. |owner_account|String| |route_filter_prefixes|JSON| |site_link_enabled|Bool| -|tags|JSON| |virtual_gateway_id|String| +|virtual_interface_id|String| |virtual_interface_name|String| |virtual_interface_state|String| |virtual_interface_type|String| diff --git a/plugins/source/aws/docs/tables/aws_dms_replication_instances.md b/plugins/source/aws/docs/tables/aws_dms_replication_instances.md index 6df702ddccfc71..8af2b7ec8c8dda 100644 --- a/plugins/source/aws/docs/tables/aws_dms_replication_instances.md +++ b/plugins/source/aws/docs/tables/aws_dms_replication_instances.md @@ -28,6 +28,7 @@ The primary key for this table is **arn**. |pending_modified_values|JSON| |preferred_maintenance_window|String| |publicly_accessible|Bool| +|replication_instance_arn|String| |replication_instance_class|String| |replication_instance_identifier|String| |replication_instance_ipv6_addresses|StringArray| diff --git a/plugins/source/aws/docs/tables/aws_docdb_certificates.md b/plugins/source/aws/docs/tables/aws_docdb_certificates.md index 4b73302194af57..060f121567bd64 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_certificates.md +++ b/plugins/source/aws/docs/tables/aws_docdb_certificates.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|certificate_arn|String| |certificate_identifier|String| |certificate_type|String| |thumbprint|String| diff --git a/plugins/source/aws/docs/tables/aws_docdb_cluster_parameter_groups.md b/plugins/source/aws/docs/tables/aws_docdb_cluster_parameter_groups.md index cdf73cde1cd9b8..3a78a5d42faf8b 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_cluster_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_docdb_cluster_parameter_groups.md @@ -19,4 +19,5 @@ The primary key for this table is **arn**. |parameters|JSON| |db_cluster_parameter_group_name|String| |db_parameter_group_family|String| +|db_cluster_parameter_group_arn|String| |description|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md b/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md index a3f6ddf7035432..36199e85254228 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md @@ -21,10 +21,11 @@ This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). |tags|JSON| |arn (PK)|String| |attributes|JSON| -|availability_zones|StringArray| -|cluster_create_time|Timestamp| |db_cluster_identifier|String| |db_cluster_snapshot_identifier|String| +|availability_zones|StringArray| +|cluster_create_time|Timestamp| +|db_cluster_snapshot_arn|String| |engine|String| |engine_version|String| |kms_key_id|String| diff --git a/plugins/source/aws/docs/tables/aws_docdb_clusters.md b/plugins/source/aws/docs/tables/aws_docdb_clusters.md index d57bccd32e111c..62b743bb3d74c9 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_clusters.md +++ b/plugins/source/aws/docs/tables/aws_docdb_clusters.md @@ -27,6 +27,7 @@ The following tables depend on aws_docdb_clusters: |backup_retention_period|Int| |clone_group_id|String| |cluster_create_time|Timestamp| +|db_cluster_arn|String| |db_cluster_identifier|String| |db_cluster_members|JSON| |db_cluster_parameter_group|String| diff --git a/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md b/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md index c191f433b4db53..7ef82a9353bb40 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md +++ b/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md @@ -19,6 +19,7 @@ The primary key for this table is **arn**. |deletion_protection|Bool| |engine|String| |engine_version|String| +|global_cluster_arn|String| |global_cluster_identifier|String| |global_cluster_members|JSON| |global_cluster_resource_id|String| diff --git a/plugins/source/aws/docs/tables/aws_docdb_instances.md b/plugins/source/aws/docs/tables/aws_docdb_instances.md index 8f705c614c2451..f0a6b98e27e0d4 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_instances.md +++ b/plugins/source/aws/docs/tables/aws_docdb_instances.md @@ -26,6 +26,7 @@ This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). |ca_certificate_identifier|String| |copy_tags_to_snapshot|Bool| |db_cluster_identifier|String| +|db_instance_arn|String| |db_instance_class|String| |db_instance_identifier|String| |db_instance_status|String| diff --git a/plugins/source/aws/docs/tables/aws_docdb_pending_maintenance_actions.md b/plugins/source/aws/docs/tables/aws_docdb_pending_maintenance_actions.md index e3130131b874ca..c5b880fa657991 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_pending_maintenance_actions.md +++ b/plugins/source/aws/docs/tables/aws_docdb_pending_maintenance_actions.md @@ -14,9 +14,5 @@ The primary key for this table is **_cq_id**. |_cq_parent_id|UUID| |account_id|String| |region|String| -|action|String| -|auto_applied_after_date|Timestamp| -|current_apply_date|Timestamp| -|description|String| -|forced_apply_date|Timestamp| -|opt_in_status|String| \ No newline at end of file +|pending_maintenance_action_details|JSON| +|resource_identifier|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md b/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md index dcf576cfeabeb4..33bf88f6214bd9 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |tags|JSON| |arn (PK)|String| +|db_subnet_group_arn|String| |db_subnet_group_description|String| |db_subnet_group_name|String| |subnet_group_status|String| diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_tables.md b/plugins/source/aws/docs/tables/aws_dynamodb_tables.md index a8b851e941a15e..aeec6457ce3e57 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_tables.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_tables.md @@ -38,6 +38,7 @@ The following tables depend on aws_dynamodb_tables: |restore_summary|JSON| |sse_description|JSON| |stream_specification|JSON| +|table_arn|String| |table_class_summary|JSON| |table_id|String| |table_name|String| diff --git a/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md b/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md index 6e638c5b8a38e3..4df9b07737567f 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |attribute|JSON| +|tags|JSON| |data_encryption_key_id|String| |description|String| |encrypted|Bool| @@ -30,6 +31,5 @@ The primary key for this table is **arn**. |state|String| |state_message|String| |storage_tier|String| -|tags|JSON| |volume_id|String| |volume_size|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md b/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md index 3de7af1d8763dd..28ea125ebe598d 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |attachments|JSON| |availability_zone|String| |create_time|Timestamp| @@ -27,7 +28,6 @@ The primary key for this table is **arn**. |size|Int| |snapshot_id|String| |state|String| -|tags|JSON| |throughput|Int| |volume_id|String| |volume_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_egress_only_internet_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_egress_only_internet_gateways.md index 66ea0cd86fcdc6..dd38f8cc271191 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_egress_only_internet_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_egress_only_internet_gateways.md @@ -15,6 +15,6 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |attachments|JSON| -|egress_only_internet_gateway_id|String| -|tags|JSON| \ No newline at end of file +|egress_only_internet_gateway_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_eips.md b/plugins/source/aws/docs/tables/aws_ec2_eips.md index 1600645aa9ef43..66fc95af0de52b 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_eips.md +++ b/plugins/source/aws/docs/tables/aws_ec2_eips.md @@ -14,6 +14,7 @@ The primary key for this table is **_cq_id**. |_cq_parent_id|UUID| |account_id|String| |region|String| +|tags|JSON| |allocation_id|String| |association_id|String| |carrier_ip|String| @@ -26,5 +27,4 @@ The primary key for this table is **_cq_id**. |network_interface_owner_id|String| |private_ip_address|String| |public_ip|String| -|public_ipv4_pool|String| -|tags|JSON| \ No newline at end of file +|public_ipv4_pool|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md b/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md index 7c83a11bcad3ae..7e197d637140e6 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |creation_time|Timestamp| |deliver_cross_account_role|String| |deliver_logs_error_message|String| @@ -29,5 +30,4 @@ The primary key for this table is **arn**. |log_group_name|String| |max_aggregation_interval|Int| |resource_id|String| -|tags|JSON| |traffic_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_hosts.md b/plugins/source/aws/docs/tables/aws_ec2_hosts.md index 4f216cc9438dba..5430ca68e22c65 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_hosts.md +++ b/plugins/source/aws/docs/tables/aws_ec2_hosts.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |allocation_time|Timestamp| |allows_multiple_instance_types|String| |auto_placement|String| @@ -31,5 +32,4 @@ The primary key for this table is **arn**. |outpost_arn|String| |owner_id|String| |release_time|Timestamp| -|state|String| -|tags|JSON| \ No newline at end of file +|state|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_images.md b/plugins/source/aws/docs/tables/aws_ec2_images.md index 6678e8d424b3f1..f9ade88e5e867e 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_images.md +++ b/plugins/source/aws/docs/tables/aws_ec2_images.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |architecture|String| |block_device_mappings|JSON| |boot_mode|String| @@ -41,7 +42,6 @@ The primary key for this table is **arn**. |sriov_net_support|String| |state|String| |state_reason|JSON| -|tags|JSON| |tpm_support|String| |usage_operation|String| |virtualization_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md index a951d9b54af172..2db333795f71af 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md @@ -15,7 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |attachments|JSON| |internet_gateway_id|String| -|owner_id|String| -|tags|JSON| \ No newline at end of file +|owner_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md b/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md index 8c1a7659f7e76e..7042f2116168b6 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md @@ -15,10 +15,10 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |create_time|Timestamp| |key_fingerprint|String| |key_name|String| |key_pair_id|String| |key_type|String| -|public_key|String| -|tags|JSON| \ No newline at end of file +|public_key|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md index c3ef89124437a4..c82ab1f778de76 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |connectivity_type|String| |create_time|Timestamp| |delete_time|Timestamp| @@ -25,5 +26,4 @@ The primary key for this table is **arn**. |provisioned_bandwidth|JSON| |state|String| |subnet_id|String| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_network_acls.md b/plugins/source/aws/docs/tables/aws_ec2_network_acls.md index 43ae7a0634ef6b..4fa3abf7323288 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_network_acls.md +++ b/plugins/source/aws/docs/tables/aws_ec2_network_acls.md @@ -15,10 +15,10 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |associations|JSON| |entries|JSON| |is_default|Bool| |network_acl_id|String| |owner_id|String| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md b/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md index 8854b344d15631..4c69dea604ed22 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md +++ b/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |availability_zone|String| |currency_code|String| |duration|Int| @@ -31,5 +32,4 @@ The primary key for this table is **arn**. |scope|String| |start|Timestamp| |state|String| -|tags|JSON| |usage_price|Float| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_route_tables.md b/plugins/source/aws/docs/tables/aws_ec2_route_tables.md index 753b19504723c1..68e1499f4c0762 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_route_tables.md +++ b/plugins/source/aws/docs/tables/aws_ec2_route_tables.md @@ -15,10 +15,10 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |associations|JSON| |owner_id|String| |propagating_vgws|JSON| |route_table_id|String| |routes|JSON| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_security_groups.md b/plugins/source/aws/docs/tables/aws_ec2_security_groups.md index a0850d806017bb..9e3da538659e42 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_security_groups.md +++ b/plugins/source/aws/docs/tables/aws_ec2_security_groups.md @@ -15,11 +15,11 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |description|String| |group_id|String| |group_name|String| |ip_permissions|JSON| |ip_permissions_egress|JSON| |owner_id|String| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_subnets.md b/plugins/source/aws/docs/tables/aws_ec2_subnets.md index c95c3cd01d40dc..96d43532e53e49 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_subnets.md +++ b/plugins/source/aws/docs/tables/aws_ec2_subnets.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |assign_ipv6_address_on_creation|Bool| |availability_zone|String| |availability_zone_id|String| @@ -34,5 +35,4 @@ The primary key for this table is **arn**. |state|String| |subnet_arn|String| |subnet_id|String| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_attachments.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_attachments.md index 603904b2b28124..8a35c891db9f50 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_attachments.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_attachments.md @@ -19,13 +19,13 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). |account_id|String| |region|String| |transit_gateway_arn|String| +|tags|JSON| |association|JSON| |creation_time|Timestamp| |resource_id|String| |resource_owner_id|String| |resource_type|String| |state|String| -|tags|JSON| |transit_gateway_attachment_id|String| |transit_gateway_id|String| |transit_gateway_owner_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_multicast_domains.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_multicast_domains.md index c3afebcc745a50..f9a8cb27fa9b7a 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_multicast_domains.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_multicast_domains.md @@ -19,11 +19,11 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). |account_id|String| |region|String| |transit_gateway_arn|String| +|tags|JSON| |creation_time|Timestamp| |options|JSON| |owner_id|String| |state|String| -|tags|JSON| |transit_gateway_id|String| |transit_gateway_multicast_domain_arn|String| |transit_gateway_multicast_domain_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_peering_attachments.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_peering_attachments.md index b98156fcd099a4..421ab200e8c335 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_peering_attachments.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_peering_attachments.md @@ -19,6 +19,7 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). |account_id|String| |region|String| |transit_gateway_arn|String| +|tags|JSON| |accepter_tgw_info|JSON| |accepter_transit_gateway_attachment_id|String| |creation_time|Timestamp| @@ -26,5 +27,4 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). |requester_tgw_info|JSON| |state|String| |status|JSON| -|tags|JSON| |transit_gateway_attachment_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_route_tables.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_route_tables.md index 800bed6d3234a0..e5959a74a13bff 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_route_tables.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_route_tables.md @@ -19,10 +19,10 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). |account_id|String| |region|String| |transit_gateway_arn|String| +|tags|JSON| |creation_time|Timestamp| |default_association_route_table|Bool| |default_propagation_route_table|Bool| |state|String| -|tags|JSON| |transit_gateway_id|String| |transit_gateway_route_table_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md index 9cc8f305fddc89..234aaf8b10431b 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md @@ -25,9 +25,11 @@ The following tables depend on aws_ec2_transit_gateways: |region|String| |id|String| |arn (PK)|String| +|tags|JSON| |creation_time|Timestamp| |description|String| |options|JSON| |owner_id|String| |state|String| -|tags|JSON| \ No newline at end of file +|transit_gateway_arn|String| +|transit_gateway_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_configurations.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_configurations.md index 84bccf39962ff2..f85817ae06fdb5 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_configurations.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_configurations.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |acceptance_required|Bool| |availability_zones|StringArray| |base_endpoint_dns_names|StringArray| @@ -28,5 +29,4 @@ The primary key for this table is **arn**. |service_name|String| |service_state|String| |service_type|JSON| -|supported_ip_address_types|StringArray| -|tags|JSON| \ No newline at end of file +|supported_ip_address_types|StringArray| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_services.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_services.md index 31380576da1fbf..cb16b5cb96dc54 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_services.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_services.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |acceptance_required|Bool| |availability_zones|StringArray| |base_endpoint_dns_names|StringArray| @@ -28,5 +29,4 @@ The primary key for this table is **arn**. |service_name|String| |service_type|JSON| |supported_ip_address_types|StringArray| -|tags|JSON| |vpc_endpoint_policy_supported|Bool| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md index f4230d48871c16..0bc6de3e463560 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |creation_timestamp|Timestamp| |dns_entries|JSON| |dns_options|JSON| @@ -30,7 +31,6 @@ The primary key for this table is **arn**. |service_name|String| |state|String| |subnet_ids|StringArray| -|tags|JSON| |vpc_endpoint_id|String| |vpc_endpoint_type|String| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_peering_connections.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_peering_connections.md index 713b287d06cc77..510c0258a260ae 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_peering_connections.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_peering_connections.md @@ -15,9 +15,9 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |accepter_vpc_info|JSON| |expiration_time|Timestamp| |requester_vpc_info|JSON| |status|JSON| -|tags|JSON| |vpc_peering_connection_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpcs.md b/plugins/source/aws/docs/tables/aws_ec2_vpcs.md index 25fc4595748609..482fe8cd64cf23 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpcs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpcs.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |cidr_block|String| |cidr_block_association_set|JSON| |dhcp_options_id|String| @@ -23,5 +24,4 @@ The primary key for this table is **arn**. |is_default|Bool| |owner_id|String| |state|String| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md index db0b149241162f..25c51533869be3 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md @@ -15,10 +15,10 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |amazon_side_asn|Int| |availability_zone|String| |state|String| -|tags|JSON| |type|String| |vpc_attachments|JSON| |vpn_gateway_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_registries.md b/plugins/source/aws/docs/tables/aws_ecr_registries.md index 7318c851bf9e1a..d9a9c05cb0c29b 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_registries.md +++ b/plugins/source/aws/docs/tables/aws_ecr_registries.md @@ -13,4 +13,5 @@ The composite primary key for this table is (**account_id**, **region**, **regis |account_id (PK)|String| |region (PK)|String| |registry_id (PK)|String| -|replication_configuration|JSON| \ No newline at end of file +|replication_configuration|JSON| +|result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md b/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md index 80444e31ce54d6..c7233fdaa5094d 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md +++ b/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md @@ -13,4 +13,5 @@ The composite primary key for this table is (**account_id**, **region**, **regis |account_id (PK)|String| |region (PK)|String| |registry_id (PK)|String| -|policy_text|JSON| \ No newline at end of file +|policy_text|JSON| +|result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_repositories.md b/plugins/source/aws/docs/tables/aws_ecr_repositories.md index 33b127aedef1c0..1ca355ff237341 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repositories.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repositories.md @@ -27,5 +27,6 @@ The following tables depend on aws_ecr_repositories: |image_scanning_configuration|JSON| |image_tag_mutability|String| |registry_id|String| +|repository_arn|String| |repository_name|String| |repository_uri|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md b/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md index 9e9762f4a02ae3..20b2393f022205 100644 --- a/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md +++ b/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md @@ -23,5 +23,6 @@ The following tables depend on aws_ecrpublic_repositories: |tags|JSON| |created_at|Timestamp| |registry_id|String| +|repository_arn|String| |repository_name|String| |repository_uri|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md b/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md index cfbdcf41501eea..4fd11a82a87e08 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md @@ -19,6 +19,7 @@ This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |capacity_provider_strategy|JSON| |cluster_arn|String| |created_at|Timestamp| @@ -43,9 +44,9 @@ This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). |role_arn|String| |running_count|Int| |scheduling_strategy|String| +|service_arn|String| |service_name|String| |service_registries|JSON| |status|String| -|tags|JSON| |task_definition|String| |task_sets|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md b/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md index a85bfd961820dc..08be088a48249f 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md @@ -53,5 +53,6 @@ This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). |stopped_at|Timestamp| |stopped_reason|String| |stopping_at|Timestamp| +|task_arn|String| |task_definition_arn|String| |version|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecs_clusters.md b/plugins/source/aws/docs/tables/aws_ecs_clusters.md index 388e638697cfaf..ec34bb4702e807 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_clusters.md +++ b/plugins/source/aws/docs/tables/aws_ecs_clusters.md @@ -22,10 +22,12 @@ The following tables depend on aws_ecs_clusters: |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |active_services_count|Int| |attachments|JSON| |attachments_status|String| |capacity_providers|StringArray| +|cluster_arn|String| |cluster_name|String| |configuration|JSON| |default_capacity_provider_strategy|JSON| @@ -35,5 +37,4 @@ The following tables depend on aws_ecs_clusters: |service_connect_defaults|JSON| |settings|JSON| |statistics|JSON| -|status|String| -|tags|JSON| \ No newline at end of file +|status|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md b/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md index e7b4287fb57cf0..d54b1e187d9d44 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md +++ b/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md @@ -37,5 +37,6 @@ The primary key for this table is **arn**. |revision|Int| |runtime_platform|JSON| |status|String| +|task_definition_arn|String| |task_role_arn|String| |volumes|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_efs_filesystems.md b/plugins/source/aws/docs/tables/aws_efs_filesystems.md index f5aabb78a51a1c..1cf92f40862d4c 100644 --- a/plugins/source/aws/docs/tables/aws_efs_filesystems.md +++ b/plugins/source/aws/docs/tables/aws_efs_filesystems.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |backup_policy_status|String| +|tags|JSON| |creation_time|Timestamp| |creation_token|String| |file_system_id|String| @@ -24,10 +25,10 @@ The primary key for this table is **arn**. |owner_id|String| |performance_mode|String| |size_in_bytes|JSON| -|tags|JSON| |availability_zone_id|String| |availability_zone_name|String| |encrypted|Bool| +|file_system_arn|String| |kms_key_id|String| |name|String| |provisioned_throughput_in_mibps|Float| diff --git a/plugins/source/aws/docs/tables/aws_eks_clusters.md b/plugins/source/aws/docs/tables/aws_eks_clusters.md index 57c79c227125c5..6475a340ea969d 100644 --- a/plugins/source/aws/docs/tables/aws_eks_clusters.md +++ b/plugins/source/aws/docs/tables/aws_eks_clusters.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |certificate_authority|JSON| |client_request_token|String| |connector_config|JSON| @@ -32,5 +33,4 @@ The primary key for this table is **arn**. |resources_vpc_config|JSON| |role_arn|String| |status|String| -|tags|JSON| |version|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes.md b/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes.md index e4a84b14baad39..188152a72b1c55 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes.md @@ -22,6 +22,7 @@ The primary key for this table is **arn**. |offering_type|String| |product_description|String| |recurring_charges|JSON| +|reservation_arn|String| |reserved_cache_node_id|String| |reserved_cache_nodes_offering_id|String| |start_time|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md index 0361b6b1ea93c3..7b304845b040c0 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |application_name|String| +|application_version_arn|String| |build_arn|String| |date_created|Timestamp| |date_updated|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md index a32a542fcebddb..6057ea11666309 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md @@ -16,6 +16,7 @@ The composite primary key for this table is (**arn**, **date_created**). |region|String| |arn (PK)|String| |date_created (PK)|Timestamp| +|application_arn|String| |application_name|String| |configuration_templates|StringArray| |date_updated|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md index 9d21504f6b9f61..89a38d5eb81b20 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md @@ -31,6 +31,8 @@ The following tables depend on aws_elasticbeanstalk_environments: |date_updated|Timestamp| |description|String| |endpoint_url|String| +|environment_arn|String| +|environment_id|String| |environment_links|JSON| |environment_name|String| |health|String| diff --git a/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md b/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md index 24ac957a539793..91c4f165034728 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md @@ -14,12 +14,13 @@ The composite primary key for this table is (**account_id**, **region**, **id**) |_cq_parent_id|UUID| |account_id (PK)|String| |region (PK)|String| +|id (PK)|String| |available_package_version|String| |created_at|Timestamp| |error_details|JSON| |last_updated_at|Timestamp| |package_description|String| -|id (PK)|String| +|package_id|String| |package_name|String| |package_status|String| |package_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md b/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md index ed413a3ba7e7aa..38d5e094c574f4 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md @@ -14,9 +14,10 @@ The primary key for this table is **id**. |_cq_parent_id|UUID| |account_id|String| |region|String| +|id (PK)|String| |domain_arn|String| |endpoint|String| |status|String| -|id (PK)|String| +|vpc_endpoint_id|String| |vpc_endpoint_owner|String| |vpc_options|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elbv2_listeners.md b/plugins/source/aws/docs/tables/aws_elbv2_listeners.md index 383d259e1f3df6..7a3b1fed14d883 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_listeners.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_listeners.md @@ -26,6 +26,7 @@ The following tables depend on aws_elbv2_listeners: |alpn_policy|StringArray| |certificates|JSON| |default_actions|JSON| +|listener_arn|String| |load_balancer_arn|String| |port|Int| |protocol|String| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md b/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md index 0362b45aae7b6a..c1c18c0e9643b8 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md @@ -29,6 +29,7 @@ The following tables depend on aws_elbv2_load_balancers: |customer_owned_ipv4_pool|String| |dns_name|String| |ip_address_type|String| +|load_balancer_arn|String| |load_balancer_name|String| |scheme|String| |security_groups|StringArray| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md b/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md index 2ba502191b4a7a..eb8002cb312a2d 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md @@ -34,6 +34,7 @@ The following tables depend on aws_elbv2_target_groups: |port|Int| |protocol|String| |protocol_version|String| +|target_group_arn|String| |target_group_name|String| |target_type|String| |unhealthy_threshold_count|Int| diff --git a/plugins/source/aws/docs/tables/aws_emr_clusters.md b/plugins/source/aws/docs/tables/aws_emr_clusters.md index 519c3b71d0d949..27431f9bae001b 100644 --- a/plugins/source/aws/docs/tables/aws_emr_clusters.md +++ b/plugins/source/aws/docs/tables/aws_emr_clusters.md @@ -15,9 +15,11 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |applications|JSON| |auto_scaling_role|String| |auto_terminate|Bool| +|cluster_arn|String| |configurations|JSON| |custom_ami_id|String| |ebs_root_volume_size|Int| @@ -42,6 +44,5 @@ The primary key for this table is **arn**. |service_role|String| |status|JSON| |step_concurrency_level|Int| -|tags|JSON| |termination_protected|Bool| |visible_to_all_users|Bool| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md b/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md index 75ca07602b2537..ae149ba9725a6b 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|api_destination_arn|String| |api_destination_state|String| |connection_arn|String| |creation_time|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_connections.md b/plugins/source/aws/docs/tables/aws_eventbridge_connections.md index 6569613f6157b8..d2e20835a1f15a 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_connections.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_connections.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |authorization_type|String| +|connection_arn|String| |connection_state|String| |creation_time|Timestamp| |last_authorized_time|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md b/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md index 1e939aa85f9d27..89f552b90ec8ad 100644 --- a/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md +++ b/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |tags|JSON| |arn (PK)|String| +|delivery_stream_arn|String| |delivery_stream_name|String| |delivery_stream_status|String| |delivery_stream_type|String| diff --git a/plugins/source/aws/docs/tables/aws_fsx_backups.md b/plugins/source/aws/docs/tables/aws_fsx_backups.md index f998fb4a5c2a65..a0f8e0727130a3 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_backups.md +++ b/plugins/source/aws/docs/tables/aws_fsx_backups.md @@ -15,6 +15,8 @@ The composite primary key for this table is (**account_id**, **region**, **id**) |account_id (PK)|String| |region (PK)|String| |id (PK)|String| +|tags|JSON| +|backup_id|String| |creation_time|Timestamp| |file_system|JSON| |lifecycle|String| @@ -28,5 +30,4 @@ The composite primary key for this table is (**account_id**, **region**, **id**) |resource_type|String| |source_backup_id|String| |source_backup_region|String| -|tags|JSON| |volume|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_data_repository_associations.md b/plugins/source/aws/docs/tables/aws_fsx_data_repository_associations.md index 1f7a74b45607e8..8b8bfa174556f7 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_data_repository_associations.md +++ b/plugins/source/aws/docs/tables/aws_fsx_data_repository_associations.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |association_id|String| |batch_import_meta_data_on_create|Bool| |creation_time|Timestamp| @@ -28,5 +29,5 @@ The primary key for this table is **arn**. |imported_file_chunk_size|Int| |lifecycle|String| |nfs|JSON| -|s3|JSON| -|tags|JSON| \ No newline at end of file +|resource_arn|String| +|s3|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_data_repository_tasks.md b/plugins/source/aws/docs/tables/aws_fsx_data_repository_tasks.md index d7a4dfbd237c39..8d265ec499a131 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_data_repository_tasks.md +++ b/plugins/source/aws/docs/tables/aws_fsx_data_repository_tasks.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |creation_time|Timestamp| |lifecycle|String| |task_id|String| @@ -26,6 +27,6 @@ The primary key for this table is **arn**. |file_system_id|String| |paths|StringArray| |report|JSON| +|resource_arn|String| |start_time|Timestamp| -|status|JSON| -|tags|JSON| \ No newline at end of file +|status|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_file_caches.md b/plugins/source/aws/docs/tables/aws_fsx_file_caches.md index 422c56802267a7..b9241e6f65d8fa 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_file_caches.md +++ b/plugins/source/aws/docs/tables/aws_fsx_file_caches.md @@ -28,6 +28,7 @@ The primary key for this table is **arn**. |lustre_configuration|JSON| |network_interface_ids|StringArray| |owner_id|String| +|resource_arn|String| |storage_capacity|Int| |subnet_ids|StringArray| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_file_systems.md b/plugins/source/aws/docs/tables/aws_fsx_file_systems.md index 10056842fe3cd7..9fc67231b7760d 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_file_systems.md +++ b/plugins/source/aws/docs/tables/aws_fsx_file_systems.md @@ -30,6 +30,7 @@ The primary key for this table is **arn**. |ontap_configuration|JSON| |open_zfs_configuration|JSON| |owner_id|String| +|resource_arn|String| |storage_capacity|Int| |storage_type|String| |subnet_ids|StringArray| diff --git a/plugins/source/aws/docs/tables/aws_fsx_snapshots.md b/plugins/source/aws/docs/tables/aws_fsx_snapshots.md index 81fc43d7b54352..b85c91526aadff 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_fsx_snapshots.md @@ -16,10 +16,11 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |administrative_actions|JSON| +|tags|JSON| |creation_time|Timestamp| |lifecycle|String| |lifecycle_transition_reason|JSON| |name|String| +|resource_arn|String| |snapshot_id|String| -|tags|JSON| |volume_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_storage_virtual_machines.md b/plugins/source/aws/docs/tables/aws_fsx_storage_virtual_machines.md index e0b063b7778722..d13d458540b5a9 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_storage_virtual_machines.md +++ b/plugins/source/aws/docs/tables/aws_fsx_storage_virtual_machines.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |active_directory_configuration|JSON| |creation_time|Timestamp| |endpoints|JSON| @@ -22,8 +23,8 @@ The primary key for this table is **arn**. |lifecycle|String| |lifecycle_transition_reason|JSON| |name|String| +|resource_arn|String| |root_volume_security_style|String| |storage_virtual_machine_id|String| |subtype|String| -|tags|JSON| |uuid|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_fsx_volumes.md b/plugins/source/aws/docs/tables/aws_fsx_volumes.md index 9adc582b187db8..8bf756a14948eb 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_volumes.md +++ b/plugins/source/aws/docs/tables/aws_fsx_volumes.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |administrative_actions|JSON| +|tags|JSON| |creation_time|Timestamp| |file_system_id|String| |lifecycle|String| @@ -23,6 +24,6 @@ The primary key for this table is **arn**. |name|String| |ontap_configuration|JSON| |open_zfs_configuration|JSON| -|tags|JSON| +|resource_arn|String| |volume_id|String| |volume_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glacier_vault_lock_policies.md b/plugins/source/aws/docs/tables/aws_glacier_vault_lock_policies.md index 0684c50041ba35..cb9480f8507062 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_vault_lock_policies.md +++ b/plugins/source/aws/docs/tables/aws_glacier_vault_lock_policies.md @@ -17,4 +17,7 @@ This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). |account_id|String| |region|String| |vault_arn (PK)|String| -|policy|JSON| \ No newline at end of file +|policy|JSON| +|creation_date|String| +|expiration_date|String| +|state|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glacier_vaults.md b/plugins/source/aws/docs/tables/aws_glacier_vaults.md index 129a3806ab9f4d..ae3a9d68b98056 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_vaults.md +++ b/plugins/source/aws/docs/tables/aws_glacier_vaults.md @@ -25,4 +25,5 @@ The following tables depend on aws_glacier_vaults: |last_inventory_date|String| |number_of_archives|Int| |size_in_bytes|Int| +|vault_arn|String| |vault_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_registries.md b/plugins/source/aws/docs/tables/aws_glue_registries.md index a2512d2b2f1fff..6fbdcc9b8b0d83 100644 --- a/plugins/source/aws/docs/tables/aws_glue_registries.md +++ b/plugins/source/aws/docs/tables/aws_glue_registries.md @@ -21,6 +21,7 @@ The following tables depend on aws_glue_registries: |arn (PK)|String| |created_time|String| |description|String| +|registry_arn|String| |registry_name|String| |status|String| |updated_time|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md b/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md index 4b8595de2f9cf0..af7283207f95cd 100644 --- a/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md +++ b/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md @@ -29,6 +29,7 @@ The following tables depend on aws_glue_registry_schemas: |next_schema_version|Int| |registry_arn|String| |registry_name|String| +|schema_arn|String| |schema_checkpoint|Int| |schema_name|String| |schema_status|String| diff --git a/plugins/source/aws/docs/tables/aws_iam_groups.md b/plugins/source/aws/docs/tables/aws_iam_groups.md index 0ef6789d2e48ed..a32d950ea265f4 100644 --- a/plugins/source/aws/docs/tables/aws_iam_groups.md +++ b/plugins/source/aws/docs/tables/aws_iam_groups.md @@ -22,5 +22,6 @@ The following tables depend on aws_iam_groups: |id (PK)|String| |arn|String| |create_date|Timestamp| +|group_id|String| |group_name|String| |path|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_openid_connect_identity_providers.md b/plugins/source/aws/docs/tables/aws_iam_openid_connect_identity_providers.md index f3a9a5dc69d07e..35b3e9888f7277 100644 --- a/plugins/source/aws/docs/tables/aws_iam_openid_connect_identity_providers.md +++ b/plugins/source/aws/docs/tables/aws_iam_openid_connect_identity_providers.md @@ -12,9 +12,9 @@ The primary key for this table is **arn**. |_cq_parent_id|UUID| |account_id|String| |arn (PK)|String| +|tags|JSON| |client_id_list|StringArray| |create_date|Timestamp| -|tags|JSON| |thumbprint_list|StringArray| |url|String| |result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_policies.md b/plugins/source/aws/docs/tables/aws_iam_policies.md index 84386379f88ecb..7f4de3931691dd 100644 --- a/plugins/source/aws/docs/tables/aws_iam_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_policies.md @@ -24,5 +24,6 @@ The composite primary key for this table is (**account_id**, **id**). |is_attachable|Bool| |path|String| |permissions_boundary_usage_count|Int| +|policy_id|String| |policy_name|String| |update_date|Timestamp| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_roles.md b/plugins/source/aws/docs/tables/aws_iam_roles.md index 997b20479ace3e..b3af555d3f994e 100644 --- a/plugins/source/aws/docs/tables/aws_iam_roles.md +++ b/plugins/source/aws/docs/tables/aws_iam_roles.md @@ -21,12 +21,13 @@ The following tables depend on aws_iam_roles: |policies|JSON| |id (PK)|String| |assume_role_policy_document|JSON| +|tags|JSON| |arn|String| |create_date|Timestamp| |path|String| +|role_id|String| |role_name|String| |description|String| |max_session_duration|Int| |permissions_boundary|JSON| -|role_last_used|JSON| -|tags|JSON| \ No newline at end of file +|role_last_used|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_saml_identity_providers.md b/plugins/source/aws/docs/tables/aws_iam_saml_identity_providers.md index 15083a454fa63b..e7990b8cdd41d3 100644 --- a/plugins/source/aws/docs/tables/aws_iam_saml_identity_providers.md +++ b/plugins/source/aws/docs/tables/aws_iam_saml_identity_providers.md @@ -15,4 +15,6 @@ The primary key for this table is **arn**. |account_id|String| |arn (PK)|String| |create_date|Timestamp| +|saml_metadata_document|String| +|tags|JSON| |valid_until|Timestamp| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_server_certificates.md b/plugins/source/aws/docs/tables/aws_iam_server_certificates.md index ca5928065d0c17..6d3da3c9c4f7cd 100644 --- a/plugins/source/aws/docs/tables/aws_iam_server_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iam_server_certificates.md @@ -16,6 +16,7 @@ The composite primary key for this table is (**account_id**, **id**). |id (PK)|String| |arn|String| |path|String| +|server_certificate_id|String| |server_certificate_name|String| |expiration|Timestamp| |upload_date|Timestamp| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_users.md b/plugins/source/aws/docs/tables/aws_iam_users.md index 455a7975bb958e..d6a3ecce48b4b2 100644 --- a/plugins/source/aws/docs/tables/aws_iam_users.md +++ b/plugins/source/aws/docs/tables/aws_iam_users.md @@ -24,9 +24,10 @@ The following tables depend on aws_iam_users: |arn|String| |id (PK)|String| |account_id (PK)|String| +|tags|JSON| |create_date|Timestamp| |path|String| +|user_id|String| |user_name|String| |password_last_used|Timestamp| -|permissions_boundary|JSON| -|tags|JSON| \ No newline at end of file +|permissions_boundary|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md b/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md index 8737f3cca25a3d..61bea676a3808f 100644 --- a/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md +++ b/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md @@ -14,8 +14,8 @@ The primary key for this table is **serial_number**. |_cq_parent_id|UUID| |account_id|String| |serial_number (PK)|String| +|tags|JSON| |base32_string_seed|IntArray| |enable_date|Timestamp| |qr_code_png|IntArray| -|tags|JSON| |user|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_inspector2_findings.md b/plugins/source/aws/docs/tables/aws_inspector2_findings.md index ee6e2677ffff1d..4e9daeab3bf4ba 100644 --- a/plugins/source/aws/docs/tables/aws_inspector2_findings.md +++ b/plugins/source/aws/docs/tables/aws_inspector2_findings.md @@ -17,6 +17,7 @@ The primary key for this table is **arn**. |arn (PK)|String| |aws_account_id|String| |description|String| +|finding_arn|String| |first_observed_at|Timestamp| |last_observed_at|Timestamp| |remediation|JSON| diff --git a/plugins/source/aws/docs/tables/aws_iot_billing_groups.md b/plugins/source/aws/docs/tables/aws_iot_billing_groups.md index 37de94f24b9411..b0df2b62878bcf 100644 --- a/plugins/source/aws/docs/tables/aws_iot_billing_groups.md +++ b/plugins/source/aws/docs/tables/aws_iot_billing_groups.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |things_in_group|StringArray| |tags|JSON| |arn (PK)|String| +|billing_group_arn|String| |billing_group_id|String| |billing_group_metadata|JSON| |billing_group_name|String| diff --git a/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md b/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md index f195780015c3df..f23ffde262fd5a 100644 --- a/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md @@ -17,6 +17,7 @@ The primary key for this table is **arn**. |certificates|StringArray| |arn (PK)|String| |auto_registration_status|String| +|certificate_arn|String| |certificate_id|String| |certificate_mode|String| |certificate_pem|String| diff --git a/plugins/source/aws/docs/tables/aws_iot_certificates.md b/plugins/source/aws/docs/tables/aws_iot_certificates.md index e8044772c85d99..4ceec494467cf8 100644 --- a/plugins/source/aws/docs/tables/aws_iot_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iot_certificates.md @@ -17,6 +17,7 @@ The primary key for this table is **arn**. |policies|StringArray| |arn (PK)|String| |ca_certificate_id|String| +|certificate_arn|String| |certificate_id|String| |certificate_mode|String| |certificate_pem|String| diff --git a/plugins/source/aws/docs/tables/aws_iot_jobs.md b/plugins/source/aws/docs/tables/aws_iot_jobs.md index 79c63553de69c4..42d7d3d2bb1edf 100644 --- a/plugins/source/aws/docs/tables/aws_iot_jobs.md +++ b/plugins/source/aws/docs/tables/aws_iot_jobs.md @@ -24,6 +24,7 @@ The primary key for this table is **arn**. |document_parameters|JSON| |force_canceled|Bool| |is_concurrent|Bool| +|job_arn|String| |job_executions_retry_config|JSON| |job_executions_rollout_config|JSON| |job_id|String| diff --git a/plugins/source/aws/docs/tables/aws_iot_policies.md b/plugins/source/aws/docs/tables/aws_iot_policies.md index 89268fb4bb987f..6d2699aee2054e 100644 --- a/plugins/source/aws/docs/tables/aws_iot_policies.md +++ b/plugins/source/aws/docs/tables/aws_iot_policies.md @@ -16,4 +16,5 @@ The primary key for this table is **arn**. |region|String| |tags|JSON| |arn (PK)|String| +|policy_arn|String| |policy_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iot_streams.md b/plugins/source/aws/docs/tables/aws_iot_streams.md index 4b872ae93e5e5d..b53c5d7618168c 100644 --- a/plugins/source/aws/docs/tables/aws_iot_streams.md +++ b/plugins/source/aws/docs/tables/aws_iot_streams.md @@ -20,5 +20,6 @@ The primary key for this table is **arn**. |files|JSON| |last_updated_at|Timestamp| |role_arn|String| +|stream_arn|String| |stream_id|String| |stream_version|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iot_thing_groups.md b/plugins/source/aws/docs/tables/aws_iot_thing_groups.md index b1266b2abc6874..7d9dcddb19235e 100644 --- a/plugins/source/aws/docs/tables/aws_iot_thing_groups.md +++ b/plugins/source/aws/docs/tables/aws_iot_thing_groups.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |query_string|String| |query_version|String| |status|String| +|thing_group_arn|String| |thing_group_id|String| |thing_group_metadata|JSON| |thing_group_name|String| diff --git a/plugins/source/aws/docs/tables/aws_iot_thing_types.md b/plugins/source/aws/docs/tables/aws_iot_thing_types.md index 172460832d1615..0baee0422d6048 100644 --- a/plugins/source/aws/docs/tables/aws_iot_thing_types.md +++ b/plugins/source/aws/docs/tables/aws_iot_thing_types.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |tags|JSON| |arn (PK)|String| +|thing_type_arn|String| |thing_type_metadata|JSON| |thing_type_name|String| |thing_type_properties|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iot_things.md b/plugins/source/aws/docs/tables/aws_iot_things.md index 93eab808b0668e..139a9fa6022e06 100644 --- a/plugins/source/aws/docs/tables/aws_iot_things.md +++ b/plugins/source/aws/docs/tables/aws_iot_things.md @@ -17,6 +17,7 @@ The primary key for this table is **arn**. |principals|StringArray| |arn (PK)|String| |attributes|JSON| +|thing_arn|String| |thing_name|String| |thing_type_name|String| |version|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iot_topic_rules.md b/plugins/source/aws/docs/tables/aws_iot_topic_rules.md index 5c7d81e69541e1..0e63aba94d9f42 100644 --- a/plugins/source/aws/docs/tables/aws_iot_topic_rules.md +++ b/plugins/source/aws/docs/tables/aws_iot_topic_rules.md @@ -15,4 +15,5 @@ The primary key for this table is **arn**. |tags|JSON| |arn (PK)|String| |rule|JSON| +|rule_arn|String| |result_metadata|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md b/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md index fd8b2d4c42d442..7c9cde4d4b7416 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md +++ b/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md @@ -24,6 +24,7 @@ This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). |creation_time|Timestamp| |end_time|Timestamp| |error_info|JSON| +|operation_arn|String| |operation_state|String| |operation_steps|JSON| |operation_type|String| diff --git a/plugins/source/aws/docs/tables/aws_kafka_clusters.md b/plugins/source/aws/docs/tables/aws_kafka_clusters.md index 147739224d8171..e6e6f8adb16010 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_clusters.md +++ b/plugins/source/aws/docs/tables/aws_kafka_clusters.md @@ -21,6 +21,7 @@ The following tables depend on aws_kafka_clusters: |account_id|String| |arn (PK)|String| |active_operation_arn|String| +|cluster_arn|String| |cluster_name|String| |cluster_type|String| |creation_time|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_kafka_nodes.md b/plugins/source/aws/docs/tables/aws_kafka_nodes.md index 7111e51fef0e0d..af7feca33937a7 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_nodes.md +++ b/plugins/source/aws/docs/tables/aws_kafka_nodes.md @@ -22,5 +22,6 @@ This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). |added_to_cluster_time|String| |broker_node_info|JSON| |instance_type|String| +|node_arn|String| |node_type|String| |zookeeper_node_info|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_kinesis_streams.md b/plugins/source/aws/docs/tables/aws_kinesis_streams.md index d864a9ea210a75..55bfa0d6d1a0d3 100644 --- a/plugins/source/aws/docs/tables/aws_kinesis_streams.md +++ b/plugins/source/aws/docs/tables/aws_kinesis_streams.md @@ -19,6 +19,7 @@ The primary key for this table is **arn**. |enhanced_monitoring|JSON| |open_shard_count|Int| |retention_period_hours|Int| +|stream_arn|String| |stream_creation_timestamp|Timestamp| |stream_name|String| |stream_status|String| diff --git a/plugins/source/aws/docs/tables/aws_kms_aliases.md b/plugins/source/aws/docs/tables/aws_kms_aliases.md index c6158d81ae3ddb..704fdf76bb2274 100644 --- a/plugins/source/aws/docs/tables/aws_kms_aliases.md +++ b/plugins/source/aws/docs/tables/aws_kms_aliases.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|alias_arn|String| |alias_name|String| |creation_date|Timestamp| |last_updated_date|Timestamp| diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md b/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md index 556d256ae22894..c9f95cf0f16364 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md @@ -18,6 +18,7 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). |region|String| |function_arn|String| |arn (PK)|String| +|alias_arn|String| |description|String| |function_version|String| |name|String| diff --git a/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md b/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md index fde8337c4e649f..641dea85937a0e 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md +++ b/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md @@ -27,5 +27,6 @@ The following tables depend on aws_lambda_layer_versions: |compatible_runtimes|StringArray| |created_date|String| |description|String| +|layer_version_arn|String| |license_info|String| |version|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_buckets.md b/plugins/source/aws/docs/tables/aws_lightsail_buckets.md index 964c985ab8e155..942250f6d474b1 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_buckets.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_buckets.md @@ -20,6 +20,7 @@ The following tables depend on aws_lightsail_buckets: |account_id|String| |region|String| |able_to_update_bundle|Bool| +|tags|JSON| |access_log_config|JSON| |access_rules|JSON| |arn|String| @@ -33,5 +34,4 @@ The following tables depend on aws_lightsail_buckets: |resources_receiving_access|JSON| |state|JSON| |support_code|String| -|tags|JSON| |url|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_container_services.md b/plugins/source/aws/docs/tables/aws_lightsail_container_services.md index 7afc9a30eaace1..324ae488fe569b 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_container_services.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_container_services.md @@ -21,6 +21,7 @@ The following tables depend on aws_lightsail_container_services: |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |container_service_name|String| |created_at|Timestamp| |current_deployment|JSON| @@ -37,5 +38,4 @@ The following tables depend on aws_lightsail_container_services: |scale|Int| |state|String| |state_detail|JSON| -|tags|JSON| |url|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md b/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md index 4e5df693036bec..e8f9d7b5a58eaf 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |created_at|Timestamp| |engine|String| |engine_version|String| @@ -27,5 +28,4 @@ The primary key for this table is **arn**. |resource_type|String| |size_in_gb|Int| |state|String| -|support_code|String| -|tags|JSON| \ No newline at end of file +|support_code|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_databases.md b/plugins/source/aws/docs/tables/aws_lightsail_databases.md index 4322cc799006b3..b5cc7d716918e3 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_databases.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_databases.md @@ -22,6 +22,7 @@ The following tables depend on aws_lightsail_databases: |account_id|String| |region|String| |arn|String| +|tags|JSON| |backup_retention_enabled|Bool| |ca_certificate_identifier|String| |created_at|Timestamp| @@ -45,5 +46,4 @@ The following tables depend on aws_lightsail_databases: |resource_type|String| |secondary_availability_zone|String| |state|String| -|support_code|String| -|tags|JSON| \ No newline at end of file +|support_code|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md b/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md index 561073d9e066e9..4c2b55be4fcca1 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md @@ -19,6 +19,7 @@ This table depends on [aws_lightsail_disks](aws_lightsail_disks.md). |account_id|String| |region|String| |disk_arn|String| +|tags|JSON| |arn|String| |created_at|Timestamp| |from_disk_arn|String| @@ -32,5 +33,4 @@ This table depends on [aws_lightsail_disks](aws_lightsail_disks.md). |resource_type|String| |size_in_gb|Int| |state|String| -|support_code|String| -|tags|JSON| \ No newline at end of file +|support_code|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md b/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md index 90792abb08e4a9..276ba149f752b4 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |created_at|Timestamp| |from_attached_disks|JSON| |from_blueprint_id|String| @@ -28,5 +29,4 @@ The primary key for this table is **arn**. |resource_type|String| |size_in_gb|Int| |state|String| -|support_code|String| -|tags|JSON| \ No newline at end of file +|support_code|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_instances.md b/plugins/source/aws/docs/tables/aws_lightsail_instances.md index 79f20e4b47a978..157271a2bfd3ef 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_instances.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_instances.md @@ -21,6 +21,7 @@ The following tables depend on aws_lightsail_instances: |region|String| |access_details|JSON| |arn (PK)|String| +|tags|JSON| |add_ons|JSON| |blueprint_id|String| |blueprint_name|String| @@ -40,5 +41,4 @@ The following tables depend on aws_lightsail_instances: |ssh_key_name|String| |state|JSON| |support_code|String| -|tags|JSON| |username|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_load_balancer_tls_certificates.md b/plugins/source/aws/docs/tables/aws_lightsail_load_balancer_tls_certificates.md index e3a6c3c0459064..06e048dd40fd94 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_load_balancer_tls_certificates.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_load_balancer_tls_certificates.md @@ -19,6 +19,7 @@ This table depends on [aws_lightsail_load_balancers](aws_lightsail_load_balancer |account_id|String| |region|String| |load_balancer_arn|String| +|tags|JSON| |arn|String| |created_at|Timestamp| |domain_name|String| @@ -42,5 +43,4 @@ This table depends on [aws_lightsail_load_balancers](aws_lightsail_load_balancer |status|String| |subject|String| |subject_alternative_names|StringArray| -|support_code|String| -|tags|JSON| \ No newline at end of file +|support_code|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md b/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md index a1a671f1e4374c..f8e48bdfc638dc 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md @@ -20,6 +20,7 @@ The following tables depend on aws_lightsail_load_balancers: |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |configuration_options|JSON| |created_at|Timestamp| |dns_name|String| @@ -35,6 +36,5 @@ The following tables depend on aws_lightsail_load_balancers: |resource_type|String| |state|String| |support_code|String| -|tags|JSON| |tls_certificate_summaries|JSON| |tls_policy_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_mq_brokers.md b/plugins/source/aws/docs/tables/aws_mq_brokers.md index 157c5a5300f267..2f5ca9d0559476 100644 --- a/plugins/source/aws/docs/tables/aws_mq_brokers.md +++ b/plugins/source/aws/docs/tables/aws_mq_brokers.md @@ -24,6 +24,7 @@ The following tables depend on aws_mq_brokers: |actions_required|JSON| |authentication_strategy|String| |auto_minor_version_upgrade|Bool| +|broker_arn|String| |broker_id|String| |broker_instances|JSON| |broker_name|String| diff --git a/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_groups.md b/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_groups.md index 3cb9e3f83dfe79..688f9d3cc02779 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_groups.md @@ -21,6 +21,7 @@ The following tables depend on aws_neptune_cluster_parameter_groups: |region|String| |arn (PK)|String| |tags|JSON| +|db_cluster_parameter_group_arn|String| |db_cluster_parameter_group_name|String| |db_parameter_group_family|String| |description|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md b/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md index 74dcdf79650f76..5a02f9d9025858 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md @@ -21,6 +21,7 @@ The primary key for this table is **arn**. |availability_zones|StringArray| |cluster_create_time|Timestamp| |db_cluster_identifier|String| +|db_cluster_snapshot_arn|String| |db_cluster_snapshot_identifier|String| |engine|String| |engine_version|String| diff --git a/plugins/source/aws/docs/tables/aws_neptune_clusters.md b/plugins/source/aws/docs/tables/aws_neptune_clusters.md index 411640600a81a2..03daf4f8b7c413 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_clusters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_clusters.md @@ -26,6 +26,7 @@ The primary key for this table is **arn**. |cluster_create_time|Timestamp| |copy_tags_to_snapshot|Bool| |cross_account_clone|Bool| +|db_cluster_arn|String| |db_cluster_identifier|String| |db_cluster_members|JSON| |db_cluster_option_group_memberships|JSON| diff --git a/plugins/source/aws/docs/tables/aws_neptune_db_parameter_groups.md b/plugins/source/aws/docs/tables/aws_neptune_db_parameter_groups.md index 3585e9edd04360..933468689ce74b 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_db_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_neptune_db_parameter_groups.md @@ -21,6 +21,7 @@ The following tables depend on aws_neptune_db_parameter_groups: |region|String| |arn (PK)|String| |tags|JSON| +|db_parameter_group_arn|String| |db_parameter_group_family|String| |db_parameter_group_name|String| |description|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md b/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md index 4d58f7bdbe8aa6..b0829c56cb0b21 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |customer_aws_id|String| |enabled|Bool| |event_categories_list|StringArray| +|event_subscription_arn|String| |sns_topic_arn|String| |source_ids_list|StringArray| |source_type|String| diff --git a/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md b/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md index 21eaf833de6f56..a0c8a997ae2b84 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md @@ -19,6 +19,7 @@ The primary key for this table is **arn**. |deletion_protection|Bool| |engine|String| |engine_version|String| +|global_cluster_arn|String| |global_cluster_identifier|String| |global_cluster_members|JSON| |global_cluster_resource_id|String| diff --git a/plugins/source/aws/docs/tables/aws_neptune_instances.md b/plugins/source/aws/docs/tables/aws_neptune_instances.md index 63d264660251a9..4d3fee6ba5d238 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_instances.md +++ b/plugins/source/aws/docs/tables/aws_neptune_instances.md @@ -24,6 +24,7 @@ The primary key for this table is **arn**. |character_set_name|String| |copy_tags_to_snapshot|Bool| |db_cluster_identifier|String| +|db_instance_arn|String| |db_instance_class|String| |db_instance_identifier|String| |db_instance_status|String| diff --git a/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md b/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md index ede7777ea044f7..ac34e580a242b6 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md @@ -20,4 +20,5 @@ The primary key for this table is **arn**. |db_subnet_group_name|String| |subnet_group_status|String| |subnets|JSON| -|vpc_id|String| \ No newline at end of file +|vpc_id|String| +|db_subnet_group_arn|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_quicksight_analyses.md b/plugins/source/aws/docs/tables/aws_quicksight_analyses.md index 7e61398c923d06..76de78f5ade42d 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_analyses.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_analyses.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_analyses +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Analysis.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md b/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md index 5e5b006d85babc..b477e44d9d940a 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_dashboards +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DashboardSummary.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md b/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md index 656777fb7cde71..049d7ef297ed73 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_data_sets +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSetSummary.html + The primary key for this table is **arn**. ## Relations diff --git a/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md b/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md index cc0171a625a7a5..1fe507075b271a 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_data_sources +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSource.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_quicksight_folders.md b/plugins/source/aws/docs/tables/aws_quicksight_folders.md index d7e06541d101b8..1c7ca3fa466130 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_folders.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_folders.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_folders +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Folder.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_quicksight_group_members.md b/plugins/source/aws/docs/tables/aws_quicksight_group_members.md index ff701171a0f11e..cb29bec5c8dd22 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_group_members.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_group_members.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_group_members +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GroupMember.html + The composite primary key for this table is (**user_arn**, **group_arn**). ## Relations @@ -18,4 +20,5 @@ This table depends on [aws_quicksight_groups](aws_quicksight_groups.md). |region|String| |user_arn (PK)|String| |group_arn (PK)|String| +|arn|String| |member_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_quicksight_groups.md b/plugins/source/aws/docs/tables/aws_quicksight_groups.md index 14a1593e263d2e..32e7aa8d3a0e56 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_groups.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_groups.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_groups +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Group.html + The primary key for this table is **arn**. ## Relations diff --git a/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md b/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md index 0e9a54c8b4de12..b4b034280b238c 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_ingestions +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Ingestion.html + The composite primary key for this table is (**arn**, **data_set_arn**). ## Relations diff --git a/plugins/source/aws/docs/tables/aws_quicksight_templates.md b/plugins/source/aws/docs/tables/aws_quicksight_templates.md index bcf8215937945a..8162d7d6bd425f 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_templates.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_templates.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_templates +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_TemplateSummary.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_quicksight_users.md b/plugins/source/aws/docs/tables/aws_quicksight_users.md index bc879733f85ee8..460345212bff5c 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_users.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_users.md @@ -1,5 +1,7 @@ # Table: aws_quicksight_users +https://docs.aws.amazon.com/quicksight/latest/APIReference/API_User.html + The primary key for this table is **arn**. ## Columns diff --git a/plugins/source/aws/docs/tables/aws_ram_principals.md b/plugins/source/aws/docs/tables/aws_ram_principals.md index fc191a4fe062cb..9853ad3bc70a3f 100644 --- a/plugins/source/aws/docs/tables/aws_ram_principals.md +++ b/plugins/source/aws/docs/tables/aws_ram_principals.md @@ -14,8 +14,8 @@ The composite primary key for this table is (**account_id**, **id**). |_cq_parent_id|UUID| |account_id (PK)|String| |region|String| +|id (PK)|String| |creation_time|Timestamp| |external|Bool| -|id (PK)|String| |last_updated_time|Timestamp| |resource_share_arn|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ram_resource_share_associations.md b/plugins/source/aws/docs/tables/aws_ram_resource_share_associations.md index e0d0460fb45648..792cb3ba728123 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_share_associations.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_share_associations.md @@ -15,11 +15,11 @@ The composite primary key for this table is (**associated_entity**, **resource_s |account_id|String| |region|String| |associated_entity (PK)|String| +|resource_share_arn (PK)|String| |association_type|String| |creation_time|Timestamp| |external|Bool| |last_updated_time|Timestamp| -|resource_share_arn (PK)|String| |resource_share_name|String| |status|String| |status_message|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ram_resource_share_invitations.md b/plugins/source/aws/docs/tables/aws_ram_resource_share_invitations.md index 0b8de262a2fee5..e647fc8d1cf56c 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_share_invitations.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_share_invitations.md @@ -14,12 +14,13 @@ The primary key for this table is **arn**. |_cq_parent_id|UUID| |account_id|String| |region|String| +|arn (PK)|String| |invitation_timestamp|Timestamp| |receiver_account_id|String| |receiver_arn|String| |resource_share_arn|String| |resource_share_associations|JSON| -|arn (PK)|String| +|resource_share_invitation_arn|String| |resource_share_name|String| |sender_account_id|String| |status|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ram_resource_shares.md b/plugins/source/aws/docs/tables/aws_ram_resource_shares.md index 98d9f7f5d6606b..5d7f2c357e4c5d 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_shares.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_shares.md @@ -19,13 +19,14 @@ The following tables depend on aws_ram_resource_shares: |_cq_parent_id|UUID| |account_id|String| |region|String| +|arn (PK)|String| +|tags|JSON| |allow_external_principals|Bool| |creation_time|Timestamp| |feature_set|String| |last_updated_time|Timestamp| |name|String| |owning_account_id|String| -|arn (PK)|String| +|resource_share_arn|String| |status|String| -|status_message|String| -|tags|JSON| \ No newline at end of file +|status_message|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ram_resource_types.md b/plugins/source/aws/docs/tables/aws_ram_resource_types.md index b2eb34df77ee95..0c78d92dbf18bb 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_types.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_types.md @@ -14,6 +14,6 @@ The composite primary key for this table is (**account_id**, **resource_type**, |_cq_parent_id|UUID| |account_id (PK)|String| |region|String| -|resource_region_scope|String| |resource_type (PK)|String| -|service_name (PK)|String| \ No newline at end of file +|service_name (PK)|String| +|resource_region_scope|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_rds_certificates.md b/plugins/source/aws/docs/tables/aws_rds_certificates.md index f305a4a835c9fc..6a026c1339a6dd 100644 --- a/plugins/source/aws/docs/tables/aws_rds_certificates.md +++ b/plugins/source/aws/docs/tables/aws_rds_certificates.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|certificate_arn|String| |certificate_identifier|String| |certificate_type|String| |customer_override|Bool| diff --git a/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_groups.md b/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_groups.md index 4fbc9d4ed014ff..7e40eb57d9d0b4 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_groups.md @@ -21,6 +21,7 @@ The following tables depend on aws_rds_cluster_parameter_groups: |region|String| |arn (PK)|String| |tags|JSON| +|db_cluster_parameter_group_arn|String| |db_cluster_parameter_group_name|String| |db_parameter_group_family|String| |description|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md b/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md index b0439d1c65db20..2eab6c5c7ec374 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md @@ -1,5 +1,7 @@ # Table: aws_rds_cluster_parameters +https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html + The primary key for this table is **_cq_id**. ## Relations diff --git a/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md b/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md index 49e4cb0ac03422..ea53a8bb2958b8 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md @@ -21,6 +21,7 @@ The primary key for this table is **arn**. |availability_zones|StringArray| |cluster_create_time|Timestamp| |db_cluster_identifier|String| +|db_cluster_snapshot_arn|String| |db_cluster_snapshot_identifier|String| |db_system_id|String| |engine|String| diff --git a/plugins/source/aws/docs/tables/aws_rds_clusters.md b/plugins/source/aws/docs/tables/aws_rds_clusters.md index 9b63864a1ab59c..38e35f5b057ace 100644 --- a/plugins/source/aws/docs/tables/aws_rds_clusters.md +++ b/plugins/source/aws/docs/tables/aws_rds_clusters.md @@ -35,6 +35,7 @@ The primary key for this table is **arn**. |copy_tags_to_snapshot|Bool| |cross_account_clone|Bool| |custom_endpoints|StringArray| +|db_cluster_arn|String| |db_cluster_identifier|String| |db_cluster_instance_class|String| |db_cluster_members|JSON| diff --git a/plugins/source/aws/docs/tables/aws_rds_db_parameter_groups.md b/plugins/source/aws/docs/tables/aws_rds_db_parameter_groups.md index 72d2e9578a0673..e987467cca920c 100644 --- a/plugins/source/aws/docs/tables/aws_rds_db_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_db_parameter_groups.md @@ -21,6 +21,7 @@ The following tables depend on aws_rds_db_parameter_groups: |region|String| |arn (PK)|String| |tags|JSON| +|db_parameter_group_arn|String| |db_parameter_group_family|String| |db_parameter_group_name|String| |description|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_rds_db_security_groups.md b/plugins/source/aws/docs/tables/aws_rds_db_security_groups.md index 760ad1328e2e77..cf94ba029a7c1e 100644 --- a/plugins/source/aws/docs/tables/aws_rds_db_security_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_db_security_groups.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |tags|JSON| +|db_security_group_arn|String| |db_security_group_description|String| |db_security_group_name|String| |ec2_security_groups|JSON| diff --git a/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md b/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md index 18ed58ea20c22a..ba542494f33f79 100644 --- a/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |allocated_storage|Int| |availability_zone|String| |db_instance_identifier|String| +|db_snapshot_arn|String| |db_snapshot_identifier|String| |dbi_resource_id|String| |encrypted|Bool| diff --git a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md index af1b2473eaa8f9..209dc2cacf81c3 100644 --- a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md +++ b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md @@ -21,6 +21,7 @@ The following tables depend on aws_rds_engine_versions: |region (PK)|String| |engine (PK)|String| |engine_version (PK)|String| +|tag_list|JSON| |create_time|Timestamp| |custom_db_engine_version_manifest|String| |db_engine_description|String| @@ -48,5 +49,4 @@ The following tables depend on aws_rds_engine_versions: |supports_log_exports_to_cloudwatch_logs|Bool| |supports_parallel_query|Bool| |supports_read_replica|Bool| -|tag_list|JSON| |valid_upgrade_target|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md b/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md index 685cad9a534c88..e0e5fde937edcd 100644 --- a/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |customer_aws_id|String| |enabled|Bool| |event_categories_list|StringArray| +|event_subscription_arn|String| |sns_topic_arn|String| |source_ids_list|StringArray| |source_type|String| diff --git a/plugins/source/aws/docs/tables/aws_rds_instances.md b/plugins/source/aws/docs/tables/aws_rds_instances.md index 7ee88bc6b21a07..64f324635bde61 100644 --- a/plugins/source/aws/docs/tables/aws_rds_instances.md +++ b/plugins/source/aws/docs/tables/aws_rds_instances.md @@ -39,6 +39,7 @@ The primary key for this table is **arn**. |custom_iam_instance_profile|String| |customer_owned_ip_enabled|Bool| |db_cluster_identifier|String| +|db_instance_arn|String| |db_instance_automated_backups_replications|JSON| |db_instance_class|String| |db_instance_identifier|String| diff --git a/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md b/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md index 18611a86aad021..c68d0db3101d58 100644 --- a/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|db_subnet_group_arn|String| |db_subnet_group_description|String| |db_subnet_group_name|String| |subnet_group_status|String| diff --git a/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md b/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md index e75d85a043d314..b8531647aed6a0 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |cust_subscription_id|String| |customer_aws_id|String| |enabled|Bool| @@ -24,5 +25,4 @@ The primary key for this table is **arn**. |source_ids_list|StringArray| |source_type|String| |status|String| -|subscription_creation_time|Timestamp| -|tags|JSON| \ No newline at end of file +|subscription_creation_time|Timestamp| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md b/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md index 55f808329b5ca8..c659485f8602d1 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md @@ -15,9 +15,9 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |cluster_subnet_group_name|String| |description|String| |subnet_group_status|String| |subnets|JSON| -|tags|JSON| |vpc_id|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_regions.md b/plugins/source/aws/docs/tables/aws_regions.md index 574d026b02b23a..b93d43c34ff251 100644 --- a/plugins/source/aws/docs/tables/aws_regions.md +++ b/plugins/source/aws/docs/tables/aws_regions.md @@ -17,4 +17,5 @@ The primary key for this table is **_cq_id**. |partition|String| |region|String| |endpoint|String| -|opt_in_status|String| \ No newline at end of file +|opt_in_status|String| +|region_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md b/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md index d2356c18873f74..9fa8da36984bc0 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |creation_time|Timestamp| +|endpoint_config_arn|String| |endpoint_config_name|String| |production_variants|JSON| |async_inference_config|JSON| diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_models.md b/plugins/source/aws/docs/tables/aws_sagemaker_models.md index 86bd46d35a0b31..15c1b729d415ff 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_models.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_models.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |tags|JSON| |creation_time|Timestamp| |execution_role_arn|String| +|model_arn|String| |model_name|String| |containers|JSON| |enable_network_isolation|Bool| diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md b/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md index cb57581088867e..5d6877680b64e7 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md @@ -25,6 +25,7 @@ The primary key for this table is **arn**. |kms_key_id|String| |last_modified_time|Timestamp| |network_interface_id|String| +|notebook_instance_arn|String| |notebook_instance_lifecycle_config_name|String| |notebook_instance_name|String| |notebook_instance_status|String| diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md b/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md index c2cfc1c99d217c..edab6ba3ee94d7 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |resource_config|JSON| |secondary_status|String| |stopping_condition|JSON| +|training_job_arn|String| |training_job_name|String| |training_job_status|String| |auto_ml_job_arn|String| diff --git a/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md b/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md index c784b7af3f37d0..fed77e90ac978f 100644 --- a/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md +++ b/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |policy|JSON| +|tags|JSON| |created_date|Timestamp| |deleted_date|Timestamp| |description|String| @@ -31,5 +32,4 @@ The primary key for this table is **arn**. |rotation_enabled|Bool| |rotation_lambda_arn|String| |rotation_rules|JSON| -|tags|JSON| |version_ids_to_stages|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_products.md b/plugins/source/aws/docs/tables/aws_servicecatalog_products.md index 3197062ba6b437..d60557c41010f7 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_products.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_products.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |created_time|Timestamp| +|product_arn|String| |product_view_summary|JSON| |source_connection|JSON| |status|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md b/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md index 0f594cfa3fa200..fe90b9ad5a4bc6 100644 --- a/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md +++ b/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md @@ -23,6 +23,7 @@ This table depends on [aws_servicequotas_services](aws_servicequotas_services.md |error_reason|JSON| |global_quota|Bool| |period|JSON| +|quota_arn|String| |quota_code|String| |quota_name|String| |service_code|String| diff --git a/plugins/source/aws/docs/tables/aws_ses_configuration_set_event_destinations.md b/plugins/source/aws/docs/tables/aws_ses_configuration_set_event_destinations.md index 055fc8366f42ab..698ffd7ead9ef3 100644 --- a/plugins/source/aws/docs/tables/aws_ses_configuration_set_event_destinations.md +++ b/plugins/source/aws/docs/tables/aws_ses_configuration_set_event_destinations.md @@ -19,8 +19,8 @@ This table depends on [aws_ses_configuration_sets](aws_ses_configuration_sets.md |account_id (PK)|String| |region (PK)|String| |configuration_set_name (PK)|String| -|matching_event_types|StringArray| |name (PK)|String| +|matching_event_types|StringArray| |cloud_watch_destination|JSON| |enabled|Bool| |kinesis_firehose_destination|JSON| diff --git a/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md b/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md index 4f9c86fcc68b80..a78dfe32922611 100644 --- a/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md +++ b/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md @@ -20,11 +20,11 @@ The following tables depend on aws_ses_configuration_sets: |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |name|String| |delivery_options|JSON| |reputation_options|JSON| |sending_options|JSON| |suppression_options|JSON| -|tags|JSON| |tracking_options|JSON| |vdm_options|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ses_contact_lists.md b/plugins/source/aws/docs/tables/aws_ses_contact_lists.md index 78a695a12aee5f..18508d2bdbad0f 100644 --- a/plugins/source/aws/docs/tables/aws_ses_contact_lists.md +++ b/plugins/source/aws/docs/tables/aws_ses_contact_lists.md @@ -15,8 +15,9 @@ The composite primary key for this table is (**account_id**, **region**, **name* |account_id (PK)|String| |region (PK)|String| |name (PK)|String| +|tags|JSON| +|contact_list_name|String| |created_timestamp|Timestamp| |description|String| |last_updated_timestamp|Timestamp| -|tags|JSON| |topics|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ses_identities.md b/plugins/source/aws/docs/tables/aws_ses_identities.md index 561a8ade0fd7aa..ad89c100f4b2e1 100644 --- a/plugins/source/aws/docs/tables/aws_ses_identities.md +++ b/plugins/source/aws/docs/tables/aws_ses_identities.md @@ -15,6 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| +|tags|JSON| |identity_name|String| |sending_enabled|Bool| |configuration_set_name|String| @@ -23,6 +24,5 @@ The primary key for this table is **arn**. |identity_type|String| |mail_from_attributes|JSON| |policies|JSON| -|tags|JSON| |verification_status|String| |verified_for_sending_status|Bool| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_shield_attacks.md b/plugins/source/aws/docs/tables/aws_shield_attacks.md index bf055721787f49..58cbeffdfe4fd7 100644 --- a/plugins/source/aws/docs/tables/aws_shield_attacks.md +++ b/plugins/source/aws/docs/tables/aws_shield_attacks.md @@ -15,6 +15,7 @@ The primary key for this table is **id**. |account_id|String| |id (PK)|String| |attack_counters|JSON| +|attack_id|String| |attack_properties|JSON| |end_time|Timestamp| |mitigations|JSON| diff --git a/plugins/source/aws/docs/tables/aws_shield_protection_groups.md b/plugins/source/aws/docs/tables/aws_shield_protection_groups.md index b743c50befe66b..3818725bbaf224 100644 --- a/plugins/source/aws/docs/tables/aws_shield_protection_groups.md +++ b/plugins/source/aws/docs/tables/aws_shield_protection_groups.md @@ -19,4 +19,5 @@ The primary key for this table is **arn**. |members|StringArray| |pattern|String| |protection_group_id|String| +|protection_group_arn|String| |resource_type|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_shield_protections.md b/plugins/source/aws/docs/tables/aws_shield_protections.md index 46b76b46c47680..c8c99e454fee7c 100644 --- a/plugins/source/aws/docs/tables/aws_shield_protections.md +++ b/plugins/source/aws/docs/tables/aws_shield_protections.md @@ -19,4 +19,5 @@ The primary key for this table is **arn**. |health_check_ids|StringArray| |id|String| |name|String| +|protection_arn|String| |resource_arn|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_shield_subscriptions.md b/plugins/source/aws/docs/tables/aws_shield_subscriptions.md index 4dbcba537bb883..1cbcfd96bb12b5 100644 --- a/plugins/source/aws/docs/tables/aws_shield_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_shield_subscriptions.md @@ -20,4 +20,5 @@ The primary key for this table is **arn**. |limits|JSON| |proactive_engagement_status|String| |start_time|Timestamp| +|subscription_arn|String| |time_commitment_in_seconds|Int| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_sns_subscriptions.md b/plugins/source/aws/docs/tables/aws_sns_subscriptions.md index 664baec4169671..cf070f4a6d18fa 100644 --- a/plugins/source/aws/docs/tables/aws_sns_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_sns_subscriptions.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |endpoint|String| |owner|String| |protocol|String| +|subscription_arn|String| |topic_arn|String| |confirmation_was_authenticated|Bool| |pending_confirmation|Bool| diff --git a/plugins/source/aws/docs/tables/aws_sqs_queues.md b/plugins/source/aws/docs/tables/aws_sqs_queues.md index 688e06e99a0839..8fbd85f07a036d 100644 --- a/plugins/source/aws/docs/tables/aws_sqs_queues.md +++ b/plugins/source/aws/docs/tables/aws_sqs_queues.md @@ -13,10 +13,10 @@ The primary key for this table is **arn**. |account_id|String| |region|String| |arn (PK)|String| -|tags|JSON| |policy|JSON| |redrive_policy|JSON| |redrive_allow_policy|JSON| +|tags|JSON| |url|String| |approximate_number_of_messages|Int| |approximate_number_of_messages_delayed|Int| diff --git a/plugins/source/aws/docs/tables/aws_ssm_documents.md b/plugins/source/aws/docs/tables/aws_ssm_documents.md index c59809c8dd457a..119989b5dedf7c 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_documents.md +++ b/plugins/source/aws/docs/tables/aws_ssm_documents.md @@ -16,6 +16,7 @@ The primary key for this table is **arn**. |region|String| |arn (PK)|String| |permissions|JSON| +|tags|JSON| |approved_version|String| |attachments_information|JSON| |author|String| @@ -43,6 +44,5 @@ The primary key for this table is **arn**. |sha1|String| |status|String| |status_information|String| -|tags|JSON| |target_type|String| |version_name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md b/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md index b97eb3f9d117d6..bdf95ad1c3e37a 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md @@ -20,6 +20,7 @@ The primary key for this table is **arn**. |definition|String| |name|String| |role_arn|String| +|state_machine_arn|String| |type|String| |label|String| |logging_configuration|JSON| diff --git a/plugins/source/aws/docs/tables/aws_waf_rule_groups.md b/plugins/source/aws/docs/tables/aws_waf_rule_groups.md index 7b0eb7ee219863..9fb661eae6c46b 100644 --- a/plugins/source/aws/docs/tables/aws_waf_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_waf_rule_groups.md @@ -16,5 +16,6 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |rule_ids|StringArray| -|name|String| -|rule_group_id|String| \ No newline at end of file +|rule_group_id|String| +|metric_name|String| +|name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_waf_rules.md b/plugins/source/aws/docs/tables/aws_waf_rules.md index 7996a3120b2018..e1181d997cdd9d 100644 --- a/plugins/source/aws/docs/tables/aws_waf_rules.md +++ b/plugins/source/aws/docs/tables/aws_waf_rules.md @@ -15,5 +15,7 @@ The primary key for this table is **arn**. |account_id|String| |arn (PK)|String| |tags|JSON| -|name|String| -|rule_id|String| \ No newline at end of file +|predicates|JSON| +|rule_id|String| +|metric_name|String| +|name|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_waf_web_acls.md b/plugins/source/aws/docs/tables/aws_waf_web_acls.md index e0200579fc2d62..38f4fbd400a638 100644 --- a/plugins/source/aws/docs/tables/aws_waf_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_waf_web_acls.md @@ -15,6 +15,10 @@ The primary key for this table is **arn**. |account_id|String| |arn (PK)|String| |tags|JSON| -|logging_configuration|JSON| +|default_action|JSON| +|rules|JSON| +|web_acl_id|String| +|metric_name|String| |name|String| -|web_acl_id|String| \ No newline at end of file +|web_acl_arn|String| +|logging_configuration|JSON| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md b/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md index 57217f3addb532..9426c5075eefa8 100644 --- a/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md @@ -21,4 +21,5 @@ The primary key for this table is **arn**. |rules|JSON| |web_acl_id|String| |metric_name|String| -|name|String| \ No newline at end of file +|name|String| +|web_acl_arn|String| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_xray_groups.md b/plugins/source/aws/docs/tables/aws_xray_groups.md index 71c4415df74d8f..db01244ebf95da 100644 --- a/plugins/source/aws/docs/tables/aws_xray_groups.md +++ b/plugins/source/aws/docs/tables/aws_xray_groups.md @@ -17,5 +17,6 @@ The primary key for this table is **arn**. |arn (PK)|String| |tags|JSON| |filter_expression|String| +|group_arn|String| |group_name|String| |insights_configuration|JSON| \ No newline at end of file diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 6c63d7cd90b21a..d43e86e3c60d3f 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -145,7 +145,6 @@ require ( github.com/ghodss/yaml v1.0.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/iancoleman/strcase v0.2.0 github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 9eca3b72cab1f8..a131535db79652 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -362,8 +362,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go b/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go index 5b15f134f1809f..7c04437c5e6658 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package accessanalyzer import ( + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AnalyzerArchiveRules() *schema.Table { @@ -12,6 +12,7 @@ func AnalyzerArchiveRules() *schema.Table { Name: "aws_accessanalyzer_analyzer_archive_rules", Description: `https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_ArchiveRuleSummary.html`, Resolver: fetchAccessanalyzerAnalyzerArchiveRules, + Transform: transformers.TransformWithStruct(&types.ArchiveRuleSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -28,26 +29,6 @@ func AnalyzerArchiveRules() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "filter", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Filter"), - }, - { - Name: "rule_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleName"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go index 9962c9e982b3ba..17ae162e4d97ed 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package accessanalyzer import ( + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AnalyzerFindings() *schema.Table { @@ -12,6 +12,7 @@ func AnalyzerFindings() *schema.Table { Name: "aws_accessanalyzer_analyzer_findings", Description: `https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_FindingSummary.html`, Resolver: fetchAccessanalyzerAnalyzerFindings, + Transform: transformers.TransformWithStruct(&types.FindingSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -36,76 +37,6 @@ func AnalyzerFindings() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "analyzed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AnalyzedAt"), - }, - { - Name: "condition", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Condition"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "resource_owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceOwnerAccount"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "action", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Action"), - }, - { - Name: "error", - Type: schema.TypeString, - Resolver: schema.PathResolver("Error"), - }, - { - Name: "is_public", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsPublic"), - }, - { - Name: "principal", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Principal"), - }, - { - Name: "resource", - Type: schema.TypeString, - Resolver: schema.PathResolver("Resource"), - }, - { - Name: "sources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Sources"), - }, }, } } diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go index be8e258abe51d9..1c2798ffbcf563 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package accessanalyzer import ( + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Analyzers() *schema.Table { @@ -13,6 +13,7 @@ func Analyzers() *schema.Table { Description: `https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_AnalyzerSummary.html`, Resolver: fetchAccessanalyzerAnalyzers, Multiplex: client.ServiceAccountRegionMultiplexer("access-analyzer"), + Transform: transformers.TransformWithStruct(&types.AnalyzerSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,48 +33,7 @@ func Analyzers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "last_resource_analyzed", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastResourceAnalyzed"), - }, - { - Name: "last_resource_analyzed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastResourceAnalyzedAt"), - }, - { - Name: "status_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StatusReason"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, - Relations: []*schema.Table{ AnalyzerFindings(), AnalyzerArchiveRules(), diff --git a/plugins/source/aws/resources/services/account/alternate_contacts.go b/plugins/source/aws/resources/services/account/alternate_contacts.go index ce9b43b02c0a68..d6ad2924775c66 100644 --- a/plugins/source/aws/resources/services/account/alternate_contacts.go +++ b/plugins/source/aws/resources/services/account/alternate_contacts.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package account import ( + "github.com/aws/aws-sdk-go-v2/service/account/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AlternateContacts() *schema.Table { @@ -13,6 +13,7 @@ func AlternateContacts() *schema.Table { Description: `https://docs.aws.amazon.com/accounts/latest/reference/API_AlternateContact.html`, Resolver: fetchAccountAlternateContacts, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.AlternateContact{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,26 +31,6 @@ func AlternateContacts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "email_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("EmailAddress"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "phone_number", - Type: schema.TypeString, - Resolver: schema.PathResolver("PhoneNumber"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, }, } } diff --git a/plugins/source/aws/resources/services/account/contacts.go b/plugins/source/aws/resources/services/account/contacts.go index 66f3f2c7fda99e..f4d5fcd58333a5 100644 --- a/plugins/source/aws/resources/services/account/contacts.go +++ b/plugins/source/aws/resources/services/account/contacts.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package account import ( + "github.com/aws/aws-sdk-go-v2/service/account/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Contacts() *schema.Table { @@ -13,6 +13,7 @@ func Contacts() *schema.Table { Description: `https://docs.aws.amazon.com/accounts/latest/reference/API_ContactInformation.html`, Resolver: fetchAccountContacts, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.ContactInformation{}), Columns: []schema.Column{ { Name: "account_id", @@ -22,66 +23,6 @@ func Contacts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "address_line1", - Type: schema.TypeString, - Resolver: schema.PathResolver("AddressLine1"), - }, - { - Name: "city", - Type: schema.TypeString, - Resolver: schema.PathResolver("City"), - }, - { - Name: "country_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("CountryCode"), - }, - { - Name: "full_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FullName"), - }, - { - Name: "phone_number", - Type: schema.TypeString, - Resolver: schema.PathResolver("PhoneNumber"), - }, - { - Name: "postal_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("PostalCode"), - }, - { - Name: "address_line2", - Type: schema.TypeString, - Resolver: schema.PathResolver("AddressLine2"), - }, - { - Name: "address_line3", - Type: schema.TypeString, - Resolver: schema.PathResolver("AddressLine3"), - }, - { - Name: "company_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CompanyName"), - }, - { - Name: "district_or_county", - Type: schema.TypeString, - Resolver: schema.PathResolver("DistrictOrCounty"), - }, - { - Name: "state_or_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateOrRegion"), - }, - { - Name: "website_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebsiteUrl"), - }, }, } } diff --git a/plugins/source/aws/resources/services/acm/certificates.go b/plugins/source/aws/resources/services/acm/certificates.go index 9bd3ec6f87e97b..427a56fcace89c 100644 --- a/plugins/source/aws/resources/services/acm/certificates.go +++ b/plugins/source/aws/resources/services/acm/certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package acm import ( + "github.com/aws/aws-sdk-go-v2/service/acm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Certificates() *schema.Table { @@ -14,6 +14,7 @@ func Certificates() *schema.Table { Resolver: fetchAcmCertificates, PreResourceResolver: getCertificate, Multiplex: client.ServiceAccountRegionMultiplexer("acm"), + Transform: transformers.TransformWithStruct(&types.CertificateDetail{}, transformers.WithSkipFields("CertificateArn")), Columns: []schema.Column{ { Name: "account_id", @@ -38,131 +39,6 @@ func Certificates() *schema.Table { Type: schema.TypeJSON, Resolver: resolveCertificateTags, }, - { - Name: "certificate_authority_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateAuthorityArn"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "domain_validation_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainValidationOptions"), - }, - { - Name: "extended_key_usages", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExtendedKeyUsages"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "imported_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ImportedAt"), - }, - { - Name: "in_use_by", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("InUseBy"), - }, - { - Name: "issued_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("IssuedAt"), - }, - { - Name: "issuer", - Type: schema.TypeString, - Resolver: schema.PathResolver("Issuer"), - }, - { - Name: "key_algorithm", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyAlgorithm"), - }, - { - Name: "key_usages", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KeyUsages"), - }, - { - Name: "not_after", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotAfter"), - }, - { - Name: "not_before", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotBefore"), - }, - { - Name: "options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Options"), - }, - { - Name: "renewal_eligibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("RenewalEligibility"), - }, - { - Name: "renewal_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RenewalSummary"), - }, - { - Name: "revocation_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevocationReason"), - }, - { - Name: "revoked_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RevokedAt"), - }, - { - Name: "serial", - Type: schema.TypeString, - Resolver: schema.PathResolver("Serial"), - }, - { - Name: "signature_algorithm", - Type: schema.TypeString, - Resolver: schema.PathResolver("SignatureAlgorithm"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subject", - Type: schema.TypeString, - Resolver: schema.PathResolver("Subject"), - }, - { - Name: "subject_alternative_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubjectAlternativeNames"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go b/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go index d7544eb75cbf65..dda2833e849937 100644 --- a/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go +++ b/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package amp import ( + "github.com/aws/aws-sdk-go-v2/service/amp/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RuleGroupsNamespaces() *schema.Table { @@ -13,6 +13,7 @@ func RuleGroupsNamespaces() *schema.Table { Description: `https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-APIReference.html#AMP-APIReference-RuleGroupsNamespaceDescription`, Resolver: fetchAmpRuleGroupsNamespaces, PreResourceResolver: describeRuleGroupsNamespace, + Transform: transformers.TransformWithStruct(&types.RuleGroupsNamespaceDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,36 +38,6 @@ func RuleGroupsNamespaces() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "data", - Type: schema.TypeIntArray, - Resolver: schema.PathResolver("Data"), - }, - { - Name: "modified_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ModifiedAt"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, } } diff --git a/plugins/source/aws/resources/services/amp/workspaces.go b/plugins/source/aws/resources/services/amp/workspaces.go index e7960b030e08b8..0c0fa42c2f0224 100644 --- a/plugins/source/aws/resources/services/amp/workspaces.go +++ b/plugins/source/aws/resources/services/amp/workspaces.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package amp import ( + "github.com/aws/aws-sdk-go-v2/service/amp/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Workspaces() *schema.Table { @@ -14,6 +14,7 @@ func Workspaces() *schema.Table { Resolver: fetchAmpWorkspaces, PreResourceResolver: describeWorkspace, Multiplex: client.ServiceAccountRegionMultiplexer("amp"), + Transform: transformers.TransformWithStruct(&types.WorkspaceDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -43,38 +44,7 @@ func Workspaces() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "workspace_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkspaceId"), - }, - { - Name: "alias", - Type: schema.TypeString, - Resolver: schema.PathResolver("Alias"), - }, - { - Name: "prometheus_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrometheusEndpoint"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, - Relations: []*schema.Table{ RuleGroupsNamespaces(), }, diff --git a/plugins/source/aws/resources/services/apigateway/api_keys.go b/plugins/source/aws/resources/services/apigateway/api_keys.go index 2a9d8b94f74eff..75a12e8dd082ab 100644 --- a/plugins/source/aws/resources/services/apigateway/api_keys.go +++ b/plugins/source/aws/resources/services/apigateway/api_keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiKeys() *schema.Table { @@ -13,6 +13,7 @@ func ApiKeys() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_ApiKey.html`, Resolver: fetchApigatewayApiKeys, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.ApiKey{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,56 +33,6 @@ func ApiKeys() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "customer_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "last_updated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "stage_keys", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("StageKeys"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/client_certificates.go b/plugins/source/aws/resources/services/apigateway/client_certificates.go index 2d0582ec5538fa..4fa5a5bdb90736 100644 --- a/plugins/source/aws/resources/services/apigateway/client_certificates.go +++ b/plugins/source/aws/resources/services/apigateway/client_certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClientCertificates() *schema.Table { @@ -13,6 +13,7 @@ func ClientCertificates() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_ClientCertificate.html`, Resolver: fetchApigatewayClientCertificates, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.ClientCertificate{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,36 +33,6 @@ func ClientCertificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "client_certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientCertificateId"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "expiration_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpirationDate"), - }, - { - Name: "pem_encoded_certificate", - Type: schema.TypeString, - Resolver: schema.PathResolver("PemEncodedCertificate"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go b/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go index 09e256882a7bd7..31ce4755037f63 100644 --- a/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go +++ b/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DomainNameBasePathMappings() *schema.Table { @@ -13,6 +13,7 @@ func DomainNameBasePathMappings() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_BasePathMapping.html`, Resolver: fetchApigatewayDomainNameBasePathMappings, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.BasePathMapping{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,21 +35,6 @@ func DomainNameBasePathMappings() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayDomainNameBasePathMappingArn, }, - { - Name: "base_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("BasePath"), - }, - { - Name: "rest_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RestApiId"), - }, - { - Name: "stage", - Type: schema.TypeString, - Resolver: schema.PathResolver("Stage"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/domain_names.go b/plugins/source/aws/resources/services/apigateway/domain_names.go index 33c238ed6ee915..7a8b98f86239e3 100644 --- a/plugins/source/aws/resources/services/apigateway/domain_names.go +++ b/plugins/source/aws/resources/services/apigateway/domain_names.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DomainNames() *schema.Table { @@ -13,6 +13,7 @@ func DomainNames() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_DomainName.html`, Resolver: fetchApigatewayDomainNames, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.DomainName{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,93 +33,7 @@ func DomainNames() *schema.Table { PrimaryKey: true, }, }, - { - Name: "certificate_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateArn"), - }, - { - Name: "certificate_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateName"), - }, - { - Name: "certificate_upload_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CertificateUploadDate"), - }, - { - Name: "distribution_domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DistributionDomainName"), - }, - { - Name: "distribution_hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DistributionHostedZoneId"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "domain_name_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainNameStatus"), - }, - { - Name: "domain_name_status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainNameStatusMessage"), - }, - { - Name: "endpoint_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EndpointConfiguration"), - }, - { - Name: "mutual_tls_authentication", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MutualTlsAuthentication"), - }, - { - Name: "ownership_verification_certificate_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnershipVerificationCertificateArn"), - }, - { - Name: "regional_certificate_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegionalCertificateArn"), - }, - { - Name: "regional_certificate_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegionalCertificateName"), - }, - { - Name: "regional_domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegionalDomainName"), - }, - { - Name: "regional_hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegionalHostedZoneId"), - }, - { - Name: "security_policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityPolicy"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, - Relations: []*schema.Table{ DomainNameBasePathMappings(), }, diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go b/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go index c6abee0d9fd8de..e9adf0a2a36b18 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiAuthorizers() *schema.Table { @@ -13,6 +13,7 @@ func RestApiAuthorizers() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Authorizer.html`, Resolver: fetchApigatewayRestApiAuthorizers, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Authorizer{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,56 +35,6 @@ func RestApiAuthorizers() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIAuthorizerArn, }, - { - Name: "auth_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthType"), - }, - { - Name: "authorizer_credentials", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerCredentials"), - }, - { - Name: "authorizer_result_ttl_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AuthorizerResultTtlInSeconds"), - }, - { - Name: "authorizer_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerUri"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "identity_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentitySource"), - }, - { - Name: "identity_validation_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityValidationExpression"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "provider_ar_ns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ProviderARNs"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go b/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go index 6049ee1ac927ff..2f276c8c6488e3 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiDeployments() *schema.Table { @@ -13,6 +13,7 @@ func RestApiDeployments() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Deployment.html`, Resolver: fetchApigatewayRestApiDeployments, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Deployment{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,26 +35,6 @@ func RestApiDeployments() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIDeploymentArn, }, - { - Name: "api_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ApiSummary"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go index 5358b8e0dc22ec..2887e174cc44f6 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiDocumentationParts() *schema.Table { @@ -13,6 +13,7 @@ func RestApiDocumentationParts() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationPart.html`, Resolver: fetchApigatewayRestApiDocumentationParts, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.DocumentationPart{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,21 +35,6 @@ func RestApiDocumentationParts() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIDocumentationPartArn, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "properties", - Type: schema.TypeString, - Resolver: schema.PathResolver("Properties"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go index bc056ddaef6c29..4dad4a86bd889c 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiDocumentationVersions() *schema.Table { @@ -13,6 +13,7 @@ func RestApiDocumentationVersions() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationVersion.html`, Resolver: fetchApigatewayRestApiDocumentationVersions, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.DocumentationVersion{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,21 +35,6 @@ func RestApiDocumentationVersions() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIDocumentationVersionArn, }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go b/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go index 7bdd0fe297a98a..54d95e0688bcdb 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiGatewayResponses() *schema.Table { @@ -13,6 +13,7 @@ func RestApiGatewayResponses() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_GatewayResponse.html`, Resolver: fetchApigatewayRestApiGatewayResponses, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.GatewayResponse{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,31 +35,6 @@ func RestApiGatewayResponses() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIGatewayResponseArn, }, - { - Name: "default_response", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultResponse"), - }, - { - Name: "response_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseParameters"), - }, - { - Name: "response_templates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseTemplates"), - }, - { - Name: "response_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResponseType"), - }, - { - Name: "status_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusCode"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_models.go b/plugins/source/aws/resources/services/apigateway/rest_api_models.go index 5ed7fc8fe9eec3..ed94344add236d 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_models.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_models.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiModels() *schema.Table { @@ -13,6 +13,7 @@ func RestApiModels() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Model.html`, Resolver: fetchApigatewayRestApiModels, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Model{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,31 +40,6 @@ func RestApiModels() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIModelModelTemplate, }, - { - Name: "content_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContentType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "schema", - Type: schema.TypeString, - Resolver: schema.PathResolver("Schema"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go b/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go index 0c60b91891573e..abdf5585518d63 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiRequestValidators() *schema.Table { @@ -13,6 +13,7 @@ func RestApiRequestValidators() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_RequestValidator.html`, Resolver: fetchApigatewayRestApiRequestValidators, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.RequestValidator{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,26 +35,6 @@ func RestApiRequestValidators() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIRequestValidatorArn, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "validate_request_body", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ValidateRequestBody"), - }, - { - Name: "validate_request_parameters", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ValidateRequestParameters"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resources.go b/plugins/source/aws/resources/services/apigateway/rest_api_resources.go index 77b1a215bc04ff..535ddc7080f798 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resources.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resources.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiResources() *schema.Table { @@ -13,6 +13,7 @@ func RestApiResources() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Resource.html`, Resolver: fetchApigatewayRestApiResources, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Resource{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,31 +35,6 @@ func RestApiResources() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIResourceArn, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "parent_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParentId"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "path_part", - Type: schema.TypeString, - Resolver: schema.PathResolver("PathPart"), - }, - { - Name: "resource_methods", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceMethods"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_stages.go b/plugins/source/aws/resources/services/apigateway/rest_api_stages.go index de76017e4854d6..9294beef5747a8 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_stages.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_stages.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApiStages() *schema.Table { @@ -13,6 +13,7 @@ func RestApiStages() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Stage.html`, Resolver: fetchApigatewayRestApiStages, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Stage{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,91 +35,6 @@ func RestApiStages() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayRestAPIStageArn, }, - { - Name: "access_log_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessLogSettings"), - }, - { - Name: "cache_cluster_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CacheClusterEnabled"), - }, - { - Name: "cache_cluster_size", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheClusterSize"), - }, - { - Name: "cache_cluster_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheClusterStatus"), - }, - { - Name: "canary_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CanarySettings"), - }, - { - Name: "client_certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientCertificateId"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "deployment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "documentation_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocumentationVersion"), - }, - { - Name: "last_updated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedDate"), - }, - { - Name: "method_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MethodSettings"), - }, - { - Name: "stage_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StageName"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "tracing_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TracingEnabled"), - }, - { - Name: "variables", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Variables"), - }, - { - Name: "web_acl_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebAclArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/rest_apis.go b/plugins/source/aws/resources/services/apigateway/rest_apis.go index 2e3952dc9793ee..b54128448c8f5a 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_apis.go +++ b/plugins/source/aws/resources/services/apigateway/rest_apis.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RestApis() *schema.Table { @@ -13,6 +13,7 @@ func RestApis() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_RestApi.html`, Resolver: fetchApigatewayRestApis, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.RestApi{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,73 +33,7 @@ func RestApis() *schema.Table { PrimaryKey: true, }, }, - { - Name: "api_key_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiKeySource"), - }, - { - Name: "binary_media_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("BinaryMediaTypes"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "disable_execute_api_endpoint", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DisableExecuteApiEndpoint"), - }, - { - Name: "endpoint_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EndpointConfiguration"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "minimum_compression_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinimumCompressionSize"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("Policy"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "warnings", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Warnings"), - }, }, - Relations: []*schema.Table{ RestApiAuthorizers(), RestApiDeployments(), diff --git a/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go b/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go index 40d686a1bece2b..adc3a9b0da553c 100644 --- a/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go +++ b/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UsagePlanKeys() *schema.Table { @@ -13,6 +13,7 @@ func UsagePlanKeys() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlanKey.html`, Resolver: fetchApigatewayUsagePlanKeys, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.UsagePlanKey{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,26 +35,6 @@ func UsagePlanKeys() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayUsagePlanKeyArn, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigateway/usage_plans.go b/plugins/source/aws/resources/services/apigateway/usage_plans.go index 9b453cbb090636..fe2eb2f43ef04f 100644 --- a/plugins/source/aws/resources/services/apigateway/usage_plans.go +++ b/plugins/source/aws/resources/services/apigateway/usage_plans.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UsagePlans() *schema.Table { @@ -13,6 +13,7 @@ func UsagePlans() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlan.html`, Resolver: fetchApigatewayUsagePlans, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.UsagePlan{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,46 +30,6 @@ func UsagePlans() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayUsagePlanArn, }, - { - Name: "api_stages", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ApiStages"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "product_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductCode"), - }, - { - Name: "quota", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Quota"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "throttle", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Throttle"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/apigateway/vpc_links.go b/plugins/source/aws/resources/services/apigateway/vpc_links.go index 0d68edc564f9d6..1d0f30e45e1d36 100644 --- a/plugins/source/aws/resources/services/apigateway/vpc_links.go +++ b/plugins/source/aws/resources/services/apigateway/vpc_links.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigateway import ( + "github.com/aws/aws-sdk-go-v2/service/apigateway/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcLinks() *schema.Table { @@ -13,6 +13,7 @@ func VpcLinks() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_VpcLink.html`, Resolver: fetchApigatewayVpcLinks, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.VpcLink{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,41 +30,6 @@ func VpcLinks() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayVpcLinkArn, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "target_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("TargetArns"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go index 105dac96db04a2..7c7e84527db04f 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiAuthorizers() *schema.Table { @@ -13,6 +13,7 @@ func ApiAuthorizers() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Authorizer.html`, Resolver: fetchApigatewayv2ApiAuthorizers, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Authorizer{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,61 +40,6 @@ func ApiAuthorizers() *schema.Table { Type: schema.TypeString, Resolver: resolveApiAuthorizerArn(), }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "authorizer_credentials_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerCredentialsArn"), - }, - { - Name: "authorizer_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerId"), - }, - { - Name: "authorizer_payload_format_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerPayloadFormatVersion"), - }, - { - Name: "authorizer_result_ttl_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AuthorizerResultTtlInSeconds"), - }, - { - Name: "authorizer_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerType"), - }, - { - Name: "authorizer_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerUri"), - }, - { - Name: "enable_simple_responses", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableSimpleResponses"), - }, - { - Name: "identity_source", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("IdentitySource"), - }, - { - Name: "identity_validation_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityValidationExpression"), - }, - { - Name: "jwt_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("JwtConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go index 70d50d31833d29..f9f1118ef3c5c6 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiDeployments() *schema.Table { @@ -13,6 +13,7 @@ func ApiDeployments() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Deployment.html`, Resolver: fetchApigatewayv2ApiDeployments, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Deployment{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,36 +40,6 @@ func ApiDeployments() *schema.Table { Type: schema.TypeString, Resolver: resolveApiDeploymentArn(), }, - { - Name: "auto_deployed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoDeployed"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "deployment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentId"), - }, - { - Name: "deployment_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentStatus"), - }, - { - Name: "deployment_status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentStatusMessage"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go b/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go index 9204686b1005ee..77b288ebd64198 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiIntegrationResponses() *schema.Table { @@ -13,6 +13,7 @@ func ApiIntegrationResponses() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_IntegrationResponse.html`, Resolver: fetchApigatewayv2ApiIntegrationResponses, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.IntegrationResponse{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,36 +40,6 @@ func ApiIntegrationResponses() *schema.Table { Type: schema.TypeString, Resolver: resolveApiIntegrationResponseArn(), }, - { - Name: "integration_response_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationResponseKey"), - }, - { - Name: "content_handling_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContentHandlingStrategy"), - }, - { - Name: "integration_response_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationResponseId"), - }, - { - Name: "response_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseParameters"), - }, - { - Name: "response_templates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseTemplates"), - }, - { - Name: "template_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateSelectionExpression"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go index 096cfd9c540152..9f8fe3bc73bdca 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiIntegrations() *schema.Table { @@ -13,6 +13,7 @@ func ApiIntegrations() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Integration.html`, Resolver: fetchApigatewayv2ApiIntegrations, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Integration{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,108 +40,7 @@ func ApiIntegrations() *schema.Table { Type: schema.TypeString, Resolver: resolveApiIntegrationArn(), }, - { - Name: "api_gateway_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ApiGatewayManaged"), - }, - { - Name: "connection_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionId"), - }, - { - Name: "connection_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionType"), - }, - { - Name: "content_handling_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContentHandlingStrategy"), - }, - { - Name: "credentials_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CredentialsArn"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "integration_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationId"), - }, - { - Name: "integration_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationMethod"), - }, - { - Name: "integration_response_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationResponseSelectionExpression"), - }, - { - Name: "integration_subtype", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationSubtype"), - }, - { - Name: "integration_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationType"), - }, - { - Name: "integration_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationUri"), - }, - { - Name: "passthrough_behavior", - Type: schema.TypeString, - Resolver: schema.PathResolver("PassthroughBehavior"), - }, - { - Name: "payload_format_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PayloadFormatVersion"), - }, - { - Name: "request_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequestParameters"), - }, - { - Name: "request_templates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequestTemplates"), - }, - { - Name: "response_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseParameters"), - }, - { - Name: "template_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateSelectionExpression"), - }, - { - Name: "timeout_in_millis", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TimeoutInMillis"), - }, - { - Name: "tls_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TlsConfig"), - }, }, - Relations: []*schema.Table{ ApiIntegrationResponses(), }, diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_models.go b/plugins/source/aws/resources/services/apigatewayv2/api_models.go index 7eb8fcd1ecb41e..52494896fc08fa 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_models.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_models.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiModels() *schema.Table { @@ -13,6 +13,7 @@ func ApiModels() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Model.html`, Resolver: fetchApigatewayv2ApiModels, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Model{}), Columns: []schema.Column{ { Name: "account_id", @@ -44,31 +45,6 @@ func ApiModels() *schema.Table { Type: schema.TypeString, Resolver: resolveApigatewayv2apiModelModelTemplate, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "content_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContentType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "model_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelId"), - }, - { - Name: "schema", - Type: schema.TypeString, - Resolver: schema.PathResolver("Schema"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go b/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go index fc82c1d00a6cd4..4eb632f70ca2c9 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiRouteResponses() *schema.Table { @@ -13,6 +13,7 @@ func ApiRouteResponses() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_RouteResponse.html`, Resolver: fetchApigatewayv2ApiRouteResponses, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.RouteResponse{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,31 +40,6 @@ func ApiRouteResponses() *schema.Table { Type: schema.TypeString, Resolver: resolveApiRouteResponseArn(), }, - { - Name: "route_response_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteResponseKey"), - }, - { - Name: "model_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelSelectionExpression"), - }, - { - Name: "response_models", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseModels"), - }, - { - Name: "response_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResponseParameters"), - }, - { - Name: "route_response_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteResponseId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go index 569d7907afec1c..cbc51a90f93487 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiRoutes() *schema.Table { @@ -13,6 +13,7 @@ func ApiRoutes() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Route.html`, Resolver: fetchApigatewayv2ApiRoutes, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Route{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,73 +40,7 @@ func ApiRoutes() *schema.Table { Type: schema.TypeString, Resolver: resolveApiRouteArn(), }, - { - Name: "route_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteKey"), - }, - { - Name: "api_gateway_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ApiGatewayManaged"), - }, - { - Name: "api_key_required", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ApiKeyRequired"), - }, - { - Name: "authorization_scopes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AuthorizationScopes"), - }, - { - Name: "authorization_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizationType"), - }, - { - Name: "authorizer_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizerId"), - }, - { - Name: "model_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelSelectionExpression"), - }, - { - Name: "operation_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("OperationName"), - }, - { - Name: "request_models", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequestModels"), - }, - { - Name: "request_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequestParameters"), - }, - { - Name: "route_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteId"), - }, - { - Name: "route_response_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteResponseSelectionExpression"), - }, - { - Name: "target", - Type: schema.TypeString, - Resolver: schema.PathResolver("Target"), - }, }, - Relations: []*schema.Table{ ApiRouteResponses(), }, diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go index 101ecc989a3498..1238d5963446f6 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiStages() *schema.Table { @@ -13,6 +13,7 @@ func ApiStages() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Stage.html`, Resolver: fetchApigatewayv2ApiStages, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Stage{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,76 +40,6 @@ func ApiStages() *schema.Table { Type: schema.TypeString, Resolver: resolveApiStageArn(), }, - { - Name: "stage_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StageName"), - }, - { - Name: "access_log_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessLogSettings"), - }, - { - Name: "api_gateway_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ApiGatewayManaged"), - }, - { - Name: "auto_deploy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoDeploy"), - }, - { - Name: "client_certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientCertificateId"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "default_route_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultRouteSettings"), - }, - { - Name: "deployment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_deployment_status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastDeploymentStatusMessage"), - }, - { - Name: "last_updated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedDate"), - }, - { - Name: "route_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RouteSettings"), - }, - { - Name: "stage_variables", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StageVariables"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apigatewayv2/apis.go b/plugins/source/aws/resources/services/apigatewayv2/apis.go index 8b091e8d411217..94eaa4d4ef0b84 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/apis.go +++ b/plugins/source/aws/resources/services/apigatewayv2/apis.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Apis() *schema.Table { @@ -13,6 +13,7 @@ func Apis() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_Api.html`, Resolver: fetchApigatewayv2Apis, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.Api{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,83 +35,7 @@ func Apis() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("ApiId"), }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "protocol_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProtocolType"), - }, - { - Name: "route_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteSelectionExpression"), - }, - { - Name: "api_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiEndpoint"), - }, - { - Name: "api_gateway_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ApiGatewayManaged"), - }, - { - Name: "api_key_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiKeySelectionExpression"), - }, - { - Name: "cors_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CorsConfiguration"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "disable_execute_api_endpoint", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DisableExecuteApiEndpoint"), - }, - { - Name: "disable_schema_validation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DisableSchemaValidation"), - }, - { - Name: "import_info", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ImportInfo"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "warnings", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Warnings"), - }, }, - Relations: []*schema.Table{ ApiAuthorizers(), ApiDeployments(), diff --git a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go index 07cd7a85e1a388..ef60bdaa0d581f 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go +++ b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DomainNames() *schema.Table { @@ -13,6 +13,7 @@ func DomainNames() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_DomainName.html`, Resolver: fetchApigatewayv2DomainNames, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.DomainName{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,33 +30,7 @@ func DomainNames() *schema.Table { Type: schema.TypeString, Resolver: resolveDomainNameArn(), }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "api_mapping_selection_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiMappingSelectionExpression"), - }, - { - Name: "domain_name_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainNameConfigurations"), - }, - { - Name: "mutual_tls_authentication", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MutualTlsAuthentication"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, - Relations: []*schema.Table{ DomainNameRestApiMappings(), }, diff --git a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go index 952c9ed154f458..7360a982beaf0a 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go +++ b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apigatewayv2 import ( + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcLinks() *schema.Table { @@ -13,6 +13,7 @@ func VpcLinks() *schema.Table { Description: `https://docs.aws.amazon.com/apigateway/latest/api/API_VpcLink.html`, Resolver: fetchApigatewayv2VpcLinks, Multiplex: client.ServiceAccountRegionMultiplexer("apigateway"), + Transform: transformers.TransformWithStruct(&types.VpcLink{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,51 +30,6 @@ func VpcLinks() *schema.Table { Type: schema.TypeString, Resolver: resolveVpcLinkArn(), }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "security_group_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroupIds"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, - { - Name: "vpc_link_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcLinkId"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "vpc_link_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcLinkStatus"), - }, - { - Name: "vpc_link_status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcLinkStatusMessage"), - }, - { - Name: "vpc_link_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcLinkVersion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/applicationautoscaling/policies.go b/plugins/source/aws/resources/services/applicationautoscaling/policies.go index c4917f83eb092f..91c5fa242efa8c 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/policies.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/policies.go @@ -3,8 +3,10 @@ package applicationautoscaling import ( + "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Policies() *schema.Table { @@ -13,6 +15,7 @@ func Policies() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPolicy.html`, Resolver: fetchApplicationautoscalingPolicies, Multiplex: client.ServiceAccountRegionNamespaceMultiplexer("application-autoscaling"), + Transform: transformers.TransformWithStruct(&types.ScalingPolicy{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,51 +35,6 @@ func Policies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "policy_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyType"), - }, - { - Name: "resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceId"), - }, - { - Name: "scalable_dimension", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScalableDimension"), - }, - { - Name: "service_namespace", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceNamespace"), - }, - { - Name: "alarms", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Alarms"), - }, - { - Name: "step_scaling_policy_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StepScalingPolicyConfiguration"), - }, - { - Name: "target_tracking_scaling_policy_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetTrackingScalingPolicyConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go b/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go index 60a29d64a5633c..60620043a8fa1d 100644 --- a/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AutoScalingConfigurations() *schema.Table { @@ -14,6 +14,7 @@ func AutoScalingConfigurations() *schema.Table { Resolver: fetchApprunnerAutoScalingConfigurations, PreResourceResolver: getAutoScalingConfiguration, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.AutoScalingConfiguration{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,51 +39,6 @@ func AutoScalingConfigurations() *schema.Table { Type: schema.TypeJSON, Resolver: resolveApprunnerTags("AutoScalingConfigurationArn"), }, - { - Name: "auto_scaling_configuration_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingConfigurationName"), - }, - { - Name: "auto_scaling_configuration_revision", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AutoScalingConfigurationRevision"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "deleted_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedAt"), - }, - { - Name: "latest", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Latest"), - }, - { - Name: "max_concurrency", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxConcurrency"), - }, - { - Name: "max_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxSize"), - }, - { - Name: "min_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinSize"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/connections.go b/plugins/source/aws/resources/services/apprunner/connections.go index f33c3507fa5246..adfe9c3290984c 100644 --- a/plugins/source/aws/resources/services/apprunner/connections.go +++ b/plugins/source/aws/resources/services/apprunner/connections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Connections() *schema.Table { @@ -13,6 +13,7 @@ func Connections() *schema.Table { Description: `https://docs.aws.amazon.com/apprunner/latest/api/API_Connection.html`, Resolver: fetchApprunnerConnections, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.ConnectionSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,26 +38,6 @@ func Connections() *schema.Table { Type: schema.TypeJSON, Resolver: resolveApprunnerTags("ConnectionArn"), }, - { - Name: "connection_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionName"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "provider_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/custom_domains.go b/plugins/source/aws/resources/services/apprunner/custom_domains.go index 677db36243fae1..4194ddfbcc8bd0 100644 --- a/plugins/source/aws/resources/services/apprunner/custom_domains.go +++ b/plugins/source/aws/resources/services/apprunner/custom_domains.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CustomDomains() *schema.Table { @@ -12,6 +12,7 @@ func CustomDomains() *schema.Table { Name: "aws_apprunner_custom_domains", Description: `https://docs.aws.amazon.com/apprunner/latest/api/API_CustomDomain.html`, Resolver: fetchApprunnerCustomDomains, + Transform: transformers.TransformWithStruct(&types.CustomDomain{}), Columns: []schema.Column{ { Name: "account_id", @@ -23,26 +24,11 @@ func CustomDomains() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, { Name: "enable_www_subdomain", Type: schema.TypeBool, Resolver: schema.PathResolver("EnableWWWSubdomain"), }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "certificate_validation_records", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CertificateValidationRecords"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/observability_configurations.go b/plugins/source/aws/resources/services/apprunner/observability_configurations.go index 4a1704309055e8..79f7153edbfb72 100644 --- a/plugins/source/aws/resources/services/apprunner/observability_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/observability_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ObservabilityConfigurations() *schema.Table { @@ -14,6 +14,7 @@ func ObservabilityConfigurations() *schema.Table { Resolver: fetchApprunnerObservabilityConfigurations, PreResourceResolver: getObservabilityConfiguration, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.ObservabilityConfiguration{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,41 +39,6 @@ func ObservabilityConfigurations() *schema.Table { Type: schema.TypeJSON, Resolver: resolveApprunnerTags("ObservabilityConfigurationArn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "deleted_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedAt"), - }, - { - Name: "latest", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Latest"), - }, - { - Name: "observability_configuration_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ObservabilityConfigurationName"), - }, - { - Name: "observability_configuration_revision", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ObservabilityConfigurationRevision"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "trace_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TraceConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/operations.go b/plugins/source/aws/resources/services/apprunner/operations.go index 9f96b89a5f43f1..f1a7b77222f133 100644 --- a/plugins/source/aws/resources/services/apprunner/operations.go +++ b/plugins/source/aws/resources/services/apprunner/operations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Operations() *schema.Table { @@ -12,6 +12,7 @@ func Operations() *schema.Table { Name: "aws_apprunner_operations", Description: `https://docs.aws.amazon.com/apprunner/latest/api/API_OperationSummary.html`, Resolver: fetchApprunnerOperations, + Transform: transformers.TransformWithStruct(&types.OperationSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -23,41 +24,6 @@ func Operations() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "ended_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndedAt"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartedAt"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "target_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetArn"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/services.go b/plugins/source/aws/resources/services/apprunner/services.go index 81aa2fa392e8e0..be5e342876d68e 100644 --- a/plugins/source/aws/resources/services/apprunner/services.go +++ b/plugins/source/aws/resources/services/apprunner/services.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Services() *schema.Table { @@ -14,6 +14,7 @@ func Services() *schema.Table { Resolver: fetchApprunnerServices, PreResourceResolver: getService, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.Service{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,78 +39,7 @@ func Services() *schema.Table { Type: schema.TypeJSON, Resolver: resolveApprunnerTags("ServiceArn"), }, - { - Name: "auto_scaling_configuration_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AutoScalingConfigurationSummary"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "instance_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceConfiguration"), - }, - { - Name: "network_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkConfiguration"), - }, - { - Name: "service_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceId"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "source_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceConfiguration"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "deleted_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedAt"), - }, - { - Name: "encryption_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionConfiguration"), - }, - { - Name: "health_check_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HealthCheckConfiguration"), - }, - { - Name: "observability_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ObservabilityConfiguration"), - }, - { - Name: "service_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUrl"), - }, }, - Relations: []*schema.Table{ Operations(), CustomDomains(), diff --git a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go index 63cdbf999a13a0..4a4dcfb6ccce9d 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcConnectors() *schema.Table { @@ -13,6 +13,7 @@ func VpcConnectors() *schema.Table { Description: `https://docs.aws.amazon.com/apprunner/latest/api/API_VpcConnector.html`, Resolver: fetchApprunnerVpcConnectors, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.VpcConnector{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,41 +38,6 @@ func VpcConnectors() *schema.Table { Type: schema.TypeJSON, Resolver: resolveApprunnerTags("VpcConnectorArn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "deleted_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedAt"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subnets", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Subnets"), - }, - { - Name: "vpc_connector_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcConnectorName"), - }, - { - Name: "vpc_connector_revision", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VpcConnectorRevision"), - }, }, } } diff --git a/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go b/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go index d7cea3e7194a41..c4136f5b44376c 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package apprunner import ( + "github.com/aws/aws-sdk-go-v2/service/apprunner/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcIngressConnections() *schema.Table { @@ -17,6 +17,7 @@ Notes: Resolver: fetchApprunnerVpcIngressConnections, PreResourceResolver: getVpcIngressConnection, Multiplex: client.ServiceAccountRegionMultiplexer("apprunner"), + Transform: transformers.TransformWithStruct(&types.VpcIngressConnection{}), Columns: []schema.Column{ { Name: "account_id", @@ -46,41 +47,6 @@ Notes: Type: schema.TypeJSON, Resolver: resolveApprunnerTags("VpcIngressConnectionArn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "deleted_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedAt"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "ingress_vpc_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IngressVpcConfiguration"), - }, - { - Name: "service_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "vpc_ingress_connection_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcIngressConnectionName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/app_blocks.go b/plugins/source/aws/resources/services/appstream/app_blocks.go index f1c2407a9d8b27..8980ede4a51a38 100644 --- a/plugins/source/aws/resources/services/appstream/app_blocks.go +++ b/plugins/source/aws/resources/services/appstream/app_blocks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AppBlocks() *schema.Table { @@ -13,6 +13,7 @@ func AppBlocks() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_AppBlock.html`, Resolver: fetchAppstreamAppBlocks, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.AppBlock{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,36 +33,6 @@ func AppBlocks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "setup_script_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SetupScriptDetails"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "source_s3_location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceS3Location"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go index 3fe68481570b71..acfa5db4fbe76e 100644 --- a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go +++ b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApplicationFleetAssociations() *schema.Table { @@ -13,6 +13,7 @@ func ApplicationFleetAssociations() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ApplicationFleetAssociation.html`, Resolver: fetchAppstreamApplicationFleetAssociations, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.ApplicationFleetAssociation{}), Columns: []schema.Column{ { Name: "account_id", diff --git a/plugins/source/aws/resources/services/appstream/applications.go b/plugins/source/aws/resources/services/appstream/applications.go index cb1ef1c7d30e46..13ae4b64af94a4 100644 --- a/plugins/source/aws/resources/services/appstream/applications.go +++ b/plugins/source/aws/resources/services/appstream/applications.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Applications() *schema.Table { @@ -13,6 +13,7 @@ func Applications() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Application.html`, Resolver: fetchAppstreamApplications, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.Application{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,78 +33,7 @@ func Applications() *schema.Table { PrimaryKey: true, }, }, - { - Name: "app_block_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("AppBlockArn"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "icon_s3_location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IconS3Location"), - }, - { - Name: "icon_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("IconURL"), - }, - { - Name: "instance_families", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("InstanceFamilies"), - }, - { - Name: "launch_parameters", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchParameters"), - }, - { - Name: "launch_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchPath"), - }, - { - Name: "metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Metadata"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "platforms", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Platforms"), - }, - { - Name: "working_directory", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkingDirectory"), - }, }, - Relations: []*schema.Table{ ApplicationFleetAssociations(), }, diff --git a/plugins/source/aws/resources/services/appstream/directory_configs.go b/plugins/source/aws/resources/services/appstream/directory_configs.go index d396cde8b543f1..0317ed845a28f3 100644 --- a/plugins/source/aws/resources/services/appstream/directory_configs.go +++ b/plugins/source/aws/resources/services/appstream/directory_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DirectoryConfigs() *schema.Table { @@ -13,6 +13,7 @@ func DirectoryConfigs() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_DirectoryConfig.html`, Resolver: fetchAppstreamDirectoryConfigs, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.DirectoryConfig{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,26 +39,6 @@ func DirectoryConfigs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "certificate_based_auth_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CertificateBasedAuthProperties"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "organizational_unit_distinguished_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("OrganizationalUnitDistinguishedNames"), - }, - { - Name: "service_account_credentials", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceAccountCredentials"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/fleets.go b/plugins/source/aws/resources/services/appstream/fleets.go index 6d92dc80bfe6e9..6efed401409f04 100644 --- a/plugins/source/aws/resources/services/appstream/fleets.go +++ b/plugins/source/aws/resources/services/appstream/fleets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Fleets() *schema.Table { @@ -13,6 +13,7 @@ func Fleets() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Fleet.html`, Resolver: fetchAppstreamFleets, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.Fleet{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,121 +33,6 @@ func Fleets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "compute_capacity_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ComputeCapacityStatus"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "disconnect_timeout_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DisconnectTimeoutInSeconds"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "domain_join_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainJoinInfo"), - }, - { - Name: "enable_default_internet_access", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableDefaultInternetAccess"), - }, - { - Name: "fleet_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FleetErrors"), - }, - { - Name: "fleet_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("FleetType"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "idle_disconnect_timeout_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IdleDisconnectTimeoutInSeconds"), - }, - { - Name: "image_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageArn"), - }, - { - Name: "image_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageName"), - }, - { - Name: "max_concurrent_sessions", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxConcurrentSessions"), - }, - { - Name: "max_user_duration_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxUserDurationInSeconds"), - }, - { - Name: "platform", - Type: schema.TypeString, - Resolver: schema.PathResolver("Platform"), - }, - { - Name: "session_script_s3_location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SessionScriptS3Location"), - }, - { - Name: "stream_view", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamView"), - }, - { - Name: "usb_device_filter_strings", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("UsbDeviceFilterStrings"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/image_builders.go b/plugins/source/aws/resources/services/appstream/image_builders.go index f785963163f644..3bc336db8bd384 100644 --- a/plugins/source/aws/resources/services/appstream/image_builders.go +++ b/plugins/source/aws/resources/services/appstream/image_builders.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ImageBuilders() *schema.Table { @@ -13,6 +13,7 @@ func ImageBuilders() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ImageBuilder.html`, Resolver: fetchAppstreamImageBuilders, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.ImageBuilder{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,91 +33,6 @@ func ImageBuilders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "access_endpoints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessEndpoints"), - }, - { - Name: "appstream_agent_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AppstreamAgentVersion"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "domain_join_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainJoinInfo"), - }, - { - Name: "enable_default_internet_access", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableDefaultInternetAccess"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "image_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageArn"), - }, - { - Name: "image_builder_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ImageBuilderErrors"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "network_access_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkAccessConfiguration"), - }, - { - Name: "platform", - Type: schema.TypeString, - Resolver: schema.PathResolver("Platform"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_change_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateChangeReason"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/images.go b/plugins/source/aws/resources/services/appstream/images.go index 19e14c3a3583f6..8fab224ddab670 100644 --- a/plugins/source/aws/resources/services/appstream/images.go +++ b/plugins/source/aws/resources/services/appstream/images.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Images() *schema.Table { @@ -13,6 +13,7 @@ func Images() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Image.html`, Resolver: fetchAppstreamImages, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.Image{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,86 +33,6 @@ func Images() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "applications", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Applications"), - }, - { - Name: "appstream_agent_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AppstreamAgentVersion"), - }, - { - Name: "base_image_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("BaseImageArn"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "image_builder_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageBuilderName"), - }, - { - Name: "image_builder_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ImageBuilderSupported"), - }, - { - Name: "image_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ImageErrors"), - }, - { - Name: "image_permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ImagePermissions"), - }, - { - Name: "platform", - Type: schema.TypeString, - Resolver: schema.PathResolver("Platform"), - }, - { - Name: "public_base_image_released_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("PublicBaseImageReleasedDate"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_change_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateChangeReason"), - }, - { - Name: "visibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("Visibility"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/stack_entitlements.go b/plugins/source/aws/resources/services/appstream/stack_entitlements.go index a238ea864e45b3..cffea6de2f5577 100644 --- a/plugins/source/aws/resources/services/appstream/stack_entitlements.go +++ b/plugins/source/aws/resources/services/appstream/stack_entitlements.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StackEntitlements() *schema.Table { @@ -13,6 +13,7 @@ func StackEntitlements() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Entitlement.html`, Resolver: fetchAppstreamStackEntitlements, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.Entitlement{}), Columns: []schema.Column{ { Name: "account_id", @@ -46,31 +47,6 @@ func StackEntitlements() *schema.Table { PrimaryKey: true, }, }, - { - Name: "app_visibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("AppVisibility"), - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attributes"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/stack_user_associations.go b/plugins/source/aws/resources/services/appstream/stack_user_associations.go index a3f74deff3c377..0fd93a83c423fd 100644 --- a/plugins/source/aws/resources/services/appstream/stack_user_associations.go +++ b/plugins/source/aws/resources/services/appstream/stack_user_associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StackUserAssociations() *schema.Table { @@ -13,6 +13,7 @@ func StackUserAssociations() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UserStackAssociation.html`, Resolver: fetchAppstreamStackUserAssociations, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.UserStackAssociation{}), Columns: []schema.Column{ { Name: "account_id", @@ -54,11 +55,6 @@ func StackUserAssociations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "send_email_notification", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SendEmailNotification"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/stacks.go b/plugins/source/aws/resources/services/appstream/stacks.go index 818d7e7d78bc22..3ffcaee4097a10 100644 --- a/plugins/source/aws/resources/services/appstream/stacks.go +++ b/plugins/source/aws/resources/services/appstream/stacks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Stacks() *schema.Table { @@ -13,6 +13,7 @@ func Stacks() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Stack.html`, Resolver: fetchAppstreamStacks, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.Stack{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,71 +33,6 @@ func Stacks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "access_endpoints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessEndpoints"), - }, - { - Name: "application_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ApplicationSettings"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "embed_host_domains", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EmbedHostDomains"), - }, - { - Name: "feedback_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeedbackURL"), - }, - { - Name: "redirect_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("RedirectURL"), - }, - { - Name: "stack_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StackErrors"), - }, - { - Name: "storage_connectors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StorageConnectors"), - }, - { - Name: "streaming_experience_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StreamingExperienceSettings"), - }, - { - Name: "user_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserSettings"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go b/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go index 97c8143fe51653..9e7fbfde384b9e 100644 --- a/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go +++ b/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UsageReportSubscriptions() *schema.Table { @@ -13,6 +13,7 @@ func UsageReportSubscriptions() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UsageReportSubscription.html`, Resolver: fetchAppstreamUsageReportSubscriptions, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.UsageReportSubscription{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,21 +39,6 @@ func UsageReportSubscriptions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "last_generated_report_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastGeneratedReportDate"), - }, - { - Name: "schedule", - Type: schema.TypeString, - Resolver: schema.PathResolver("Schedule"), - }, - { - Name: "subscription_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SubscriptionErrors"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appstream/users.go b/plugins/source/aws/resources/services/appstream/users.go index 97153948aa8092..feb79f93558fbc 100644 --- a/plugins/source/aws/resources/services/appstream/users.go +++ b/plugins/source/aws/resources/services/appstream/users.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appstream import ( + "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Users() *schema.Table { @@ -13,6 +13,7 @@ func Users() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_User.html`, Resolver: fetchAppstreamUsers, Multiplex: client.ServiceAccountRegionMultiplexer("appstream2"), + Transform: transformers.TransformWithStruct(&types.User{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,6 @@ func Users() *schema.Table { PrimaryKey: true, }, }, - { - Name: "authentication_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthenticationType"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "first_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FirstName"), - }, - { - Name: "last_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastName"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/appsync/graphql_apis.go b/plugins/source/aws/resources/services/appsync/graphql_apis.go index c4b5bbef002d32..32a1fc2492b71a 100644 --- a/plugins/source/aws/resources/services/appsync/graphql_apis.go +++ b/plugins/source/aws/resources/services/appsync/graphql_apis.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package appsync import ( + "github.com/aws/aws-sdk-go-v2/service/appsync/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GraphqlApis() *schema.Table { @@ -13,6 +13,7 @@ func GraphqlApis() *schema.Table { Description: `https://docs.aws.amazon.com/appsync/latest/APIReference/API_GraphqlApi.html`, Resolver: fetchAppsyncGraphqlApis, Multiplex: client.ServiceAccountRegionMultiplexer("appsync"), + Transform: transformers.TransformWithStruct(&types.GraphqlApi{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,6 @@ func GraphqlApis() *schema.Table { PrimaryKey: true, }, }, - { - Name: "additional_authentication_providers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdditionalAuthenticationProviders"), - }, - { - Name: "api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiId"), - }, - { - Name: "authentication_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthenticationType"), - }, - { - Name: "lambda_authorizer_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LambdaAuthorizerConfig"), - }, - { - Name: "log_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LogConfig"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "open_id_connect_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OpenIDConnectConfig"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "uris", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Uris"), - }, - { - Name: "user_pool_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserPoolConfig"), - }, - { - Name: "waf_web_acl_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("WafWebAclArn"), - }, - { - Name: "xray_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("XrayEnabled"), - }, }, } } diff --git a/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go b/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go index 7ab65e05c37b8e..fa296b23481b55 100644 --- a/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go +++ b/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataCatalogDatabaseTables() *schema.Table { @@ -13,6 +13,7 @@ func DataCatalogDatabaseTables() *schema.Table { Description: `https://docs.aws.amazon.com/athena/latest/APIReference/API_TableMetadata.html`, Resolver: fetchAthenaDataCatalogDatabaseTables, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.TableMetadata{}), Columns: []schema.Column{ { Name: "account_id", @@ -48,36 +49,6 @@ func DataCatalogDatabaseTables() *schema.Table { PrimaryKey: true, }, }, - { - Name: "columns", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Columns"), - }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "last_access_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAccessTime"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "partition_keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PartitionKeys"), - }, - { - Name: "table_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/athena/data_catalog_databases.go b/plugins/source/aws/resources/services/athena/data_catalog_databases.go index faa797bbad0c1a..85235e098f77d7 100644 --- a/plugins/source/aws/resources/services/athena/data_catalog_databases.go +++ b/plugins/source/aws/resources/services/athena/data_catalog_databases.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataCatalogDatabases() *schema.Table { @@ -13,6 +13,7 @@ func DataCatalogDatabases() *schema.Table { Description: `https://docs.aws.amazon.com/athena/latest/APIReference/API_Database.html`, Resolver: fetchAthenaDataCatalogDatabases, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.Database{}), Columns: []schema.Column{ { Name: "account_id", @@ -40,16 +41,6 @@ func DataCatalogDatabases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/athena/data_catalogs.go b/plugins/source/aws/resources/services/athena/data_catalogs.go index 8c578e79886601..770e471ac282c1 100644 --- a/plugins/source/aws/resources/services/athena/data_catalogs.go +++ b/plugins/source/aws/resources/services/athena/data_catalogs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataCatalogs() *schema.Table { @@ -14,6 +14,7 @@ func DataCatalogs() *schema.Table { Resolver: fetchAthenaDataCatalogs, PreResourceResolver: getDataCatalog, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.DataCatalog{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,26 +39,6 @@ func DataCatalogs() *schema.Table { Type: schema.TypeJSON, Resolver: resolveAthenaDataCatalogTags, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/athena/work_group_named_queries.go b/plugins/source/aws/resources/services/athena/work_group_named_queries.go index fca6ea0477260c..909e62f6e0d15e 100644 --- a/plugins/source/aws/resources/services/athena/work_group_named_queries.go +++ b/plugins/source/aws/resources/services/athena/work_group_named_queries.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WorkGroupNamedQueries() *schema.Table { @@ -14,6 +14,7 @@ func WorkGroupNamedQueries() *schema.Table { Resolver: fetchAthenaWorkGroupNamedQueries, PreResourceResolver: getWorkGroupNamedQuery, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.NamedQuery{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,36 +31,6 @@ func WorkGroupNamedQueries() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "database", - Type: schema.TypeString, - Resolver: schema.PathResolver("Database"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "query_string", - Type: schema.TypeString, - Resolver: schema.PathResolver("QueryString"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "named_query_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NamedQueryId"), - }, - { - Name: "work_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkGroup"), - }, }, } } diff --git a/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go b/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go index 23aaf80d06d956..3e7c9ca14c460a 100644 --- a/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go +++ b/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WorkGroupPreparedStatements() *schema.Table { @@ -14,6 +14,7 @@ func WorkGroupPreparedStatements() *schema.Table { Resolver: fetchAthenaWorkGroupPreparedStatements, PreResourceResolver: getWorkGroupPreparedStatement, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.PreparedStatement{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,31 +31,6 @@ func WorkGroupPreparedStatements() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "query_statement", - Type: schema.TypeString, - Resolver: schema.PathResolver("QueryStatement"), - }, - { - Name: "statement_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatementName"), - }, - { - Name: "work_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkGroupName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/athena/work_group_query_executions.go b/plugins/source/aws/resources/services/athena/work_group_query_executions.go index 787b0a59695124..0b1be508efcd95 100644 --- a/plugins/source/aws/resources/services/athena/work_group_query_executions.go +++ b/plugins/source/aws/resources/services/athena/work_group_query_executions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WorkGroupQueryExecutions() *schema.Table { @@ -14,6 +14,7 @@ func WorkGroupQueryExecutions() *schema.Table { Resolver: fetchAthenaWorkGroupQueryExecutions, PreResourceResolver: getWorkGroupQueryExecution, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.QueryExecution{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,61 +31,6 @@ func WorkGroupQueryExecutions() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "engine_version", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "execution_parameters", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ExecutionParameters"), - }, - { - Name: "query", - Type: schema.TypeString, - Resolver: schema.PathResolver("Query"), - }, - { - Name: "query_execution_context", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("QueryExecutionContext"), - }, - { - Name: "query_execution_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("QueryExecutionId"), - }, - { - Name: "result_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultConfiguration"), - }, - { - Name: "result_reuse_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultReuseConfiguration"), - }, - { - Name: "statement_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatementType"), - }, - { - Name: "statistics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Statistics"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "work_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkGroup"), - }, }, } } diff --git a/plugins/source/aws/resources/services/athena/work_groups.go b/plugins/source/aws/resources/services/athena/work_groups.go index 8f30bdb342b4ee..667a34aa34538c 100644 --- a/plugins/source/aws/resources/services/athena/work_groups.go +++ b/plugins/source/aws/resources/services/athena/work_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package athena import ( + "github.com/aws/aws-sdk-go-v2/service/athena/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WorkGroups() *schema.Table { @@ -14,6 +14,7 @@ func WorkGroups() *schema.Table { Resolver: fetchAthenaWorkGroups, PreResourceResolver: getWorkGroup, Multiplex: client.ServiceAccountRegionMultiplexer("athena"), + Transform: transformers.TransformWithStruct(&types.WorkGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,31 +39,6 @@ func WorkGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveAthenaWorkGroupTags, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Configuration"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go b/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go index b331369966603f..ab1a19cbf4874c 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go +++ b/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package autoscaling import ( + "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GroupLifecycleHooks() *schema.Table { @@ -13,6 +13,7 @@ func GroupLifecycleHooks() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LifecycleHook.html`, Resolver: fetchAutoscalingGroupLifecycleHooks, Multiplex: client.ServiceAccountRegionMultiplexer("autoscaling"), + Transform: transformers.TransformWithStruct(&types.LifecycleHook{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,51 +30,6 @@ func GroupLifecycleHooks() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "auto_scaling_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingGroupName"), - }, - { - Name: "default_result", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultResult"), - }, - { - Name: "global_timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GlobalTimeout"), - }, - { - Name: "heartbeat_timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HeartbeatTimeout"), - }, - { - Name: "lifecycle_hook_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LifecycleHookName"), - }, - { - Name: "lifecycle_transition", - Type: schema.TypeString, - Resolver: schema.PathResolver("LifecycleTransition"), - }, - { - Name: "notification_metadata", - Type: schema.TypeString, - Resolver: schema.PathResolver("NotificationMetadata"), - }, - { - Name: "notification_target_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("NotificationTargetARN"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleARN"), - }, }, } } diff --git a/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go b/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go index 40ea9782cf6534..6dab16c7313edd 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go +++ b/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package autoscaling import ( + "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GroupScalingPolicies() *schema.Table { @@ -13,6 +13,7 @@ func GroupScalingPolicies() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScalingPolicy.html`, Resolver: fetchAutoscalingGroupScalingPolicies, Multiplex: client.ServiceAccountRegionMultiplexer("autoscaling"), + Transform: transformers.TransformWithStruct(&types.ScalingPolicy{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,81 +38,6 @@ func GroupScalingPolicies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "adjustment_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdjustmentType"), - }, - { - Name: "alarms", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Alarms"), - }, - { - Name: "auto_scaling_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingGroupName"), - }, - { - Name: "cooldown", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Cooldown"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "estimated_instance_warmup", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EstimatedInstanceWarmup"), - }, - { - Name: "metric_aggregation_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricAggregationType"), - }, - { - Name: "min_adjustment_magnitude", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinAdjustmentMagnitude"), - }, - { - Name: "min_adjustment_step", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinAdjustmentStep"), - }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "policy_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyType"), - }, - { - Name: "predictive_scaling_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PredictiveScalingConfiguration"), - }, - { - Name: "scaling_adjustment", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ScalingAdjustment"), - }, - { - Name: "step_adjustments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StepAdjustments"), - }, - { - Name: "target_tracking_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetTrackingConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/autoscaling/groups.go b/plugins/source/aws/resources/services/autoscaling/groups.go index 67cbe1be83b72a..e3dd1812148426 100644 --- a/plugins/source/aws/resources/services/autoscaling/groups.go +++ b/plugins/source/aws/resources/services/autoscaling/groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package autoscaling import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/autoscaling/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Groups() *schema.Table { @@ -13,6 +13,7 @@ func Groups() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_AutoScalingGroup.html`, Resolver: fetchAutoscalingGroups, Multiplex: client.ServiceAccountRegionMultiplexer("autoscaling"), + Transform: transformers.TransformWithStruct(&models.AutoScalingGroupWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -42,178 +43,7 @@ func Groups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_scaling_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingGroupName"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "default_cooldown", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DefaultCooldown"), - }, - { - Name: "desired_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DesiredCapacity"), - }, - { - Name: "health_check_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckType"), - }, - { - Name: "max_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxSize"), - }, - { - Name: "min_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinSize"), - }, - { - Name: "capacity_rebalance", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CapacityRebalance"), - }, - { - Name: "context", - Type: schema.TypeString, - Resolver: schema.PathResolver("Context"), - }, - { - Name: "default_instance_warmup", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DefaultInstanceWarmup"), - }, - { - Name: "desired_capacity_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DesiredCapacityType"), - }, - { - Name: "enabled_metrics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnabledMetrics"), - }, - { - Name: "health_check_grace_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthCheckGracePeriod"), - }, - { - Name: "instances", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Instances"), - }, - { - Name: "launch_configuration_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchConfigurationName"), - }, - { - Name: "launch_template", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LaunchTemplate"), - }, - { - Name: "load_balancer_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("LoadBalancerNames"), - }, - { - Name: "max_instance_lifetime", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxInstanceLifetime"), - }, - { - Name: "mixed_instances_policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MixedInstancesPolicy"), - }, - { - Name: "new_instances_protected_from_scale_in", - Type: schema.TypeBool, - Resolver: schema.PathResolver("NewInstancesProtectedFromScaleIn"), - }, - { - Name: "placement_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlacementGroup"), - }, - { - Name: "predicted_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PredictedCapacity"), - }, - { - Name: "service_linked_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceLinkedRoleARN"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "suspended_processes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SuspendedProcesses"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "target_group_ar_ns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("TargetGroupARNs"), - }, - { - Name: "termination_policies", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("TerminationPolicies"), - }, - { - Name: "traffic_sources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TrafficSources"), - }, - { - Name: "vpc_zone_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("VPCZoneIdentifier"), - }, - { - Name: "warm_pool_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WarmPoolConfiguration"), - }, - { - Name: "warm_pool_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("WarmPoolSize"), - }, - { - Name: "notification_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NotificationConfigurations"), - }, }, - Relations: []*schema.Table{ GroupScalingPolicies(), GroupLifecycleHooks(), diff --git a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go index 56dd69e998cbe3..f8b454c2c70482 100644 --- a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go +++ b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package autoscaling import ( + "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LaunchConfigurations() *schema.Table { @@ -13,6 +13,7 @@ func LaunchConfigurations() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LaunchConfiguration.html`, Resolver: fetchAutoscalingLaunchConfigurations, Multiplex: client.ServiceAccountRegionMultiplexer("autoscaling"), + Transform: transformers.TransformWithStruct(&types.LaunchConfiguration{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,101 +33,6 @@ func LaunchConfigurations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "image_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageId"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "launch_configuration_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchConfigurationName"), - }, - { - Name: "associate_public_ip_address", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AssociatePublicIpAddress"), - }, - { - Name: "block_device_mappings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlockDeviceMappings"), - }, - { - Name: "classic_link_vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClassicLinkVPCId"), - }, - { - Name: "classic_link_vpc_security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ClassicLinkVPCSecurityGroups"), - }, - { - Name: "ebs_optimized", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EbsOptimized"), - }, - { - Name: "iam_instance_profile", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamInstanceProfile"), - }, - { - Name: "instance_monitoring", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceMonitoring"), - }, - { - Name: "kernel_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KernelId"), - }, - { - Name: "key_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyName"), - }, - { - Name: "metadata_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MetadataOptions"), - }, - { - Name: "placement_tenancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlacementTenancy"), - }, - { - Name: "ramdisk_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RamdiskId"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "spot_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("SpotPrice"), - }, - { - Name: "user_data", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserData"), - }, }, } } diff --git a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go index e8e9d1ce9a16de..112578433eb8fc 100644 --- a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go +++ b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package autoscaling import ( + "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ScheduledActions() *schema.Table { @@ -13,6 +13,7 @@ func ScheduledActions() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScheduledUpdateGroupAction.html`, Resolver: fetchAutoscalingScheduledActions, Multiplex: client.ServiceAccountRegionMultiplexer("autoscaling"), + Transform: transformers.TransformWithStruct(&types.ScheduledUpdateGroupAction{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,56 +33,6 @@ func ScheduledActions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_scaling_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingGroupName"), - }, - { - Name: "desired_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DesiredCapacity"), - }, - { - Name: "end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndTime"), - }, - { - Name: "max_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxSize"), - }, - { - Name: "min_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinSize"), - }, - { - Name: "recurrence", - Type: schema.TypeString, - Resolver: schema.PathResolver("Recurrence"), - }, - { - Name: "scheduled_action_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScheduledActionName"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Time"), - }, - { - Name: "time_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("TimeZone"), - }, }, } } diff --git a/plugins/source/aws/resources/services/backup/global_settings.go b/plugins/source/aws/resources/services/backup/global_settings.go index 3adf3c2f5f985f..d95561b6fca1b0 100644 --- a/plugins/source/aws/resources/services/backup/global_settings.go +++ b/plugins/source/aws/resources/services/backup/global_settings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GlobalSettings() *schema.Table { @@ -13,6 +13,7 @@ func GlobalSettings() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeGlobalSettings.html`, Resolver: fetchBackupGlobalSettings, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&backup.DescribeGlobalSettingsOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -22,21 +23,6 @@ func GlobalSettings() *schema.Table { PrimaryKey: true, }, }, - { - Name: "global_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalSettings"), - }, - { - Name: "last_update_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdateTime"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/backup/plan_selections.go b/plugins/source/aws/resources/services/backup/plan_selections.go index 1a630afdb59f0a..7cc508f4eb7986 100644 --- a/plugins/source/aws/resources/services/backup/plan_selections.go +++ b/plugins/source/aws/resources/services/backup/plan_selections.go @@ -3,8 +3,10 @@ package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PlanSelections() *schema.Table { @@ -13,6 +15,7 @@ func PlanSelections() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_GetBackupSelection.html`, Resolver: fetchBackupPlanSelections, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&backup.GetBackupSelectionOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,36 +32,6 @@ func PlanSelections() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "backup_plan_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupPlanId"), - }, - { - Name: "backup_selection", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BackupSelection"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "creator_request_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatorRequestId"), - }, - { - Name: "selection_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SelectionId"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/backup/plans.go b/plugins/source/aws/resources/services/backup/plans.go index 1f922d8a04d98c..fa73d5ff8a6887 100644 --- a/plugins/source/aws/resources/services/backup/plans.go +++ b/plugins/source/aws/resources/services/backup/plans.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Plans() *schema.Table { @@ -14,6 +14,7 @@ func Plans() *schema.Table { Resolver: fetchBackupPlans, PreResourceResolver: getPlan, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&backup.GetBackupPlanOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,51 +39,6 @@ func Plans() *schema.Table { Type: schema.TypeJSON, Resolver: resolvePlanTags, }, - { - Name: "advanced_backup_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdvancedBackupSettings"), - }, - { - Name: "backup_plan", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BackupPlan"), - }, - { - Name: "backup_plan_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupPlanId"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "creator_request_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatorRequestId"), - }, - { - Name: "deletion_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletionDate"), - }, - { - Name: "last_execution_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastExecutionDate"), - }, - { - Name: "version_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionId"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/backup/region_settings.go b/plugins/source/aws/resources/services/backup/region_settings.go index a6755205ef07b9..3117c0e8beefcb 100644 --- a/plugins/source/aws/resources/services/backup/region_settings.go +++ b/plugins/source/aws/resources/services/backup/region_settings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegionSettings() *schema.Table { @@ -13,6 +13,7 @@ func RegionSettings() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeRegionSettings.html`, Resolver: fetchBackupRegionSettings, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&backup.DescribeRegionSettingsOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,21 +31,6 @@ func RegionSettings() *schema.Table { PrimaryKey: true, }, }, - { - Name: "resource_type_management_preference", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceTypeManagementPreference"), - }, - { - Name: "resource_type_opt_in_preference", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceTypeOptInPreference"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/backup/vault_recovery_points.go b/plugins/source/aws/resources/services/backup/vault_recovery_points.go index 4ae09dddf1ff9e..2492477d17db9d 100644 --- a/plugins/source/aws/resources/services/backup/vault_recovery_points.go +++ b/plugins/source/aws/resources/services/backup/vault_recovery_points.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VaultRecoveryPoints() *schema.Table { @@ -13,6 +13,7 @@ func VaultRecoveryPoints() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_RecoveryPointByBackupVault.html`, Resolver: fetchBackupVaultRecoveryPoints, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&types.RecoveryPointByBackupVault{}), Columns: []schema.Column{ { Name: "account_id", @@ -42,106 +43,6 @@ func VaultRecoveryPoints() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRecoveryPointTags, }, - { - Name: "backup_size_in_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupSizeInBytes"), - }, - { - Name: "backup_vault_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupVaultArn"), - }, - { - Name: "backup_vault_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupVaultName"), - }, - { - Name: "calculated_lifecycle", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CalculatedLifecycle"), - }, - { - Name: "completion_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletionDate"), - }, - { - Name: "composite_member_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CompositeMemberIdentifier"), - }, - { - Name: "created_by", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "encryption_key_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionKeyArn"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "is_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsEncrypted"), - }, - { - Name: "is_parent", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsParent"), - }, - { - Name: "last_restore_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastRestoreTime"), - }, - { - Name: "lifecycle", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "parent_recovery_point_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParentRecoveryPointArn"), - }, - { - Name: "resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceArn"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "source_backup_vault_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBackupVaultArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, }, } } diff --git a/plugins/source/aws/resources/services/backup/vaults.go b/plugins/source/aws/resources/services/backup/vaults.go index 223e2fde5e2ac6..997ffd7b6b65f0 100644 --- a/plugins/source/aws/resources/services/backup/vaults.go +++ b/plugins/source/aws/resources/services/backup/vaults.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package backup import ( + "github.com/aws/aws-sdk-go-v2/service/backup/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Vaults() *schema.Table { @@ -13,6 +13,7 @@ func Vaults() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_BackupVaultListMember.html`, Resolver: fetchBackupVaults, Multiplex: client.ServiceAccountRegionMultiplexer("backup"), + Transform: transformers.TransformWithStruct(&types.BackupVaultListMember{}), Columns: []schema.Column{ { Name: "account_id", @@ -49,51 +50,6 @@ func Vaults() *schema.Table { Type: schema.TypeJSON, Resolver: resolveVaultTags, }, - { - Name: "backup_vault_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupVaultName"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "creator_request_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatorRequestId"), - }, - { - Name: "encryption_key_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionKeyArn"), - }, - { - Name: "lock_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LockDate"), - }, - { - Name: "locked", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Locked"), - }, - { - Name: "max_retention_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxRetentionDays"), - }, - { - Name: "min_retention_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinRetentionDays"), - }, - { - Name: "number_of_recovery_points", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfRecoveryPoints"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/cloudformation/stack_resources.go b/plugins/source/aws/resources/services/cloudformation/stack_resources.go index 00c66052460068..6c37f299b4752a 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_resources.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_resources.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudformation import ( + "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StackResources() *schema.Table { @@ -13,6 +13,7 @@ func StackResources() *schema.Table { Description: `https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackResourceSummary.html`, Resolver: fetchCloudformationStackResources, Multiplex: client.ServiceAccountRegionMultiplexer("cloudformation"), + Transform: transformers.TransformWithStruct(&types.StackResourceSummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,46 +25,6 @@ func StackResources() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "last_updated_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTimestamp"), - }, - { - Name: "logical_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogicalResourceId"), - }, - { - Name: "resource_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceStatus"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "drift_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DriftInformation"), - }, - { - Name: "module_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ModuleInfo"), - }, - { - Name: "physical_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PhysicalResourceId"), - }, - { - Name: "resource_status_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceStatusReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudformation/stacks.go b/plugins/source/aws/resources/services/cloudformation/stacks.go index 8f362f7d659693..97dbb0495312ae 100644 --- a/plugins/source/aws/resources/services/cloudformation/stacks.go +++ b/plugins/source/aws/resources/services/cloudformation/stacks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudformation import ( + "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Stacks() *schema.Table { @@ -13,6 +13,7 @@ func Stacks() *schema.Table { Description: `https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_Stack.html`, Resolver: fetchCloudformationStacks, Multiplex: client.ServiceAccountRegionMultiplexer("cloudformation"), + Transform: transformers.TransformWithStruct(&types.Stack{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,111 +38,6 @@ func Stacks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "stack_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StackName"), - }, - { - Name: "stack_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("StackStatus"), - }, - { - Name: "capabilities", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Capabilities"), - }, - { - Name: "change_set_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ChangeSetId"), - }, - { - Name: "deletion_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletionTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "disable_rollback", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DisableRollback"), - }, - { - Name: "drift_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DriftInformation"), - }, - { - Name: "enable_termination_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableTerminationProtection"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "notification_ar_ns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NotificationARNs"), - }, - { - Name: "outputs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Outputs"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "parent_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParentId"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleARN"), - }, - { - Name: "rollback_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RollbackConfiguration"), - }, - { - Name: "root_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootId"), - }, - { - Name: "stack_status_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StackStatusReason"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "timeout_in_minutes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TimeoutInMinutes"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/cloudfront/cache_policies.go b/plugins/source/aws/resources/services/cloudfront/cache_policies.go index 597e664243d289..c1a25613a3fb21 100644 --- a/plugins/source/aws/resources/services/cloudfront/cache_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/cache_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudfront import ( + "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CachePolicies() *schema.Table { @@ -13,6 +13,7 @@ func CachePolicies() *schema.Table { Description: `https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_CachePolicySummary.html`, Resolver: fetchCloudfrontCachePolicies, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.CachePolicySummary{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,16 +30,6 @@ func CachePolicies() *schema.Table { Type: schema.TypeString, Resolver: resolveCachePolicyARN(), }, - { - Name: "cache_policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CachePolicy"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudfront/distributions.go b/plugins/source/aws/resources/services/cloudfront/distributions.go index 1ed033b613ce7d..da653ff1c12cc8 100644 --- a/plugins/source/aws/resources/services/cloudfront/distributions.go +++ b/plugins/source/aws/resources/services/cloudfront/distributions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudfront import ( + "github.com/aws/aws-sdk-go-v2/service/cloudfront/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Distributions() *schema.Table { @@ -14,6 +14,7 @@ func Distributions() *schema.Table { Resolver: fetchCloudfrontDistributions, PreResourceResolver: getDistribution, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.Distribution{}), Columns: []schema.Column{ { Name: "account_id", @@ -33,51 +34,6 @@ func Distributions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "distribution_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DistributionConfig"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "in_progress_invalidation_batches", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InProgressInvalidationBatches"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "active_trusted_key_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ActiveTrustedKeyGroups"), - }, - { - Name: "active_trusted_signers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ActiveTrustedSigners"), - }, - { - Name: "alias_icp_recordals", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AliasICPRecordals"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudhsmv2/backups.go b/plugins/source/aws/resources/services/cloudhsmv2/backups.go index 0c6e3814f1584d..85b39de4d0ee1e 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/backups.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/backups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudhsmv2 import ( + "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Backups() *schema.Table { @@ -13,6 +13,7 @@ func Backups() *schema.Table { Description: `https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Backup.html`, Resolver: fetchCloudhsmv2Backups, Multiplex: client.ServiceAccountRegionMultiplexer("cloudhsmv2"), + Transform: transformers.TransformWithStruct(&types.Backup{}, transformers.WithSkipFields("TagList")), Columns: []schema.Column{ { Name: "account_id", @@ -37,56 +38,6 @@ func Backups() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTagField("TagList"), }, - { - Name: "backup_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupId"), - }, - { - Name: "backup_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupState"), - }, - { - Name: "cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterId"), - }, - { - Name: "copy_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CopyTimestamp"), - }, - { - Name: "create_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTimestamp"), - }, - { - Name: "delete_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeleteTimestamp"), - }, - { - Name: "never_expires", - Type: schema.TypeBool, - Resolver: schema.PathResolver("NeverExpires"), - }, - { - Name: "source_backup", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBackup"), - }, - { - Name: "source_cluster", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceCluster"), - }, - { - Name: "source_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceRegion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go index 6faf612197abb4..244f8f0e0c3adb 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudhsmv2 import ( + "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Cluster.html`, Resolver: fetchCloudhsmv2Clusters, Multiplex: client.ServiceAccountRegionMultiplexer("cloudhsmv2"), + Transform: transformers.TransformWithStruct(&types.Cluster{}, transformers.WithSkipFields("TagList")), Columns: []schema.Column{ { Name: "account_id", @@ -37,76 +38,6 @@ func Clusters() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTagField("TagList"), }, - { - Name: "backup_policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupPolicy"), - }, - { - Name: "backup_retention_policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BackupRetentionPolicy"), - }, - { - Name: "certificates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Certificates"), - }, - { - Name: "cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterId"), - }, - { - Name: "create_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTimestamp"), - }, - { - Name: "hsm_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("HsmType"), - }, - { - Name: "hsms", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Hsms"), - }, - { - Name: "pre_co_password", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreCoPassword"), - }, - { - Name: "security_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityGroup"), - }, - { - Name: "source_backup_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBackupId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateMessage"), - }, - { - Name: "subnet_mapping", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SubnetMapping"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go b/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go index 9b5b3d722fc6c3..379a2053a895e8 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go +++ b/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudtrail import ( + "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TrailEventSelectors() *schema.Table { @@ -13,6 +13,7 @@ func TrailEventSelectors() *schema.Table { Description: `https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_EventSelector.html`, Resolver: fetchCloudtrailTrailEventSelectors, Multiplex: client.ServiceAccountRegionMultiplexer("cloudtrail"), + Transform: transformers.TransformWithStruct(&types.EventSelector{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,26 +30,6 @@ func TrailEventSelectors() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "data_resources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DataResources"), - }, - { - Name: "exclude_management_event_sources", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ExcludeManagementEventSources"), - }, - { - Name: "include_management_events", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IncludeManagementEvents"), - }, - { - Name: "read_write_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReadWriteType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudtrail/trails.go b/plugins/source/aws/resources/services/cloudtrail/trails.go index d13177808acb8e..d4fa16ef80ac04 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trails.go +++ b/plugins/source/aws/resources/services/cloudtrail/trails.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudtrail import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/cloudtrail/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Trails() *schema.Table { @@ -13,6 +13,7 @@ func Trails() *schema.Table { Description: `https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_Trail.html`, Resolver: fetchCloudtrailTrails, Multiplex: client.ServiceAccountRegionMultiplexer("cloudtrail"), + Transform: transformers.TransformWithStruct(&models.CloudTrailWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -42,88 +43,7 @@ func Trails() *schema.Table { Type: schema.TypeJSON, Resolver: resolveCloudTrailStatus, }, - { - Name: "cloud_watch_logs_log_group_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloudWatchLogsLogGroupArn"), - }, - { - Name: "cloud_watch_logs_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloudWatchLogsRoleArn"), - }, - { - Name: "has_custom_event_selectors", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HasCustomEventSelectors"), - }, - { - Name: "has_insight_selectors", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HasInsightSelectors"), - }, - { - Name: "home_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("HomeRegion"), - }, - { - Name: "include_global_service_events", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IncludeGlobalServiceEvents"), - }, - { - Name: "is_multi_region_trail", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsMultiRegionTrail"), - }, - { - Name: "is_organization_trail", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsOrganizationTrail"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "log_file_validation_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("LogFileValidationEnabled"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "s3_bucket_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("S3BucketName"), - }, - { - Name: "s3_key_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("S3KeyPrefix"), - }, - { - Name: "sns_topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicARN"), - }, - { - Name: "sns_topic_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicName"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, - Relations: []*schema.Table{ TrailEventSelectors(), }, diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go index 0a4ce171a35de0..ba2df9f2c68553 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudwatchlogs import ( + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LogGroups() *schema.Table { @@ -13,6 +13,7 @@ func LogGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_LogGroup.html`, Resolver: fetchCloudwatchlogsLogGroups, Multiplex: client.ServiceAccountRegionMultiplexer("logs"), + Transform: transformers.TransformWithStruct(&types.LogGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,41 +38,6 @@ func LogGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveLogGroupTags, }, - { - Name: "creation_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "data_protection_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataProtectionStatus"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "log_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogGroupName"), - }, - { - Name: "metric_filter_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MetricFilterCount"), - }, - { - Name: "retention_in_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RetentionInDays"), - }, - { - Name: "stored_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StoredBytes"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go index abfc5b71a4f6e4..7930e0c2350f79 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudwatchlogs import ( + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func MetricFilters() *schema.Table { @@ -13,6 +13,7 @@ func MetricFilters() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_MetricFilter.html`, Resolver: fetchCloudwatchlogsMetricFilters, Multiplex: client.ServiceAccountRegionMultiplexer("logs"), + Transform: transformers.TransformWithStruct(&types.MetricFilter{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,31 +33,6 @@ func MetricFilters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "filter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FilterName"), - }, - { - Name: "filter_pattern", - Type: schema.TypeString, - Resolver: schema.PathResolver("FilterPattern"), - }, - { - Name: "log_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogGroupName"), - }, - { - Name: "metric_transformations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MetricTransformations"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go index f3e3b7f02d35da..3bbf6584b136ae 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cloudwatchlogs import ( + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourcePolicies() *schema.Table { @@ -13,6 +13,7 @@ func ResourcePolicies() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_ResourcePolicy.html`, Resolver: fetchCloudwatchlogsResourcePolicies, Multiplex: client.ServiceAccountRegionMultiplexer("logs"), + Transform: transformers.TransformWithStruct(&types.ResourcePolicy{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,16 +31,6 @@ func ResourcePolicies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "policy_document", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PolicyDocument"), - }, - { - Name: "last_updated_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, { Name: "policy_name", Type: schema.TypeString, @@ -48,6 +39,11 @@ func ResourcePolicies() *schema.Table { PrimaryKey: true, }, }, + { + Name: "policy_document", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("PolicyDocument"), + }, }, } } diff --git a/plugins/source/aws/resources/services/codebuild/projects.go b/plugins/source/aws/resources/services/codebuild/projects.go index 8fa5f45781d9e2..af79b95aa9bba5 100644 --- a/plugins/source/aws/resources/services/codebuild/projects.go +++ b/plugins/source/aws/resources/services/codebuild/projects.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package codebuild import ( + "github.com/aws/aws-sdk-go-v2/service/codebuild/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Projects() *schema.Table { @@ -13,6 +13,7 @@ func Projects() *schema.Table { Description: `https://docs.aws.amazon.com/codebuild/latest/APIReference/API_Project.html`, Resolver: fetchCodebuildProjects, Multiplex: client.ServiceAccountRegionMultiplexer("codebuild"), + Transform: transformers.TransformWithStruct(&types.Project{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,141 +33,6 @@ func Projects() *schema.Table { PrimaryKey: true, }, }, - { - Name: "artifacts", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Artifacts"), - }, - { - Name: "badge", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Badge"), - }, - { - Name: "build_batch_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BuildBatchConfig"), - }, - { - Name: "cache", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Cache"), - }, - { - Name: "concurrent_build_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ConcurrentBuildLimit"), - }, - { - Name: "created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Created"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "encryption_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionKey"), - }, - { - Name: "environment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Environment"), - }, - { - Name: "file_system_locations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FileSystemLocations"), - }, - { - Name: "last_modified", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModified"), - }, - { - Name: "logs_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LogsConfig"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "project_visibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProjectVisibility"), - }, - { - Name: "public_project_alias", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicProjectAlias"), - }, - { - Name: "queued_timeout_in_minutes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("QueuedTimeoutInMinutes"), - }, - { - Name: "resource_access_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceAccessRole"), - }, - { - Name: "secondary_artifacts", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecondaryArtifacts"), - }, - { - Name: "secondary_source_versions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecondarySourceVersions"), - }, - { - Name: "secondary_sources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecondarySources"), - }, - { - Name: "service_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceRole"), - }, - { - Name: "source", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Source"), - }, - { - Name: "source_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceVersion"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "timeout_in_minutes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TimeoutInMinutes"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, - { - Name: "webhook", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Webhook"), - }, }, } } diff --git a/plugins/source/aws/resources/services/codepipeline/pipelines.go b/plugins/source/aws/resources/services/codepipeline/pipelines.go index ec2fefabf5de84..d14c4dc9427252 100644 --- a/plugins/source/aws/resources/services/codepipeline/pipelines.go +++ b/plugins/source/aws/resources/services/codepipeline/pipelines.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package codepipeline import ( + "github.com/aws/aws-sdk-go-v2/service/codepipeline" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Pipelines() *schema.Table { @@ -13,6 +13,7 @@ func Pipelines() *schema.Table { Resolver: fetchCodepipelinePipelines, PreResourceResolver: getPipeline, Multiplex: client.ServiceAccountRegionMultiplexer("codepipeline"), + Transform: transformers.TransformWithStruct(&codepipeline.GetPipelineOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,16 +38,6 @@ func Pipelines() *schema.Table { Type: schema.TypeJSON, Resolver: resolvePipelineTags, }, - { - Name: "metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Metadata"), - }, - { - Name: "pipeline", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Pipeline"), - }, }, } } diff --git a/plugins/source/aws/resources/services/codepipeline/webhooks.go b/plugins/source/aws/resources/services/codepipeline/webhooks.go index 202c9841ff0037..cb70aa700983f2 100644 --- a/plugins/source/aws/resources/services/codepipeline/webhooks.go +++ b/plugins/source/aws/resources/services/codepipeline/webhooks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package codepipeline import ( + "github.com/aws/aws-sdk-go-v2/service/codepipeline/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Webhooks() *schema.Table { @@ -13,6 +13,7 @@ func Webhooks() *schema.Table { Description: `https://docs.aws.amazon.com/codepipeline/latest/APIReference/API_ListWebhookItem.html`, Resolver: fetchCodepipelineWebhooks, Multiplex: client.ServiceAccountRegionMultiplexer("codepipeline"), + Transform: transformers.TransformWithStruct(&types.ListWebhookItem{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,31 +33,6 @@ func Webhooks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "definition", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Definition"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, - { - Name: "error_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorCode"), - }, - { - Name: "error_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorMessage"), - }, - { - Name: "last_triggered", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastTriggered"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/cognito/identity_pools.go b/plugins/source/aws/resources/services/cognito/identity_pools.go index 73d682c5905779..9ad6e0af878530 100644 --- a/plugins/source/aws/resources/services/cognito/identity_pools.go +++ b/plugins/source/aws/resources/services/cognito/identity_pools.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cognito import ( + "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func IdentityPools() *schema.Table { @@ -13,6 +13,7 @@ func IdentityPools() *schema.Table { Resolver: fetchCognitoIdentityPools, PreResourceResolver: getIdentityPool, Multiplex: client.ServiceAccountRegionMultiplexer("cognito-identity"), + Transform: transformers.TransformWithStruct(&cognitoidentity.DescribeIdentityPoolOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -43,56 +44,11 @@ func IdentityPools() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allow_unauthenticated_identities", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowUnauthenticatedIdentities"), - }, - { - Name: "identity_pool_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityPoolName"), - }, - { - Name: "allow_classic_flow", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowClassicFlow"), - }, - { - Name: "cognito_identity_providers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CognitoIdentityProviders"), - }, - { - Name: "developer_provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeveloperProviderName"), - }, - { - Name: "identity_pool_tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityPoolTags"), - }, - { - Name: "open_id_connect_provider_ar_ns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("OpenIdConnectProviderARNs"), - }, { Name: "saml_provider_ar_ns", Type: schema.TypeStringArray, Resolver: schema.PathResolver("SamlProviderARNs"), }, - { - Name: "supported_login_providers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SupportedLoginProviders"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go b/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go index e211f04b2aaf97..32b1a8169b1eb8 100644 --- a/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go +++ b/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cognito import ( + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserPoolIdentityProviders() *schema.Table { @@ -14,6 +14,7 @@ func UserPoolIdentityProviders() *schema.Table { Resolver: fetchCognitoUserPoolIdentityProviders, PreResourceResolver: getUserPoolIdentityProvider, Multiplex: client.ServiceAccountRegionMultiplexer("cognito-identity"), + Transform: transformers.TransformWithStruct(&types.IdentityProviderType{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,46 +31,6 @@ func UserPoolIdentityProviders() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "attribute_mapping", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AttributeMapping"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "idp_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("IdpIdentifiers"), - }, - { - Name: "last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedDate"), - }, - { - Name: "provider_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProviderDetails"), - }, - { - Name: "provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderName"), - }, - { - Name: "provider_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderType"), - }, - { - Name: "user_pool_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserPoolId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/cognito/user_pools.go b/plugins/source/aws/resources/services/cognito/user_pools.go index c3af31e9555195..752b603613b876 100644 --- a/plugins/source/aws/resources/services/cognito/user_pools.go +++ b/plugins/source/aws/resources/services/cognito/user_pools.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package cognito import ( + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserPools() *schema.Table { @@ -14,6 +14,7 @@ func UserPools() *schema.Table { Resolver: fetchCognitoUserPools, PreResourceResolver: getUserPool, Multiplex: client.ServiceAccountRegionMultiplexer("cognito-identity"), + Transform: transformers.TransformWithStruct(&types.UserPoolType{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,166 +40,6 @@ func UserPools() *schema.Table { PrimaryKey: true, }, }, - { - Name: "account_recovery_setting", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccountRecoverySetting"), - }, - { - Name: "admin_create_user_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdminCreateUserConfig"), - }, - { - Name: "alias_attributes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AliasAttributes"), - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "auto_verified_attributes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AutoVerifiedAttributes"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "custom_domain", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomDomain"), - }, - { - Name: "deletion_protection", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "device_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeviceConfiguration"), - }, - { - Name: "domain", - Type: schema.TypeString, - Resolver: schema.PathResolver("Domain"), - }, - { - Name: "email_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EmailConfiguration"), - }, - { - Name: "email_configuration_failure", - Type: schema.TypeString, - Resolver: schema.PathResolver("EmailConfigurationFailure"), - }, - { - Name: "email_verification_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("EmailVerificationMessage"), - }, - { - Name: "email_verification_subject", - Type: schema.TypeString, - Resolver: schema.PathResolver("EmailVerificationSubject"), - }, - { - Name: "estimated_number_of_users", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EstimatedNumberOfUsers"), - }, - { - Name: "lambda_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LambdaConfig"), - }, - { - Name: "last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedDate"), - }, - { - Name: "mfa_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("MfaConfiguration"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Policies"), - }, - { - Name: "schema_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SchemaAttributes"), - }, - { - Name: "sms_authentication_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("SmsAuthenticationMessage"), - }, - { - Name: "sms_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SmsConfiguration"), - }, - { - Name: "sms_configuration_failure", - Type: schema.TypeString, - Resolver: schema.PathResolver("SmsConfigurationFailure"), - }, - { - Name: "sms_verification_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("SmsVerificationMessage"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "user_attribute_update_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserAttributeUpdateSettings"), - }, - { - Name: "user_pool_add_ons", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserPoolAddOns"), - }, - { - Name: "user_pool_tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserPoolTags"), - }, - { - Name: "username_attributes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("UsernameAttributes"), - }, - { - Name: "username_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UsernameConfiguration"), - }, - { - Name: "verification_message_template", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VerificationMessageTemplate"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/config/config_rule_compliances.go b/plugins/source/aws/resources/services/config/config_rule_compliances.go index 39dbba12d713d7..68fc9bc43aece4 100644 --- a/plugins/source/aws/resources/services/config/config_rule_compliances.go +++ b/plugins/source/aws/resources/services/config/config_rule_compliances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package config import ( + "github.com/aws/aws-sdk-go-v2/service/configservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigRuleCompliances() *schema.Table { @@ -12,6 +12,7 @@ func ConfigRuleCompliances() *schema.Table { Name: "aws_config_config_rule_compliances", Resolver: fetchConfigConfigRuleCompliances, Multiplex: client.ServiceAccountRegionMultiplexer("config"), + Transform: transformers.TransformWithStruct(&types.ComplianceByConfigRule{}), Columns: []schema.Column{ { Name: "account_id", @@ -23,16 +24,6 @@ func ConfigRuleCompliances() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "compliance", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Compliance"), - }, - { - Name: "config_rule_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigRuleName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/config/config_rules.go b/plugins/source/aws/resources/services/config/config_rules.go index cede2eca2cde4a..60f25a04991032 100644 --- a/plugins/source/aws/resources/services/config/config_rules.go +++ b/plugins/source/aws/resources/services/config/config_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package config import ( + "github.com/aws/aws-sdk-go-v2/service/configservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigRules() *schema.Table { @@ -12,6 +12,7 @@ func ConfigRules() *schema.Table { Name: "aws_config_config_rules", Resolver: fetchConfigConfigRules, Multiplex: client.ServiceAccountRegionMultiplexer("config"), + Transform: transformers.TransformWithStruct(&types.ConfigRule{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,56 +32,6 @@ func ConfigRules() *schema.Table { PrimaryKey: true, }, }, - { - Name: "source", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Source"), - }, - { - Name: "config_rule_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigRuleId"), - }, - { - Name: "config_rule_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigRuleName"), - }, - { - Name: "config_rule_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigRuleState"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "evaluation_modes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EvaluationModes"), - }, - { - Name: "input_parameters", - Type: schema.TypeString, - Resolver: schema.PathResolver("InputParameters"), - }, - { - Name: "maximum_execution_frequency", - Type: schema.TypeString, - Resolver: schema.PathResolver("MaximumExecutionFrequency"), - }, - { - Name: "scope", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Scope"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/config/configuration_recorders.go b/plugins/source/aws/resources/services/config/configuration_recorders.go index 12cb8b4fdcd707..8e54b3457bfd33 100644 --- a/plugins/source/aws/resources/services/config/configuration_recorders.go +++ b/plugins/source/aws/resources/services/config/configuration_recorders.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package config import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/config/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigurationRecorders() *schema.Table { @@ -12,6 +12,7 @@ func ConfigurationRecorders() *schema.Table { Name: "aws_config_configuration_recorders", Resolver: fetchConfigConfigurationRecorders, Multiplex: client.ServiceAccountRegionMultiplexer("config"), + Transform: transformers.TransformWithStruct(&models.ConfigurationRecorderWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -31,56 +32,6 @@ func ConfigurationRecorders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "recording_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RecordingGroup"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleARN"), - }, - { - Name: "status_last_error_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusLastErrorCode"), - }, - { - Name: "status_last_error_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusLastErrorMessage"), - }, - { - Name: "status_last_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StatusLastStartTime"), - }, - { - Name: "status_last_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusLastStatus"), - }, - { - Name: "status_last_status_change_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StatusLastStatusChangeTime"), - }, - { - Name: "status_last_stop_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StatusLastStopTime"), - }, - { - Name: "status_recording", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StatusRecording"), - }, }, } } diff --git a/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go b/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go index d341933df975f4..f22b830109f08f 100644 --- a/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go +++ b/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package config import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/config/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConformancePackRuleCompliances() *schema.Table { @@ -12,6 +12,7 @@ func ConformancePackRuleCompliances() *schema.Table { Name: "aws_config_conformance_pack_rule_compliances", Resolver: fetchConfigConformancePackRuleCompliances, Multiplex: client.ServiceAccountRegionMultiplexer("config"), + Transform: transformers.TransformWithStruct(&models.ConformancePackComplianceWrapper{}), Columns: []schema.Column{ { Name: "account_id", @@ -28,41 +29,6 @@ func ConformancePackRuleCompliances() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "compliance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ComplianceType"), - }, - { - Name: "config_rule_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigRuleName"), - }, - { - Name: "controls", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Controls"), - }, - { - Name: "config_rule_invoked_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ConfigRuleInvokedTime"), - }, - { - Name: "evaluation_result_identifier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EvaluationResultIdentifier"), - }, - { - Name: "result_recorded_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ResultRecordedTime"), - }, - { - Name: "annotation", - Type: schema.TypeString, - Resolver: schema.PathResolver("Annotation"), - }, }, } } diff --git a/plugins/source/aws/resources/services/config/conformance_packs.go b/plugins/source/aws/resources/services/config/conformance_packs.go index a32000e1ac7a31..98cb1bd9cd3da9 100644 --- a/plugins/source/aws/resources/services/config/conformance_packs.go +++ b/plugins/source/aws/resources/services/config/conformance_packs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package config import ( + "github.com/aws/aws-sdk-go-v2/service/configservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConformancePacks() *schema.Table { @@ -13,6 +13,7 @@ func ConformancePacks() *schema.Table { Description: `https://docs.aws.amazon.com/config/latest/APIReference/API_ConformancePackDetail.html`, Resolver: fetchConfigConformancePacks, Multiplex: client.ServiceAccountRegionMultiplexer("config"), + Transform: transformers.TransformWithStruct(&types.ConformancePackDetail{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,6 @@ func ConformancePacks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "conformance_pack_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConformancePackId"), - }, - { - Name: "conformance_pack_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConformancePackName"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "delivery_s3_bucket", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliveryS3Bucket"), - }, - { - Name: "delivery_s3_key_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliveryS3KeyPrefix"), - }, - { - Name: "last_update_requested_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdateRequestedTime"), - }, - { - Name: "template_ssm_document_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TemplateSSMDocumentDetails"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/dax/clusters.go b/plugins/source/aws/resources/services/dax/clusters.go index cbe94b860eaa02..57115452086041 100644 --- a/plugins/source/aws/resources/services/dax/clusters.go +++ b/plugins/source/aws/resources/services/dax/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dax import ( + "github.com/aws/aws-sdk-go-v2/service/dax/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_dax_Cluster.html`, Resolver: fetchDaxClusters, Multiplex: client.ServiceAccountRegionMultiplexer("dax"), + Transform: transformers.TransformWithStruct(&types.Cluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,91 +38,6 @@ func Clusters() *schema.Table { Type: schema.TypeJSON, Resolver: resolveClusterTags, }, - { - Name: "active_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ActiveNodes"), - }, - { - Name: "cluster_discovery_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ClusterDiscoveryEndpoint"), - }, - { - Name: "cluster_endpoint_encryption_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterEndpointEncryptionType"), - }, - { - Name: "cluster_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "node_ids_to_remove", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NodeIdsToRemove"), - }, - { - Name: "node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NodeType"), - }, - { - Name: "nodes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Nodes"), - }, - { - Name: "notification_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NotificationConfiguration"), - }, - { - Name: "parameter_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ParameterGroup"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "sse_description", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SSEDescription"), - }, - { - Name: "security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subnet_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetGroup"), - }, - { - Name: "total_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalNodes"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/connections.go b/plugins/source/aws/resources/services/directconnect/connections.go index a6ad0eef859888..4e04641c83fa9e 100644 --- a/plugins/source/aws/resources/services/directconnect/connections.go +++ b/plugins/source/aws/resources/services/directconnect/connections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Connections() *schema.Table { @@ -13,6 +13,7 @@ func Connections() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Connection.html`, Resolver: fetchDirectconnectConnections, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.Connection{}), Columns: []schema.Column{ { Name: "account_id", @@ -40,106 +41,6 @@ func Connections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "aws_device", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsDevice"), - }, - { - Name: "aws_device_v2", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsDeviceV2"), - }, - { - Name: "aws_logical_device_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsLogicalDeviceId"), - }, - { - Name: "bandwidth", - Type: schema.TypeString, - Resolver: schema.PathResolver("Bandwidth"), - }, - { - Name: "connection_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionName"), - }, - { - Name: "connection_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionState"), - }, - { - Name: "encryption_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionMode"), - }, - { - Name: "has_logical_redundancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("HasLogicalRedundancy"), - }, - { - Name: "jumbo_frame_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("JumboFrameCapable"), - }, - { - Name: "lag_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LagId"), - }, - { - Name: "loa_issue_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LoaIssueTime"), - }, - { - Name: "location", - Type: schema.TypeString, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "mac_sec_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MacSecCapable"), - }, - { - Name: "mac_sec_keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MacSecKeys"), - }, - { - Name: "owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAccount"), - }, - { - Name: "partner_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PartnerName"), - }, - { - Name: "port_encryption_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("PortEncryptionStatus"), - }, - { - Name: "provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderName"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "vlan", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Vlan"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/gateway_associations.go b/plugins/source/aws/resources/services/directconnect/gateway_associations.go index 9240a266e64137..dc8c920587db6a 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_associations.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GatewayAssociations() *schema.Table { @@ -13,6 +13,7 @@ func GatewayAssociations() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAssociation.html`, Resolver: fetchDirectconnectGatewayAssociations, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.DirectConnectGatewayAssociation{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,56 +35,6 @@ func GatewayAssociations() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "allowed_prefixes_to_direct_connect_gateway", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AllowedPrefixesToDirectConnectGateway"), - }, - { - Name: "associated_gateway", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociatedGateway"), - }, - { - Name: "association_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationId"), - }, - { - Name: "association_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationState"), - }, - { - Name: "direct_connect_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayId"), - }, - { - Name: "direct_connect_gateway_owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayOwnerAccount"), - }, - { - Name: "state_change_error", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateChangeError"), - }, - { - Name: "virtual_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualGatewayId"), - }, - { - Name: "virtual_gateway_owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualGatewayOwnerAccount"), - }, - { - Name: "virtual_gateway_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualGatewayRegion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go index e4af60f7e82e65..52b6c3e1392efe 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GatewayAttachments() *schema.Table { @@ -13,6 +13,7 @@ func GatewayAttachments() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAttachment.html`, Resolver: fetchDirectconnectGatewayAttachments, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.DirectConnectGatewayAttachment{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,41 +35,6 @@ func GatewayAttachments() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "attachment_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachmentState"), - }, - { - Name: "attachment_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachmentType"), - }, - { - Name: "direct_connect_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayId"), - }, - { - Name: "state_change_error", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateChangeError"), - }, - { - Name: "virtual_interface_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceId"), - }, - { - Name: "virtual_interface_owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceOwnerAccount"), - }, - { - Name: "virtual_interface_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceRegion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/gateways.go b/plugins/source/aws/resources/services/directconnect/gateways.go index 6bfa2a3e2fcfe4..5e88d11349cad6 100644 --- a/plugins/source/aws/resources/services/directconnect/gateways.go +++ b/plugins/source/aws/resources/services/directconnect/gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Gateways() *schema.Table { @@ -13,6 +13,7 @@ func Gateways() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGateway.html`, Resolver: fetchDirectconnectGateways, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.DirectConnectGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,33 +38,7 @@ func Gateways() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("DirectConnectGatewayId"), }, - { - Name: "amazon_side_asn", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AmazonSideAsn"), - }, - { - Name: "direct_connect_gateway_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayName"), - }, - { - Name: "direct_connect_gateway_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayState"), - }, - { - Name: "owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAccount"), - }, - { - Name: "state_change_error", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateChangeError"), - }, }, - Relations: []*schema.Table{ GatewayAssociations(), GatewayAttachments(), diff --git a/plugins/source/aws/resources/services/directconnect/lags.go b/plugins/source/aws/resources/services/directconnect/lags.go index a940c6ab69278c..55975478db1e29 100644 --- a/plugins/source/aws/resources/services/directconnect/lags.go +++ b/plugins/source/aws/resources/services/directconnect/lags.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Lags() *schema.Table { @@ -13,6 +13,7 @@ func Lags() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Lag.html`, Resolver: fetchDirectconnectLags, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.Lag{}), Columns: []schema.Column{ { Name: "account_id", @@ -42,96 +43,6 @@ func Lags() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "allows_hosted_connections", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowsHostedConnections"), - }, - { - Name: "aws_device", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsDevice"), - }, - { - Name: "aws_device_v2", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsDeviceV2"), - }, - { - Name: "aws_logical_device_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsLogicalDeviceId"), - }, - { - Name: "connections", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Connections"), - }, - { - Name: "connections_bandwidth", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionsBandwidth"), - }, - { - Name: "encryption_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionMode"), - }, - { - Name: "has_logical_redundancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("HasLogicalRedundancy"), - }, - { - Name: "jumbo_frame_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("JumboFrameCapable"), - }, - { - Name: "lag_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LagName"), - }, - { - Name: "lag_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("LagState"), - }, - { - Name: "location", - Type: schema.TypeString, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "mac_sec_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MacSecCapable"), - }, - { - Name: "mac_sec_keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MacSecKeys"), - }, - { - Name: "minimum_links", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinimumLinks"), - }, - { - Name: "number_of_connections", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfConnections"), - }, - { - Name: "owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAccount"), - }, - { - Name: "provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go index 21d497830275ba..cccc57926c4ee7 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VirtualGateways() *schema.Table { @@ -13,6 +13,7 @@ func VirtualGateways() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualGateway.html`, Resolver: fetchDirectconnectVirtualGateways, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.VirtualGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,11 +39,6 @@ func VirtualGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "virtual_gateway_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualGatewayState"), - }, }, } } diff --git a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go index 9d571ec66e8dc4..e1b1257bafbcbb 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package directconnect import ( + "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VirtualInterfaces() *schema.Table { @@ -13,6 +13,7 @@ func VirtualInterfaces() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualInterface.html`, Resolver: fetchDirectconnectVirtualInterfaces, Multiplex: client.ServiceAccountRegionMultiplexer("directconnect"), + Transform: transformers.TransformWithStruct(&types.VirtualInterface{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,126 +38,11 @@ func VirtualInterfaces() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("VirtualInterfaceId"), }, - { - Name: "address_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("AddressFamily"), - }, - { - Name: "amazon_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("AmazonAddress"), - }, - { - Name: "amazon_side_asn", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AmazonSideAsn"), - }, - { - Name: "asn", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Asn"), - }, - { - Name: "auth_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthKey"), - }, - { - Name: "aws_device_v2", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsDeviceV2"), - }, - { - Name: "aws_logical_device_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsLogicalDeviceId"), - }, - { - Name: "bgp_peers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BgpPeers"), - }, - { - Name: "connection_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionId"), - }, - { - Name: "customer_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerAddress"), - }, - { - Name: "customer_router_config", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerRouterConfig"), - }, - { - Name: "direct_connect_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectConnectGatewayId"), - }, - { - Name: "jumbo_frame_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("JumboFrameCapable"), - }, - { - Name: "location", - Type: schema.TypeString, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "mtu", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Mtu"), - }, - { - Name: "owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAccount"), - }, - { - Name: "route_filter_prefixes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RouteFilterPrefixes"), - }, - { - Name: "site_link_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SiteLinkEnabled"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "virtual_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualGatewayId"), - }, - { - Name: "virtual_interface_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceName"), - }, - { - Name: "virtual_interface_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceState"), - }, - { - Name: "virtual_interface_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualInterfaceType"), - }, - { - Name: "vlan", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Vlan"), - }, }, } } diff --git a/plugins/source/aws/resources/services/dms/replication_instances.go b/plugins/source/aws/resources/services/dms/replication_instances.go index 592ee1bbb96bd7..5e36b78be986f8 100644 --- a/plugins/source/aws/resources/services/dms/replication_instances.go +++ b/plugins/source/aws/resources/services/dms/replication_instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dms import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/dms/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ReplicationInstances() *schema.Table { @@ -13,6 +13,7 @@ func ReplicationInstances() *schema.Table { Description: `https://docs.aws.amazon.com/dms/latest/APIReference/API_ReplicationInstance.html`, Resolver: fetchDmsReplicationInstances, Multiplex: client.ServiceAccountRegionMultiplexer("dms"), + Transform: transformers.TransformWithStruct(&models.ReplicationInstanceWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -32,131 +33,6 @@ func ReplicationInstances() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "dns_name_servers", - Type: schema.TypeString, - Resolver: schema.PathResolver("DnsNameServers"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "free_until", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("FreeUntil"), - }, - { - Name: "instance_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstanceCreateTime"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "network_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkType"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "replication_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationInstanceClass"), - }, - { - Name: "replication_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationInstanceIdentifier"), - }, - { - Name: "replication_instance_ipv6_addresses", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReplicationInstanceIpv6Addresses"), - }, - { - Name: "replication_instance_private_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationInstancePrivateIpAddress"), - }, - { - Name: "replication_instance_private_ip_addresses", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReplicationInstancePrivateIpAddresses"), - }, - { - Name: "replication_instance_public_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationInstancePublicIpAddress"), - }, - { - Name: "replication_instance_public_ip_addresses", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReplicationInstancePublicIpAddresses"), - }, - { - Name: "replication_instance_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationInstanceStatus"), - }, - { - Name: "replication_subnet_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicationSubnetGroup"), - }, - { - Name: "secondary_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecondaryAvailabilityZone"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/certificates.go b/plugins/source/aws/resources/services/docdb/certificates.go index 31ff2249db08a9..cd124f94971926 100644 --- a/plugins/source/aws/resources/services/docdb/certificates.go +++ b/plugins/source/aws/resources/services/docdb/certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Certificates() *schema.Table { @@ -13,6 +13,7 @@ func Certificates() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Certificate.html`, Resolver: fetchDocdbCertificates, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.Certificate{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,31 +33,6 @@ func Certificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateIdentifier"), - }, - { - Name: "certificate_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateType"), - }, - { - Name: "thumbprint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Thumbprint"), - }, - { - Name: "valid_from", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidFrom"), - }, - { - Name: "valid_till", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidTill"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go b/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go index 27dd5ee4949f7f..159aa45cfbd496 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroups() *schema.Table { @@ -13,6 +13,7 @@ func ClusterParameterGroups() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterParameterGroup.html`, Resolver: fetchDocdbClusterParameterGroups, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBClusterParameterGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -52,11 +53,6 @@ func ClusterParameterGroups() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("DBParameterGroupFamily"), }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/cluster_parameters.go b/plugins/source/aws/resources/services/docdb/cluster_parameters.go index 3cde6a350a12b1..6c678956379ddb 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameters.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameters() *schema.Table { @@ -13,6 +13,7 @@ func ClusterParameters() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Parameter.html`, Resolver: fetchDocdbClusterParameters, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.Parameter{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,56 +25,6 @@ func ClusterParameters() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go index 4c0005a1eee23c..7f76c78a74c210 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterSnapshots() *schema.Table { @@ -13,6 +13,7 @@ func ClusterSnapshots() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterSnapshot.html`, Resolver: fetchDocdbClusterSnapshots, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBClusterSnapshot{}), Columns: []schema.Column{ { Name: "account_id", @@ -42,16 +43,6 @@ func ClusterSnapshots() *schema.Table { Type: schema.TypeJSON, Resolver: resolveDocdbClusterSnapshotAttributes, }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, { Name: "db_cluster_identifier", Type: schema.TypeString, @@ -62,66 +53,6 @@ func ClusterSnapshots() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("DBClusterSnapshotIdentifier"), }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "percent_progress", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotCreateTime"), - }, - { - Name: "snapshot_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotType"), - }, - { - Name: "source_db_cluster_snapshot_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceDBClusterSnapshotArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/clusters.go b/plugins/source/aws/resources/services/docdb/clusters.go index d0db56c5f74de9..61351efa206ec9 100644 --- a/plugins/source/aws/resources/services/docdb/clusters.go +++ b/plugins/source/aws/resources/services/docdb/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBCluster.html`, Resolver: fetchDocdbClusters, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBCluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,161 +38,6 @@ func Clusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "associated_roles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociatedRoles"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "clone_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloneGroupId"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_cluster_members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBClusterMembers"), - }, - { - Name: "db_cluster_parameter_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterParameterGroup"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "db_cluster_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbClusterResourceId"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "earliest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EarliestRestorableTime"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostedZoneId"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "percent_progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "read_replica_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaIdentifiers"), - }, - { - Name: "reader_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReaderEndpoint"), - }, - { - Name: "replication_source_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationSourceIdentifier"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/docdb/engine_versions.go b/plugins/source/aws/resources/services/docdb/engine_versions.go index 73545874f914d2..f4a67d219e5499 100644 --- a/plugins/source/aws/resources/services/docdb/engine_versions.go +++ b/plugins/source/aws/resources/services/docdb/engine_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EngineVersions() *schema.Table { @@ -13,6 +13,7 @@ func EngineVersions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html`, Resolver: fetchDocdbEngineVersions, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBEngineVersion{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,36 +39,6 @@ func EngineVersions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "db_engine_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineDescription"), - }, - { - Name: "db_engine_version_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineVersionDescription"), - }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "exportable_log_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ExportableLogTypes"), - }, - { - Name: "supports_log_exports_to_cloudwatch_logs", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsLogExportsToCloudwatchLogs"), - }, - { - Name: "valid_upgrade_target", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ValidUpgradeTarget"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/docdb/event_categories.go b/plugins/source/aws/resources/services/docdb/event_categories.go index d3888ac1dafe61..e05cb31a069651 100644 --- a/plugins/source/aws/resources/services/docdb/event_categories.go +++ b/plugins/source/aws/resources/services/docdb/event_categories.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventCategories() *schema.Table { @@ -13,6 +13,7 @@ func EventCategories() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventCategoriesMap.html`, Resolver: fetchDocdbEventCategories, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.EventCategoriesMap{}), Columns: []schema.Column{ { Name: "account_id", diff --git a/plugins/source/aws/resources/services/docdb/event_subscriptions.go b/plugins/source/aws/resources/services/docdb/event_subscriptions.go index 65d5937d90e3a2..02537fdc6064bb 100644 --- a/plugins/source/aws/resources/services/docdb/event_subscriptions.go +++ b/plugins/source/aws/resources/services/docdb/event_subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventSubscriptions() *schema.Table { @@ -13,6 +13,7 @@ func EventSubscriptions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventSubscription.html`, Resolver: fetchDocdbEventSubscriptions, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.EventSubscription{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,56 +25,6 @@ func EventSubscriptions() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "cust_subscription_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustSubscriptionId"), - }, - { - Name: "customer_aws_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerAwsId"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "event_categories_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategoriesList"), - }, - { - Name: "event_subscription_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventSubscriptionArn"), - }, - { - Name: "sns_topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicArn"), - }, - { - Name: "source_ids_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SourceIdsList"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subscription_creation_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubscriptionCreationTime"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/events.go b/plugins/source/aws/resources/services/docdb/events.go index 150194d4f23f4b..422fd5f1f36642 100644 --- a/plugins/source/aws/resources/services/docdb/events.go +++ b/plugins/source/aws/resources/services/docdb/events.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Events() *schema.Table { @@ -13,6 +13,7 @@ func Events() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Event.html`, Resolver: fetchDocdbEvents, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.Event{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,36 +25,6 @@ func Events() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Date"), - }, - { - Name: "event_categories", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategories"), - }, - { - Name: "message", - Type: schema.TypeString, - Resolver: schema.PathResolver("Message"), - }, - { - Name: "source_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceArn"), - }, - { - Name: "source_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceIdentifier"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/global_clusters.go b/plugins/source/aws/resources/services/docdb/global_clusters.go index 14d669d4cbc37e..eeb629ab838b14 100644 --- a/plugins/source/aws/resources/services/docdb/global_clusters.go +++ b/plugins/source/aws/resources/services/docdb/global_clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GlobalClusters() *schema.Table { @@ -13,6 +13,7 @@ func GlobalClusters() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_GlobalCluster.html`, Resolver: fetchDocdbGlobalClusters, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.GlobalCluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,51 +33,6 @@ func GlobalClusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "global_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalClusterIdentifier"), - }, - { - Name: "global_cluster_members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalClusterMembers"), - }, - { - Name: "global_cluster_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalClusterResourceId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/instances.go b/plugins/source/aws/resources/services/docdb/instances.go index 4b546a74b3b02e..1db19b8c760515 100644 --- a/plugins/source/aws/resources/services/docdb/instances.go +++ b/plugins/source/aws/resources/services/docdb/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -13,6 +13,7 @@ func Instances() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBInstance.html`, Resolver: fetchDocdbInstances, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBInstance{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,136 +38,6 @@ func Instances() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "ca_certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CACertificateIdentifier"), - }, - { - Name: "copy_tags_to_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CopyTagsToSnapshot"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceClass"), - }, - { - Name: "db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceIdentifier"), - }, - { - Name: "db_instance_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceStatus"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "dbi_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbiResourceId"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "instance_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstanceCreateTime"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "promotion_tier", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PromotionTier"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "status_infos", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StatusInfos"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go b/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go index 56317a64c26c10..d9cea9c87cc9bf 100644 --- a/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go +++ b/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func OrderableDbInstanceOptions() *schema.Table { @@ -13,37 +13,7 @@ func OrderableDbInstanceOptions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_OrderableDBInstanceOption.html`, Resolver: fetchDocdbOrderableDbInstanceOptions, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), - Columns: []schema.Column{ - { - Name: "availability_zones", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "db_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceClass"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "vpc", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Vpc"), - }, - }, + Transform: transformers.TransformWithStruct(&types.OrderableDBInstanceOption{}), + Columns: []schema.Column{}, } } diff --git a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go index c5f27b2178c22b..92581d4e3b0ad8 100644 --- a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go +++ b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PendingMaintenanceActions() *schema.Table { @@ -13,6 +13,7 @@ func PendingMaintenanceActions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_PendingMaintenanceAction.html`, Resolver: fetchDocdbPendingMaintenanceActions, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.ResourcePendingMaintenanceActions{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,36 +25,6 @@ func PendingMaintenanceActions() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "action", - Type: schema.TypeString, - Resolver: schema.PathResolver("Action"), - }, - { - Name: "auto_applied_after_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AutoAppliedAfterDate"), - }, - { - Name: "current_apply_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CurrentApplyDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "forced_apply_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ForcedApplyDate"), - }, - { - Name: "opt_in_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("OptInStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions_mock_test.go b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions_mock_test.go new file mode 100644 index 00000000000000..ab2c7b2276032e --- /dev/null +++ b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions_mock_test.go @@ -0,0 +1,32 @@ +package docdb + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/docdb" + "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/client/mocks" + "github.com/cloudquery/plugin-sdk/faker" + "github.com/golang/mock/gomock" +) + +func buildPendingMaintenanceActionsMock(t *testing.T, ctrl *gomock.Controller) client.Services { + m := mocks.NewMockDocdbClient(ctrl) + services := client.Services{ + Docdb: m, + } + var ev docdb.DescribePendingMaintenanceActionsOutput + if err := faker.FakeObject(&ev); err != nil { + t.Fatal(err) + } + ev.Marker = nil + m.EXPECT().DescribePendingMaintenanceActions(gomock.Any(), gomock.Any(), gomock.Any()).Return( + &ev, + nil, + ) + return services +} + +func TestPendingMaintenanceActions(t *testing.T) { + client.AwsMockTestHelper(t, PendingMaintenanceActions(), buildPendingMaintenanceActionsMock, client.TestOptions{}) +} diff --git a/plugins/source/aws/resources/services/docdb/subnet_groups.go b/plugins/source/aws/resources/services/docdb/subnet_groups.go index ac8e9e4a1194bd..7ca2673336fe93 100644 --- a/plugins/source/aws/resources/services/docdb/subnet_groups.go +++ b/plugins/source/aws/resources/services/docdb/subnet_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package docdb import ( + "github.com/aws/aws-sdk-go-v2/service/docdb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubnetGroups() *schema.Table { @@ -13,6 +13,7 @@ func SubnetGroups() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBSubnetGroup.html`, Resolver: fetchDocdbSubnetGroups, Multiplex: client.ServiceAccountRegionMultiplexer("docdb"), + Transform: transformers.TransformWithStruct(&types.DBSubnetGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,31 +38,6 @@ func SubnetGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "db_subnet_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroupDescription"), - }, - { - Name: "db_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroupName"), - }, - { - Name: "subnet_group_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetGroupStatus"), - }, - { - Name: "subnets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Subnets"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go b/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go index 8ba4f56e9440ea..8cf68d58885da3 100644 --- a/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go +++ b/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dynamodb import ( + "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TableContinuousBackups() *schema.Table { @@ -13,6 +13,7 @@ func TableContinuousBackups() *schema.Table { Description: `https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ContinuousBackupsDescription.html`, Resolver: fetchDynamodbTableContinuousBackups, Multiplex: client.ServiceAccountRegionMultiplexer("dynamodb"), + Transform: transformers.TransformWithStruct(&types.ContinuousBackupsDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,16 +30,6 @@ func TableContinuousBackups() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "continuous_backups_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContinuousBackupsStatus"), - }, - { - Name: "point_in_time_recovery_description", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PointInTimeRecoveryDescription"), - }, }, } } diff --git a/plugins/source/aws/resources/services/dynamodb/table_replica_auto_scalings.go b/plugins/source/aws/resources/services/dynamodb/table_replica_auto_scalings.go index 2063c10b22ec22..a585b44ebd9728 100644 --- a/plugins/source/aws/resources/services/dynamodb/table_replica_auto_scalings.go +++ b/plugins/source/aws/resources/services/dynamodb/table_replica_auto_scalings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dynamodb import ( + "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TableReplicaAutoScalings() *schema.Table { @@ -13,6 +13,7 @@ func TableReplicaAutoScalings() *schema.Table { Description: `https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ReplicaAutoScalingDescription.html`, Resolver: fetchDynamodbTableReplicaAutoScalings, Multiplex: client.ServiceAccountRegionMultiplexer("dynamodb"), + Transform: transformers.TransformWithStruct(&types.ReplicaAutoScalingDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,31 +30,6 @@ func TableReplicaAutoScalings() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "global_secondary_indexes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalSecondaryIndexes"), - }, - { - Name: "region_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegionName"), - }, - { - Name: "replica_provisioned_read_capacity_auto_scaling_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicaProvisionedReadCapacityAutoScalingSettings"), - }, - { - Name: "replica_provisioned_write_capacity_auto_scaling_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicaProvisionedWriteCapacityAutoScalingSettings"), - }, - { - Name: "replica_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicaStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/dynamodb/tables.go b/plugins/source/aws/resources/services/dynamodb/tables.go index caf8de4e0b9217..f088c80c70a054 100644 --- a/plugins/source/aws/resources/services/dynamodb/tables.go +++ b/plugins/source/aws/resources/services/dynamodb/tables.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package dynamodb import ( + "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Tables() *schema.Table { @@ -14,6 +14,7 @@ func Tables() *schema.Table { Resolver: fetchDynamodbTables, PreResourceResolver: getTable, Multiplex: client.ServiceAccountRegionMultiplexer("dynamodb"), + Transform: transformers.TransformWithStruct(&types.TableDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -43,108 +44,7 @@ func Tables() *schema.Table { Type: schema.TypeJSON, Resolver: schema.PathResolver("ArchivalSummary"), }, - { - Name: "attribute_definitions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AttributeDefinitions"), - }, - { - Name: "billing_mode_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BillingModeSummary"), - }, - { - Name: "creation_date_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDateTime"), - }, - { - Name: "global_secondary_indexes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalSecondaryIndexes"), - }, - { - Name: "global_table_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalTableVersion"), - }, - { - Name: "item_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ItemCount"), - }, - { - Name: "key_schema", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KeySchema"), - }, - { - Name: "latest_stream_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("LatestStreamArn"), - }, - { - Name: "latest_stream_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("LatestStreamLabel"), - }, - { - Name: "local_secondary_indexes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LocalSecondaryIndexes"), - }, - { - Name: "provisioned_throughput", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProvisionedThroughput"), - }, - { - Name: "replicas", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Replicas"), - }, - { - Name: "restore_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RestoreSummary"), - }, - { - Name: "sse_description", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SSEDescription"), - }, - { - Name: "stream_specification", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StreamSpecification"), - }, - { - Name: "table_class_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TableClassSummary"), - }, - { - Name: "table_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableId"), - }, - { - Name: "table_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableName"), - }, - { - Name: "table_size_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TableSizeBytes"), - }, - { - Name: "table_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableStatus"), - }, }, - Relations: []*schema.Table{ TableReplicaAutoScalings(), TableContinuousBackups(), diff --git a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go index 358b02a2f08402..8220eb38850319 100644 --- a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go +++ b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ByoipCidrs() *schema.Table { @@ -13,6 +13,7 @@ func ByoipCidrs() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ByoipCidr.html`, Resolver: fetchEc2ByoipCidrs, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.ByoipCidr{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,21 +38,6 @@ func ByoipCidrs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/customer_gateways.go b/plugins/source/aws/resources/services/ec2/customer_gateways.go index bea2fd10dcffcb..59763cda6ef73e 100644 --- a/plugins/source/aws/resources/services/ec2/customer_gateways.go +++ b/plugins/source/aws/resources/services/ec2/customer_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CustomerGateways() *schema.Table { @@ -13,6 +13,7 @@ func CustomerGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CustomerGateway.html`, Resolver: fetchEc2CustomerGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.CustomerGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func CustomerGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "bgp_asn", - Type: schema.TypeString, - Resolver: schema.PathResolver("BgpAsn"), - }, - { - Name: "certificate_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateArn"), - }, - { - Name: "customer_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerGatewayId"), - }, - { - Name: "device_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeviceName"), - }, - { - Name: "ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddress"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go index 50bdf5488e6732..daee12a2e1b580 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go +++ b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EbsSnapshots() *schema.Table { @@ -13,6 +13,7 @@ func EbsSnapshots() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Snapshot.html`, Resolver: fetchEc2EbsSnapshots, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Snapshot{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,91 +38,11 @@ func EbsSnapshots() *schema.Table { Type: schema.TypeJSON, Resolver: resolveEbsSnapshotAttribute, }, - { - Name: "data_encryption_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataEncryptionKeyId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "owner_alias", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAlias"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("Progress"), - }, - { - Name: "restore_expiry_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RestoreExpiryTime"), - }, - { - Name: "snapshot_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotId"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateMessage"), - }, - { - Name: "storage_tier", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageTier"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "volume_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeId"), - }, - { - Name: "volume_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VolumeSize"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/ebs_volumes.go b/plugins/source/aws/resources/services/ec2/ebs_volumes.go index 6e41405869ce9c..5b2a6eeff9269e 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_volumes.go +++ b/plugins/source/aws/resources/services/ec2/ebs_volumes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EbsVolumes() *schema.Table { @@ -13,6 +13,7 @@ func EbsVolumes() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Volume.html`, Resolver: fetchEc2EbsVolumes, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Volume{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,86 +33,11 @@ func EbsVolumes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachments"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "fast_restored", - Type: schema.TypeBool, - Resolver: schema.PathResolver("FastRestored"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "multi_attach_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAttachEnabled"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Size"), - }, - { - Name: "snapshot_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "throughput", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Throughput"), - }, - { - Name: "volume_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeId"), - }, - { - Name: "volume_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go b/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go index 4043a7f546b5ce..c4b77c23620313 100644 --- a/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go +++ b/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EgressOnlyInternetGateways() *schema.Table { @@ -13,6 +13,7 @@ func EgressOnlyInternetGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EgressOnlyInternetGateway.html`, Resolver: fetchEc2EgressOnlyInternetGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.EgressOnlyInternetGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,16 +33,6 @@ func EgressOnlyInternetGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachments"), - }, - { - Name: "egress_only_internet_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("EgressOnlyInternetGatewayId"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/eips.go b/plugins/source/aws/resources/services/ec2/eips.go index 272e08f6c3d176..a13f7864ef3bd3 100644 --- a/plugins/source/aws/resources/services/ec2/eips.go +++ b/plugins/source/aws/resources/services/ec2/eips.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Eips() *schema.Table { @@ -13,6 +13,7 @@ func Eips() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Address.html`, Resolver: fetchEc2Eips, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Address{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,71 +25,6 @@ func Eips() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "allocation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllocationId"), - }, - { - Name: "association_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationId"), - }, - { - Name: "carrier_ip", - Type: schema.TypeString, - Resolver: schema.PathResolver("CarrierIp"), - }, - { - Name: "customer_owned_ip", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerOwnedIp"), - }, - { - Name: "customer_owned_ipv4_pool", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerOwnedIpv4Pool"), - }, - { - Name: "domain", - Type: schema.TypeString, - Resolver: schema.PathResolver("Domain"), - }, - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceId"), - }, - { - Name: "network_border_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkBorderGroup"), - }, - { - Name: "network_interface_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkInterfaceId"), - }, - { - Name: "network_interface_owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkInterfaceOwnerId"), - }, - { - Name: "private_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateIpAddress"), - }, - { - Name: "public_ip", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicIp"), - }, - { - Name: "public_ipv4_pool", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicIpv4Pool"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/flow_logs.go b/plugins/source/aws/resources/services/ec2/flow_logs.go index f0ac182b3100d2..fb59c2316ff19b 100644 --- a/plugins/source/aws/resources/services/ec2/flow_logs.go +++ b/plugins/source/aws/resources/services/ec2/flow_logs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FlowLogs() *schema.Table { @@ -13,6 +13,7 @@ func FlowLogs() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_FlowLog.html`, Resolver: fetchEc2FlowLogs, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.FlowLog{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,86 +33,11 @@ func FlowLogs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "deliver_cross_account_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliverCrossAccountRole"), - }, - { - Name: "deliver_logs_error_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliverLogsErrorMessage"), - }, - { - Name: "deliver_logs_permission_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliverLogsPermissionArn"), - }, - { - Name: "deliver_logs_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliverLogsStatus"), - }, - { - Name: "destination_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DestinationOptions"), - }, - { - Name: "flow_log_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FlowLogId"), - }, - { - Name: "flow_log_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("FlowLogStatus"), - }, - { - Name: "log_destination", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogDestination"), - }, - { - Name: "log_destination_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogDestinationType"), - }, - { - Name: "log_format", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogFormat"), - }, - { - Name: "log_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogGroupName"), - }, - { - Name: "max_aggregation_interval", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxAggregationInterval"), - }, - { - Name: "resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "traffic_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrafficType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/hosts.go b/plugins/source/aws/resources/services/ec2/hosts.go index e54c6125cde1d4..677c9f6e3ffa1f 100644 --- a/plugins/source/aws/resources/services/ec2/hosts.go +++ b/plugins/source/aws/resources/services/ec2/hosts.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Hosts() *schema.Table { @@ -13,6 +13,7 @@ func Hosts() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Host.html`, Resolver: fetchEc2Hosts, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Host{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,91 +33,6 @@ func Hosts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allocation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AllocationTime"), - }, - { - Name: "allows_multiple_instance_types", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowsMultipleInstanceTypes"), - }, - { - Name: "auto_placement", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoPlacement"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "availability_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZoneId"), - }, - { - Name: "available_capacity", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AvailableCapacity"), - }, - { - Name: "client_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientToken"), - }, - { - Name: "host_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostId"), - }, - { - Name: "host_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HostProperties"), - }, - { - Name: "host_recovery", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostRecovery"), - }, - { - Name: "host_reservation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostReservationId"), - }, - { - Name: "instances", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Instances"), - }, - { - Name: "member_of_service_linked_resource_group", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MemberOfServiceLinkedResourceGroup"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "release_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ReleaseTime"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/images.go b/plugins/source/aws/resources/services/ec2/images.go index 85be932216d10f..7b021b628c4556 100644 --- a/plugins/source/aws/resources/services/ec2/images.go +++ b/plugins/source/aws/resources/services/ec2/images.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Images() *schema.Table { @@ -13,6 +13,7 @@ func Images() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Image.html`, Resolver: fetchEc2Images, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Image{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,156 +33,11 @@ func Images() *schema.Table { PrimaryKey: true, }, }, - { - Name: "architecture", - Type: schema.TypeString, - Resolver: schema.PathResolver("Architecture"), - }, - { - Name: "block_device_mappings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlockDeviceMappings"), - }, - { - Name: "boot_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("BootMode"), - }, - { - Name: "creation_date", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "deprecation_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeprecationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "ena_support", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnaSupport"), - }, - { - Name: "hypervisor", - Type: schema.TypeString, - Resolver: schema.PathResolver("Hypervisor"), - }, - { - Name: "image_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageId"), - }, - { - Name: "image_location", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageLocation"), - }, - { - Name: "image_owner_alias", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageOwnerAlias"), - }, - { - Name: "image_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageType"), - }, - { - Name: "imds_support", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImdsSupport"), - }, - { - Name: "kernel_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KernelId"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "platform", - Type: schema.TypeString, - Resolver: schema.PathResolver("Platform"), - }, - { - Name: "platform_details", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformDetails"), - }, - { - Name: "product_codes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProductCodes"), - }, - { - Name: "public", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Public"), - }, - { - Name: "ramdisk_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RamdiskId"), - }, - { - Name: "root_device_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootDeviceName"), - }, - { - Name: "root_device_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootDeviceType"), - }, - { - Name: "sriov_net_support", - Type: schema.TypeString, - Resolver: schema.PathResolver("SriovNetSupport"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateReason"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "tpm_support", - Type: schema.TypeString, - Resolver: schema.PathResolver("TpmSupport"), - }, - { - Name: "usage_operation", - Type: schema.TypeString, - Resolver: schema.PathResolver("UsageOperation"), - }, - { - Name: "virtualization_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualizationType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/instance_statuses.go b/plugins/source/aws/resources/services/ec2/instance_statuses.go index dc4a3aff9bd559..0a23c73e6b4006 100644 --- a/plugins/source/aws/resources/services/ec2/instance_statuses.go +++ b/plugins/source/aws/resources/services/ec2/instance_statuses.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstanceStatuses() *schema.Table { @@ -13,6 +13,7 @@ func InstanceStatuses() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceStatus.html`, Resolver: fetchEc2InstanceStatuses, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.InstanceStatus{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,6 @@ func InstanceStatuses() *schema.Table { PrimaryKey: true, }, }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "events", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Events"), - }, - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceId"), - }, - { - Name: "instance_state", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceState"), - }, - { - Name: "instance_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceStatus"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "system_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SystemStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/instance_types.go b/plugins/source/aws/resources/services/ec2/instance_types.go index 612f2995c22dcb..82feae30a60504 100644 --- a/plugins/source/aws/resources/services/ec2/instance_types.go +++ b/plugins/source/aws/resources/services/ec2/instance_types.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstanceTypes() *schema.Table { @@ -13,6 +13,7 @@ func InstanceTypes() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceTypeInfo.html`, Resolver: fetchEc2InstanceTypes, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.InstanceTypeInfo{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,126 +33,6 @@ func InstanceTypes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_recovery_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoRecoverySupported"), - }, - { - Name: "bare_metal", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BareMetal"), - }, - { - Name: "burstable_performance_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BurstablePerformanceSupported"), - }, - { - Name: "current_generation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CurrentGeneration"), - }, - { - Name: "dedicated_hosts_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DedicatedHostsSupported"), - }, - { - Name: "ebs_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EbsInfo"), - }, - { - Name: "fpga_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FpgaInfo"), - }, - { - Name: "free_tier_eligible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("FreeTierEligible"), - }, - { - Name: "gpu_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GpuInfo"), - }, - { - Name: "hibernation_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HibernationSupported"), - }, - { - Name: "hypervisor", - Type: schema.TypeString, - Resolver: schema.PathResolver("Hypervisor"), - }, - { - Name: "inference_accelerator_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InferenceAcceleratorInfo"), - }, - { - Name: "instance_storage_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceStorageInfo"), - }, - { - Name: "instance_storage_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("InstanceStorageSupported"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "memory_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MemoryInfo"), - }, - { - Name: "network_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkInfo"), - }, - { - Name: "placement_group_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PlacementGroupInfo"), - }, - { - Name: "processor_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProcessorInfo"), - }, - { - Name: "supported_boot_modes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedBootModes"), - }, - { - Name: "supported_root_device_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedRootDeviceTypes"), - }, - { - Name: "supported_usage_classes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedUsageClasses"), - }, - { - Name: "supported_virtualization_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedVirtualizationTypes"), - }, - { - Name: "v_cpu_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VCpuInfo"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/instances.go b/plugins/source/aws/resources/services/ec2/instances.go index a0845da28d1c19..b9ae96261ae0e8 100644 --- a/plugins/source/aws/resources/services/ec2/instances.go +++ b/plugins/source/aws/resources/services/ec2/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -13,6 +13,7 @@ func Instances() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Instance.html`, Resolver: fetchEc2Instances, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Instance{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,286 +39,6 @@ func Instances() *schema.Table { Resolver: resolveEc2InstanceStateTransitionReasonTime, IgnoreInTests: true, }, - { - Name: "ami_launch_index", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AmiLaunchIndex"), - }, - { - Name: "architecture", - Type: schema.TypeString, - Resolver: schema.PathResolver("Architecture"), - }, - { - Name: "block_device_mappings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlockDeviceMappings"), - }, - { - Name: "boot_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("BootMode"), - }, - { - Name: "capacity_reservation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CapacityReservationId"), - }, - { - Name: "capacity_reservation_specification", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CapacityReservationSpecification"), - }, - { - Name: "client_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientToken"), - }, - { - Name: "cpu_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CpuOptions"), - }, - { - Name: "ebs_optimized", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EbsOptimized"), - }, - { - Name: "elastic_gpu_associations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ElasticGpuAssociations"), - }, - { - Name: "elastic_inference_accelerator_associations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ElasticInferenceAcceleratorAssociations"), - }, - { - Name: "ena_support", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnaSupport"), - }, - { - Name: "enclave_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnclaveOptions"), - }, - { - Name: "hibernation_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HibernationOptions"), - }, - { - Name: "hypervisor", - Type: schema.TypeString, - Resolver: schema.PathResolver("Hypervisor"), - }, - { - Name: "iam_instance_profile", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IamInstanceProfile"), - }, - { - Name: "image_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageId"), - }, - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceId"), - }, - { - Name: "instance_lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceLifecycle"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "ipv6_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("Ipv6Address"), - }, - { - Name: "kernel_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KernelId"), - }, - { - Name: "key_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyName"), - }, - { - Name: "launch_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LaunchTime"), - }, - { - Name: "licenses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Licenses"), - }, - { - Name: "maintenance_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MaintenanceOptions"), - }, - { - Name: "metadata_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MetadataOptions"), - }, - { - Name: "monitoring", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Monitoring"), - }, - { - Name: "network_interfaces", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkInterfaces"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "placement", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Placement"), - }, - { - Name: "platform", - Type: schema.TypeString, - Resolver: schema.PathResolver("Platform"), - }, - { - Name: "platform_details", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformDetails"), - }, - { - Name: "private_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDnsName"), - }, - { - Name: "private_dns_name_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateDnsNameOptions"), - }, - { - Name: "private_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateIpAddress"), - }, - { - Name: "product_codes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProductCodes"), - }, - { - Name: "public_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicDnsName"), - }, - { - Name: "public_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicIpAddress"), - }, - { - Name: "ramdisk_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RamdiskId"), - }, - { - Name: "root_device_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootDeviceName"), - }, - { - Name: "root_device_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootDeviceType"), - }, - { - Name: "security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "source_dest_check", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SourceDestCheck"), - }, - { - Name: "spot_instance_request_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SpotInstanceRequestId"), - }, - { - Name: "sriov_net_support", - Type: schema.TypeString, - Resolver: schema.PathResolver("SriovNetSupport"), - }, - { - Name: "state", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateReason"), - }, - { - Name: "state_transition_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateTransitionReason"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "tpm_support", - Type: schema.TypeString, - Resolver: schema.PathResolver("TpmSupport"), - }, - { - Name: "usage_operation", - Type: schema.TypeString, - Resolver: schema.PathResolver("UsageOperation"), - }, - { - Name: "usage_operation_update_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UsageOperationUpdateTime"), - }, - { - Name: "virtualization_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VirtualizationType"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/internet_gateways.go b/plugins/source/aws/resources/services/ec2/internet_gateways.go index 76598c8fd90b14..b2607af0cccb4f 100644 --- a/plugins/source/aws/resources/services/ec2/internet_gateways.go +++ b/plugins/source/aws/resources/services/ec2/internet_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InternetGateways() *schema.Table { @@ -13,6 +13,7 @@ func InternetGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InternetGateway.html`, Resolver: fetchEc2InternetGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.InternetGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,21 +33,6 @@ func InternetGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachments"), - }, - { - Name: "internet_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InternetGatewayId"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/key_pairs.go b/plugins/source/aws/resources/services/ec2/key_pairs.go index 1fdb8d880edada..d263423a5fe95c 100644 --- a/plugins/source/aws/resources/services/ec2/key_pairs.go +++ b/plugins/source/aws/resources/services/ec2/key_pairs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func KeyPairs() *schema.Table { @@ -13,6 +13,7 @@ func KeyPairs() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_KeyPairInfo.html`, Resolver: fetchEc2KeyPairs, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.KeyPairInfo{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,36 +33,6 @@ func KeyPairs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "key_fingerprint", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyFingerprint"), - }, - { - Name: "key_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyName"), - }, - { - Name: "key_pair_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyPairId"), - }, - { - Name: "key_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyType"), - }, - { - Name: "public_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicKey"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/nat_gateways.go b/plugins/source/aws/resources/services/ec2/nat_gateways.go index ce4a7d4d23649e..6a9141fdfc49ef 100644 --- a/plugins/source/aws/resources/services/ec2/nat_gateways.go +++ b/plugins/source/aws/resources/services/ec2/nat_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func NatGateways() *schema.Table { @@ -13,6 +13,7 @@ func NatGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NatGateway.html`, Resolver: fetchEc2NatGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.NatGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,11 @@ func NatGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "connectivity_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectivityType"), - }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "delete_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeleteTime"), - }, - { - Name: "failure_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureCode"), - }, - { - Name: "failure_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureMessage"), - }, - { - Name: "nat_gateway_addresses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NatGatewayAddresses"), - }, - { - Name: "nat_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NatGatewayId"), - }, - { - Name: "provisioned_bandwidth", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProvisionedBandwidth"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/network_acls.go b/plugins/source/aws/resources/services/ec2/network_acls.go index 129b092152e4d5..cd2e8992be89ff 100644 --- a/plugins/source/aws/resources/services/ec2/network_acls.go +++ b/plugins/source/aws/resources/services/ec2/network_acls.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func NetworkAcls() *schema.Table { @@ -13,6 +13,7 @@ func NetworkAcls() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkAcl.html`, Resolver: fetchEc2NetworkAcls, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.NetworkAcl{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,11 @@ func NetworkAcls() *schema.Table { PrimaryKey: true, }, }, - { - Name: "associations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Associations"), - }, - { - Name: "entries", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Entries"), - }, - { - Name: "is_default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsDefault"), - }, - { - Name: "network_acl_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkAclId"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/network_interfaces.go b/plugins/source/aws/resources/services/ec2/network_interfaces.go index bb1ffe9ce53201..00c00a0faca85a 100644 --- a/plugins/source/aws/resources/services/ec2/network_interfaces.go +++ b/plugins/source/aws/resources/services/ec2/network_interfaces.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func NetworkInterfaces() *schema.Table { @@ -13,6 +13,7 @@ func NetworkInterfaces() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkInterface.html`, Resolver: fetchEc2NetworkInterfaces, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.NetworkInterface{}, transformers.WithSkipFields("TagSet")), Columns: []schema.Column{ { Name: "account_id", @@ -37,131 +38,6 @@ func NetworkInterfaces() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTagField("TagSet"), }, - { - Name: "association", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Association"), - }, - { - Name: "attachment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachment"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "deny_all_igw_traffic", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DenyAllIgwTraffic"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Groups"), - }, - { - Name: "interface_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InterfaceType"), - }, - { - Name: "ipv4_prefixes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ipv4Prefixes"), - }, - { - Name: "ipv6_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("Ipv6Address"), - }, - { - Name: "ipv6_addresses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ipv6Addresses"), - }, - { - Name: "ipv6_native", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Ipv6Native"), - }, - { - Name: "ipv6_prefixes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ipv6Prefixes"), - }, - { - Name: "mac_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("MacAddress"), - }, - { - Name: "network_interface_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkInterfaceId"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "private_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDnsName"), - }, - { - Name: "private_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateIpAddress"), - }, - { - Name: "private_ip_addresses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateIpAddresses"), - }, - { - Name: "requester_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequesterId"), - }, - { - Name: "requester_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequesterManaged"), - }, - { - Name: "source_dest_check", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SourceDestCheck"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/regional_configs.go b/plugins/source/aws/resources/services/ec2/regional_configs.go index 44b0f271d32d07..ff73e29e9a01b8 100644 --- a/plugins/source/aws/resources/services/ec2/regional_configs.go +++ b/plugins/source/aws/resources/services/ec2/regional_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ec2/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegionalConfigs() *schema.Table { @@ -12,6 +12,7 @@ func RegionalConfigs() *schema.Table { Name: "aws_ec2_regional_configs", Resolver: fetchEc2RegionalConfigs, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&models.RegionalConfig{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,16 +30,6 @@ func RegionalConfigs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ebs_encryption_enabled_by_default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EbsEncryptionEnabledByDefault"), - }, - { - Name: "ebs_default_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("EbsDefaultKmsKeyId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/regions.go b/plugins/source/aws/resources/services/ec2/regions.go index 93074a3f2e2c8c..eb10d2d2d53f66 100644 --- a/plugins/source/aws/resources/services/ec2/regions.go +++ b/plugins/source/aws/resources/services/ec2/regions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Regions() *schema.Table { @@ -13,6 +13,7 @@ func Regions() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Region.html`, Resolver: fetchEc2Regions, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.Region{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,16 +35,6 @@ func Regions() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("RegionName"), }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "opt_in_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("OptInStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/reserved_instances.go b/plugins/source/aws/resources/services/ec2/reserved_instances.go index 416ccdd33c8d14..1358b359aebb7f 100644 --- a/plugins/source/aws/resources/services/ec2/reserved_instances.go +++ b/plugins/source/aws/resources/services/ec2/reserved_instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ReservedInstances() *schema.Table { @@ -13,6 +13,7 @@ func ReservedInstances() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReservedInstances.html`, Resolver: fetchEc2ReservedInstances, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.ReservedInstances{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,96 +33,11 @@ func ReservedInstances() *schema.Table { PrimaryKey: true, }, }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "currency_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrencyCode"), - }, - { - Name: "duration", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Duration"), - }, - { - Name: "end", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("End"), - }, - { - Name: "fixed_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("FixedPrice"), - }, - { - Name: "instance_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InstanceCount"), - }, - { - Name: "instance_tenancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceTenancy"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "offering_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("OfferingClass"), - }, - { - Name: "offering_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("OfferingType"), - }, - { - Name: "product_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductDescription"), - }, - { - Name: "recurring_charges", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RecurringCharges"), - }, - { - Name: "reserved_instances_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReservedInstancesId"), - }, - { - Name: "scope", - Type: schema.TypeString, - Resolver: schema.PathResolver("Scope"), - }, - { - Name: "start", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Start"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "usage_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("UsagePrice"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/route_tables.go b/plugins/source/aws/resources/services/ec2/route_tables.go index 15a25f849d6358..ff6fa90a683939 100644 --- a/plugins/source/aws/resources/services/ec2/route_tables.go +++ b/plugins/source/aws/resources/services/ec2/route_tables.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RouteTables() *schema.Table { @@ -13,6 +13,7 @@ func RouteTables() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RouteTable.html`, Resolver: fetchEc2RouteTables, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.RouteTable{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,11 @@ func RouteTables() *schema.Table { PrimaryKey: true, }, }, - { - Name: "associations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Associations"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "propagating_vgws", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PropagatingVgws"), - }, - { - Name: "route_table_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RouteTableId"), - }, - { - Name: "routes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Routes"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/security_groups.go b/plugins/source/aws/resources/services/ec2/security_groups.go index 10a30c00faafde..121430e967ca06 100644 --- a/plugins/source/aws/resources/services/ec2/security_groups.go +++ b/plugins/source/aws/resources/services/ec2/security_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SecurityGroups() *schema.Table { @@ -13,6 +13,7 @@ func SecurityGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html`, Resolver: fetchEc2SecurityGroups, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.SecurityGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,11 @@ func SecurityGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupId"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "ip_permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IpPermissions"), - }, - { - Name: "ip_permissions_egress", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IpPermissionsEgress"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/subnets.go b/plugins/source/aws/resources/services/ec2/subnets.go index 555ba78828af53..443a53c38a50dd 100644 --- a/plugins/source/aws/resources/services/ec2/subnets.go +++ b/plugins/source/aws/resources/services/ec2/subnets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Subnets() *schema.Table { @@ -13,6 +13,7 @@ func Subnets() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html`, Resolver: fetchEc2Subnets, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Subnet{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,111 +33,11 @@ func Subnets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "assign_ipv6_address_on_creation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AssignIpv6AddressOnCreation"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "availability_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZoneId"), - }, - { - Name: "available_ip_address_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AvailableIpAddressCount"), - }, - { - Name: "cidr_block", - Type: schema.TypeString, - Resolver: schema.PathResolver("CidrBlock"), - }, - { - Name: "customer_owned_ipv4_pool", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerOwnedIpv4Pool"), - }, - { - Name: "default_for_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultForAz"), - }, - { - Name: "enable_dns64", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableDns64"), - }, - { - Name: "enable_lni_at_device_index", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EnableLniAtDeviceIndex"), - }, - { - Name: "ipv6_cidr_block_association_set", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ipv6CidrBlockAssociationSet"), - }, - { - Name: "ipv6_native", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Ipv6Native"), - }, - { - Name: "map_customer_owned_ip_on_launch", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MapCustomerOwnedIpOnLaunch"), - }, - { - Name: "map_public_ip_on_launch", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MapPublicIpOnLaunch"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "private_dns_name_options_on_launch", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateDnsNameOptionsOnLaunch"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "subnet_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetArn"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go index fc761b5a5e4cc0..bf7abfb7aba473 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TransitGatewayAttachments() *schema.Table { @@ -13,6 +13,7 @@ func TransitGatewayAttachments() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayAttachment.html`, Resolver: fetchEc2TransitGatewayAttachments, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.TransitGatewayAttachment{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,56 +30,11 @@ func TransitGatewayAttachments() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "association", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Association"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceId"), - }, - { - Name: "resource_owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceOwnerId"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "transit_gateway_attachment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayAttachmentId"), - }, - { - Name: "transit_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayId"), - }, - { - Name: "transit_gateway_owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayOwnerId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go b/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go index ed56f16ae3fa22..8beb3b098c81d8 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TransitGatewayMulticastDomains() *schema.Table { @@ -13,6 +13,7 @@ func TransitGatewayMulticastDomains() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayMulticastDomain.html`, Resolver: fetchEc2TransitGatewayMulticastDomains, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.TransitGatewayMulticastDomain{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,46 +30,11 @@ func TransitGatewayMulticastDomains() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Options"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "transit_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayId"), - }, - { - Name: "transit_gateway_multicast_domain_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayMulticastDomainArn"), - }, - { - Name: "transit_gateway_multicast_domain_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayMulticastDomainId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go index 490e041ffcdb2e..ae38ac0db79fa8 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TransitGatewayPeeringAttachments() *schema.Table { @@ -13,6 +13,7 @@ func TransitGatewayPeeringAttachments() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayPeeringAttachment.html`, Resolver: fetchEc2TransitGatewayPeeringAttachments, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.TransitGatewayPeeringAttachment{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,51 +30,11 @@ func TransitGatewayPeeringAttachments() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "accepter_tgw_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccepterTgwInfo"), - }, - { - Name: "accepter_transit_gateway_attachment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccepterTransitGatewayAttachmentId"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Options"), - }, - { - Name: "requester_tgw_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequesterTgwInfo"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "transit_gateway_attachment_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayAttachmentId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go b/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go index 41005f4fd1422b..fb9008a1f7b084 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TransitGatewayRouteTables() *schema.Table { @@ -13,6 +13,7 @@ func TransitGatewayRouteTables() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayRouteTable.html`, Resolver: fetchEc2TransitGatewayRouteTables, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.TransitGatewayRouteTable{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,41 +30,11 @@ func TransitGatewayRouteTables() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "default_association_route_table", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultAssociationRouteTable"), - }, - { - Name: "default_propagation_route_table", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultPropagationRouteTable"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "transit_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayId"), - }, - { - Name: "transit_gateway_route_table_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitGatewayRouteTableId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateways.go b/plugins/source/aws/resources/services/ec2/transit_gateways.go index aed0e18e10625a..5b151edf9d0977 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateways.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TransitGateways() *schema.Table { @@ -13,6 +13,7 @@ func TransitGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGateway.html`, Resolver: fetchEc2TransitGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.TransitGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,31 +38,6 @@ func TransitGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Options"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go index 63f9a6b6825d2e..f41520c1bc7bff 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcEndpointServiceConfigurations() *schema.Table { @@ -13,6 +13,7 @@ func VpcEndpointServiceConfigurations() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceConfiguration.html`, Resolver: fetchEc2VpcEndpointServiceConfigurations, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.ServiceConfiguration{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,76 +33,6 @@ func VpcEndpointServiceConfigurations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "acceptance_required", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AcceptanceRequired"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "base_endpoint_dns_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("BaseEndpointDnsNames"), - }, - { - Name: "gateway_load_balancer_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("GatewayLoadBalancerArns"), - }, - { - Name: "manages_vpc_endpoints", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ManagesVpcEndpoints"), - }, - { - Name: "network_load_balancer_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NetworkLoadBalancerArns"), - }, - { - Name: "payer_responsibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("PayerResponsibility"), - }, - { - Name: "private_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDnsName"), - }, - { - Name: "private_dns_name_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateDnsNameConfiguration"), - }, - { - Name: "service_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceId"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "service_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceState"), - }, - { - Name: "service_type", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceType"), - }, - { - Name: "supported_ip_address_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedIpAddressTypes"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go index 721f6f7ca0fdc6..8f98db0e84bd55 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcEndpointServices() *schema.Table { @@ -13,6 +13,7 @@ func VpcEndpointServices() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceDetail.html`, Resolver: fetchEc2VpcEndpointServices, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.ServiceDetail{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,81 +33,11 @@ func VpcEndpointServices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "acceptance_required", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AcceptanceRequired"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "base_endpoint_dns_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("BaseEndpointDnsNames"), - }, - { - Name: "manages_vpc_endpoints", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ManagesVpcEndpoints"), - }, - { - Name: "owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "payer_responsibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("PayerResponsibility"), - }, - { - Name: "private_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDnsName"), - }, - { - Name: "private_dns_name_verification_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDnsNameVerificationState"), - }, - { - Name: "private_dns_names", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateDnsNames"), - }, - { - Name: "service_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceId"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "service_type", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceType"), - }, - { - Name: "supported_ip_address_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedIpAddressTypes"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_endpoint_policy_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("VpcEndpointPolicySupported"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go index 24da1751107ffa..e5d887d82f3059 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcEndpoints() *schema.Table { @@ -13,6 +13,7 @@ func VpcEndpoints() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcEndpoint.html`, Resolver: fetchEc2VpcEndpoints, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.VpcEndpoint{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,101 +33,11 @@ func VpcEndpoints() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTimestamp"), - }, - { - Name: "dns_entries", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DnsEntries"), - }, - { - Name: "dns_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DnsOptions"), - }, - { - Name: "groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Groups"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "last_error", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastError"), - }, - { - Name: "network_interface_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NetworkInterfaceIds"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "policy_document", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyDocument"), - }, - { - Name: "private_dns_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PrivateDnsEnabled"), - }, - { - Name: "requester_managed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequesterManaged"), - }, - { - Name: "route_table_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("RouteTableIds"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_endpoint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcEndpointId"), - }, - { - Name: "vpc_endpoint_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcEndpointType"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go b/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go index 9f6cb788f84eea..4c74acc8b414ba 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcPeeringConnections() *schema.Table { @@ -13,6 +13,7 @@ func VpcPeeringConnections() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcPeeringConnection.html`, Resolver: fetchEc2VpcPeeringConnections, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.VpcPeeringConnection{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,36 +33,11 @@ func VpcPeeringConnections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "accepter_vpc_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccepterVpcInfo"), - }, - { - Name: "expiration_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpirationTime"), - }, - { - Name: "requester_vpc_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequesterVpcInfo"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_peering_connection_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcPeeringConnectionId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/vpcs.go b/plugins/source/aws/resources/services/ec2/vpcs.go index 10287ecdf6ce8b..a9d4e51e12429b 100644 --- a/plugins/source/aws/resources/services/ec2/vpcs.go +++ b/plugins/source/aws/resources/services/ec2/vpcs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Vpcs() *schema.Table { @@ -13,6 +13,7 @@ func Vpcs() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Vpc.html`, Resolver: fetchEc2Vpcs, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.Vpc{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,56 +33,11 @@ func Vpcs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cidr_block", - Type: schema.TypeString, - Resolver: schema.PathResolver("CidrBlock"), - }, - { - Name: "cidr_block_association_set", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CidrBlockAssociationSet"), - }, - { - Name: "dhcp_options_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DhcpOptionsId"), - }, - { - Name: "instance_tenancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceTenancy"), - }, - { - Name: "ipv6_cidr_block_association_set", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ipv6CidrBlockAssociationSet"), - }, - { - Name: "is_default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsDefault"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ec2/vpn_gateways.go b/plugins/source/aws/resources/services/ec2/vpn_gateways.go index b88bc1f3a4ea30..709a388c6abf94 100644 --- a/plugins/source/aws/resources/services/ec2/vpn_gateways.go +++ b/plugins/source/aws/resources/services/ec2/vpn_gateways.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ec2 import ( + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpnGateways() *schema.Table { @@ -13,6 +13,7 @@ func VpnGateways() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpnGateway.html`, Resolver: fetchEc2VpnGateways, Multiplex: client.ServiceAccountRegionMultiplexer("ec2"), + Transform: transformers.TransformWithStruct(&types.VpnGateway{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,11 @@ func VpnGateways() *schema.Table { PrimaryKey: true, }, }, - { - Name: "amazon_side_asn", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AmazonSideAsn"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "vpc_attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcAttachments"), - }, - { - Name: "vpn_gateway_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpnGatewayId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ecr/registries.go b/plugins/source/aws/resources/services/ecr/registries.go index fdf718837d45c3..54fe79a3d0f6da 100644 --- a/plugins/source/aws/resources/services/ecr/registries.go +++ b/plugins/source/aws/resources/services/ecr/registries.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecr import ( + "github.com/aws/aws-sdk-go-v2/service/ecr" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Registries() *schema.Table { @@ -12,6 +12,7 @@ func Registries() *schema.Table { Name: "aws_ecr_registries", Resolver: fetchEcrRegistries, Multiplex: client.ServiceAccountRegionMultiplexer("api.ecr"), + Transform: transformers.TransformWithStruct(&ecr.DescribeRegistryOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,11 +38,6 @@ func Registries() *schema.Table { PrimaryKey: true, }, }, - { - Name: "replication_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicationConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ecr/registry_policies.go b/plugins/source/aws/resources/services/ecr/registry_policies.go index fa6c19cb031408..319e2300e3590e 100644 --- a/plugins/source/aws/resources/services/ecr/registry_policies.go +++ b/plugins/source/aws/resources/services/ecr/registry_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecr import ( + "github.com/aws/aws-sdk-go-v2/service/ecr" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegistryPolicies() *schema.Table { @@ -12,6 +12,7 @@ func RegistryPolicies() *schema.Table { Name: "aws_ecr_registry_policies", Resolver: fetchEcrRegistryPolicies, Multiplex: client.ServiceAccountRegionMultiplexer("api.ecr"), + Transform: transformers.TransformWithStruct(&ecr.GetRegistryPolicyOutput{}), Columns: []schema.Column{ { Name: "account_id", diff --git a/plugins/source/aws/resources/services/ecr/repositories.go b/plugins/source/aws/resources/services/ecr/repositories.go index e8a0d174e78668..6ffe187d7b4911 100644 --- a/plugins/source/aws/resources/services/ecr/repositories.go +++ b/plugins/source/aws/resources/services/ecr/repositories.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecr import ( + "github.com/aws/aws-sdk-go-v2/service/ecr/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Repositories() *schema.Table { @@ -13,6 +13,7 @@ func Repositories() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html`, Resolver: fetchEcrRepositories, Multiplex: client.ServiceAccountRegionMultiplexer("api.ecr"), + Transform: transformers.TransformWithStruct(&types.Repository{}), Columns: []schema.Column{ { Name: "account_id", @@ -42,41 +43,6 @@ func Repositories() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRepositoryPolicy, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "encryption_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionConfiguration"), - }, - { - Name: "image_scanning_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ImageScanningConfiguration"), - }, - { - Name: "image_tag_mutability", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageTagMutability"), - }, - { - Name: "registry_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryId"), - }, - { - Name: "repository_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepositoryName"), - }, - { - Name: "repository_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepositoryUri"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/ecr/repository_images.go b/plugins/source/aws/resources/services/ecr/repository_images.go index a1793c877d5c86..955ea0b6dee49b 100644 --- a/plugins/source/aws/resources/services/ecr/repository_images.go +++ b/plugins/source/aws/resources/services/ecr/repository_images.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecr import ( + "github.com/aws/aws-sdk-go-v2/service/ecr/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RepositoryImages() *schema.Table { @@ -12,6 +12,7 @@ func RepositoryImages() *schema.Table { Name: "aws_ecr_repository_images", Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageDetail.html`, Resolver: fetchEcrRepositoryImages, + Transform: transformers.TransformWithStruct(&types.ImageDetail{}), Columns: []schema.Column{ { Name: "account_id", diff --git a/plugins/source/aws/resources/services/ecrpublic/repositories.go b/plugins/source/aws/resources/services/ecrpublic/repositories.go index 08810273df739a..66545c16914714 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repositories.go +++ b/plugins/source/aws/resources/services/ecrpublic/repositories.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecrpublic import ( + "github.com/aws/aws-sdk-go-v2/service/ecrpublic/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Repositories() *schema.Table { @@ -13,6 +13,7 @@ func Repositories() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_Repository.html`, Resolver: fetchEcrpublicRepositories, Multiplex: client.ServiceAccountRegionMultiplexer("api.ecr-public"), + Transform: transformers.TransformWithStruct(&types.Repository{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,26 +38,6 @@ func Repositories() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRepositoryTags, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "registry_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryId"), - }, - { - Name: "repository_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepositoryName"), - }, - { - Name: "repository_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepositoryUri"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/ecrpublic/repository_images.go b/plugins/source/aws/resources/services/ecrpublic/repository_images.go index 6aa85f25b0f5e9..7a2866a18b89c0 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repository_images.go +++ b/plugins/source/aws/resources/services/ecrpublic/repository_images.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecrpublic import ( + "github.com/aws/aws-sdk-go-v2/service/ecrpublic/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RepositoryImages() *schema.Table { @@ -12,6 +12,7 @@ func RepositoryImages() *schema.Table { Name: "aws_ecrpublic_repository_images", Description: `https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_ImageDetail.html`, Resolver: fetchEcrpublicRepositoryImages, + Transform: transformers.TransformWithStruct(&types.ImageDetail{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,46 +32,6 @@ func RepositoryImages() *schema.Table { PrimaryKey: true, }, }, - { - Name: "artifact_media_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ArtifactMediaType"), - }, - { - Name: "image_digest", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageDigest"), - }, - { - Name: "image_manifest_media_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImageManifestMediaType"), - }, - { - Name: "image_pushed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ImagePushedAt"), - }, - { - Name: "image_size_in_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ImageSizeInBytes"), - }, - { - Name: "image_tags", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ImageTags"), - }, - { - Name: "registry_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryId"), - }, - { - Name: "repository_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepositoryName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ecs/cluster_services.go b/plugins/source/aws/resources/services/ecs/cluster_services.go index bb486153f2c96d..2482be331992d0 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_services.go +++ b/plugins/source/aws/resources/services/ecs/cluster_services.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecs import ( + "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterServices() *schema.Table { @@ -13,6 +13,7 @@ func ClusterServices() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Service.html`, Resolver: fetchEcsClusterServices, Multiplex: client.ServiceAccountRegionMultiplexer("ecs"), + Transform: transformers.TransformWithStruct(&types.Service{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,156 +33,11 @@ func ClusterServices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "capacity_provider_strategy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CapacityProviderStrategy"), - }, - { - Name: "cluster_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterArn"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "deployment_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeploymentConfiguration"), - }, - { - Name: "deployment_controller", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeploymentController"), - }, - { - Name: "deployments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Deployments"), - }, - { - Name: "desired_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DesiredCount"), - }, - { - Name: "enable_ecs_managed_tags", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableECSManagedTags"), - }, - { - Name: "enable_execute_command", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableExecuteCommand"), - }, - { - Name: "events", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Events"), - }, - { - Name: "health_check_grace_period_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthCheckGracePeriodSeconds"), - }, - { - Name: "launch_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchType"), - }, - { - Name: "load_balancers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LoadBalancers"), - }, - { - Name: "network_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkConfiguration"), - }, - { - Name: "pending_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PendingCount"), - }, - { - Name: "placement_constraints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PlacementConstraints"), - }, - { - Name: "placement_strategy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PlacementStrategy"), - }, - { - Name: "platform_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformFamily"), - }, - { - Name: "platform_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformVersion"), - }, - { - Name: "propagate_tags", - Type: schema.TypeString, - Resolver: schema.PathResolver("PropagateTags"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "running_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RunningCount"), - }, - { - Name: "scheduling_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchedulingStrategy"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "service_registries", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceRegistries"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "task_definition", - Type: schema.TypeString, - Resolver: schema.PathResolver("TaskDefinition"), - }, - { - Name: "task_sets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TaskSets"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ecs/cluster_tasks.go b/plugins/source/aws/resources/services/ecs/cluster_tasks.go index 26f64208fd2aeb..356799f8002f35 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_tasks.go +++ b/plugins/source/aws/resources/services/ecs/cluster_tasks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecs import ( + "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterTasks() *schema.Table { @@ -13,6 +13,7 @@ func ClusterTasks() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Task.html`, Resolver: fetchEcsClusterTasks, Multiplex: client.ServiceAccountRegionMultiplexer("ecs"), + Transform: transformers.TransformWithStruct(&types.Task{}), Columns: []schema.Column{ { Name: "account_id", @@ -42,176 +43,6 @@ func ClusterTasks() *schema.Table { Type: schema.TypeJSON, Resolver: getEcsTaskProtection, }, - { - Name: "attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachments"), - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attributes"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "capacity_provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CapacityProviderName"), - }, - { - Name: "cluster_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterArn"), - }, - { - Name: "connectivity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Connectivity"), - }, - { - Name: "connectivity_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ConnectivityAt"), - }, - { - Name: "container_instance_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContainerInstanceArn"), - }, - { - Name: "containers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Containers"), - }, - { - Name: "cpu", - Type: schema.TypeString, - Resolver: schema.PathResolver("Cpu"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "desired_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DesiredStatus"), - }, - { - Name: "enable_execute_command", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableExecuteCommand"), - }, - { - Name: "ephemeral_storage", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EphemeralStorage"), - }, - { - Name: "execution_stopped_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExecutionStoppedAt"), - }, - { - Name: "group", - Type: schema.TypeString, - Resolver: schema.PathResolver("Group"), - }, - { - Name: "health_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthStatus"), - }, - { - Name: "inference_accelerators", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InferenceAccelerators"), - }, - { - Name: "last_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastStatus"), - }, - { - Name: "launch_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("LaunchType"), - }, - { - Name: "memory", - Type: schema.TypeString, - Resolver: schema.PathResolver("Memory"), - }, - { - Name: "overrides", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Overrides"), - }, - { - Name: "platform_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformFamily"), - }, - { - Name: "platform_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformVersion"), - }, - { - Name: "pull_started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("PullStartedAt"), - }, - { - Name: "pull_stopped_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("PullStoppedAt"), - }, - { - Name: "started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartedAt"), - }, - { - Name: "started_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("StartedBy"), - }, - { - Name: "stop_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("StopCode"), - }, - { - Name: "stopped_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StoppedAt"), - }, - { - Name: "stopped_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StoppedReason"), - }, - { - Name: "stopping_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StoppingAt"), - }, - { - Name: "task_definition_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TaskDefinitionArn"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ecs/clusters.go b/plugins/source/aws/resources/services/ecs/clusters.go index 03186ef253c3be..3fa16a68b89642 100644 --- a/plugins/source/aws/resources/services/ecs/clusters.go +++ b/plugins/source/aws/resources/services/ecs/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecs import ( + "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Cluster.html`, Resolver: fetchEcsClusters, Multiplex: client.ServiceAccountRegionMultiplexer("ecs"), + Transform: transformers.TransformWithStruct(&types.Cluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,76 +33,6 @@ func Clusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "active_services_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ActiveServicesCount"), - }, - { - Name: "attachments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attachments"), - }, - { - Name: "attachments_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachmentsStatus"), - }, - { - Name: "capacity_providers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CapacityProviders"), - }, - { - Name: "cluster_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterName"), - }, - { - Name: "configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Configuration"), - }, - { - Name: "default_capacity_provider_strategy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultCapacityProviderStrategy"), - }, - { - Name: "pending_tasks_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PendingTasksCount"), - }, - { - Name: "registered_container_instances_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RegisteredContainerInstancesCount"), - }, - { - Name: "running_tasks_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RunningTasksCount"), - }, - { - Name: "service_connect_defaults", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceConnectDefaults"), - }, - { - Name: "settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Settings"), - }, - { - Name: "statistics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Statistics"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ecs/task_definitions.go b/plugins/source/aws/resources/services/ecs/task_definitions.go index 5844bd7d2bf4b0..6585ef4bd2424f 100644 --- a/plugins/source/aws/resources/services/ecs/task_definitions.go +++ b/plugins/source/aws/resources/services/ecs/task_definitions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ecs import ( + "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TaskDefinitions() *schema.Table { @@ -14,6 +14,7 @@ func TaskDefinitions() *schema.Table { Resolver: fetchEcsTaskDefinitions, PreResourceResolver: getTaskDefinition, Multiplex: client.ServiceAccountRegionMultiplexer("ecs"), + Transform: transformers.TransformWithStruct(&types.TaskDefinition{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,121 +39,6 @@ func TaskDefinitions() *schema.Table { Type: schema.TypeJSON, Resolver: resolveEcsTaskDefinitionTags, }, - { - Name: "compatibilities", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Compatibilities"), - }, - { - Name: "container_definitions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ContainerDefinitions"), - }, - { - Name: "cpu", - Type: schema.TypeString, - Resolver: schema.PathResolver("Cpu"), - }, - { - Name: "deregistered_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeregisteredAt"), - }, - { - Name: "ephemeral_storage", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EphemeralStorage"), - }, - { - Name: "execution_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExecutionRoleArn"), - }, - { - Name: "family", - Type: schema.TypeString, - Resolver: schema.PathResolver("Family"), - }, - { - Name: "inference_accelerators", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InferenceAccelerators"), - }, - { - Name: "ipc_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpcMode"), - }, - { - Name: "memory", - Type: schema.TypeString, - Resolver: schema.PathResolver("Memory"), - }, - { - Name: "network_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkMode"), - }, - { - Name: "pid_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("PidMode"), - }, - { - Name: "placement_constraints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PlacementConstraints"), - }, - { - Name: "proxy_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProxyConfiguration"), - }, - { - Name: "registered_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RegisteredAt"), - }, - { - Name: "registered_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegisteredBy"), - }, - { - Name: "requires_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RequiresAttributes"), - }, - { - Name: "requires_compatibilities", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("RequiresCompatibilities"), - }, - { - Name: "revision", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Revision"), - }, - { - Name: "runtime_platform", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RuntimePlatform"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "task_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TaskRoleArn"), - }, - { - Name: "volumes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Volumes"), - }, }, } } diff --git a/plugins/source/aws/resources/services/efs/filesystems.go b/plugins/source/aws/resources/services/efs/filesystems.go index c4951e7d64cf82..5d959952b78181 100644 --- a/plugins/source/aws/resources/services/efs/filesystems.go +++ b/plugins/source/aws/resources/services/efs/filesystems.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package efs import ( + "github.com/aws/aws-sdk-go-v2/service/efs/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Filesystems() *schema.Table { @@ -13,6 +13,7 @@ func Filesystems() *schema.Table { Description: `https://docs.aws.amazon.com/efs/latest/ug/API_FileSystemDescription.html`, Resolver: fetchEfsFilesystems, Multiplex: client.ServiceAccountRegionMultiplexer("elasticfilesystem"), + Transform: transformers.TransformWithStruct(&types.FileSystemDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,86 +38,11 @@ func Filesystems() *schema.Table { Type: schema.TypeString, Resolver: ResolveEfsFilesystemBackupPolicyStatus, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "creation_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreationToken"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "life_cycle_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("LifeCycleState"), - }, - { - Name: "number_of_mount_targets", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfMountTargets"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "performance_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("PerformanceMode"), - }, - { - Name: "size_in_bytes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SizeInBytes"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "availability_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZoneId"), - }, - { - Name: "availability_zone_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZoneName"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "provisioned_throughput_in_mibps", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("ProvisionedThroughputInMibps"), - }, - { - Name: "throughput_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThroughputMode"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eks/clusters.go b/plugins/source/aws/resources/services/eks/clusters.go index 5a68bc247313ad..7ad3f3cb90e84b 100644 --- a/plugins/source/aws/resources/services/eks/clusters.go +++ b/plugins/source/aws/resources/services/eks/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eks import ( + "github.com/aws/aws-sdk-go-v2/service/eks/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -14,6 +14,7 @@ func Clusters() *schema.Table { Resolver: fetchEksClusters, PreResourceResolver: getEksCluster, Multiplex: client.ServiceAccountRegionMultiplexer("eks"), + Transform: transformers.TransformWithStruct(&types.Cluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -33,101 +34,11 @@ func Clusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "certificate_authority", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CertificateAuthority"), - }, - { - Name: "client_request_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientRequestToken"), - }, - { - Name: "connector_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConnectorConfig"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "encryption_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionConfig"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "health", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Health"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "identity", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Identity"), - }, - { - Name: "kubernetes_network_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KubernetesNetworkConfig"), - }, - { - Name: "logging", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Logging"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "outpost_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OutpostConfig"), - }, - { - Name: "platform_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformVersion"), - }, - { - Name: "resources_vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourcesVpcConfig"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: schema.PathResolver("Tags"), }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/clusters.go b/plugins/source/aws/resources/services/elasticache/clusters.go index a49218f9c57fde..87b35f8065d22f 100644 --- a/plugins/source/aws/resources/services/elasticache/clusters.go +++ b/plugins/source/aws/resources/services/elasticache/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheCluster.html`, Resolver: fetchElasticacheClusters, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.CacheCluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,166 +38,6 @@ func Clusters() *schema.Table { Type: schema.TypeJSON, Resolver: resolveClusterTags, }, - { - Name: "at_rest_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AtRestEncryptionEnabled"), - }, - { - Name: "auth_token_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AuthTokenEnabled"), - }, - { - Name: "auth_token_last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AuthTokenLastModifiedDate"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "cache_cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CacheClusterCreateTime"), - }, - { - Name: "cache_cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheClusterId"), - }, - { - Name: "cache_cluster_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheClusterStatus"), - }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "cache_nodes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CacheNodes"), - }, - { - Name: "cache_parameter_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CacheParameterGroup"), - }, - { - Name: "cache_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CacheSecurityGroups"), - }, - { - Name: "cache_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheSubnetGroupName"), - }, - { - Name: "client_download_landing_page", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientDownloadLandingPage"), - }, - { - Name: "configuration_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConfigurationEndpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "ip_discovery", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpDiscovery"), - }, - { - Name: "log_delivery_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LogDeliveryConfigurations"), - }, - { - Name: "network_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkType"), - }, - { - Name: "notification_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NotificationConfiguration"), - }, - { - Name: "num_cache_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumCacheNodes"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "preferred_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredAvailabilityZone"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "preferred_outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredOutpostArn"), - }, - { - Name: "replication_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationGroupId"), - }, - { - Name: "replication_group_log_delivery_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ReplicationGroupLogDeliveryEnabled"), - }, - { - Name: "security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "snapshot_retention_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SnapshotRetentionLimit"), - }, - { - Name: "snapshot_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotWindow"), - }, - { - Name: "transit_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TransitEncryptionEnabled"), - }, - { - Name: "transit_encryption_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitEncryptionMode"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/engine_versions.go b/plugins/source/aws/resources/services/elasticache/engine_versions.go index e61aaeea6f6152..68fddebc284017 100644 --- a/plugins/source/aws/resources/services/elasticache/engine_versions.go +++ b/plugins/source/aws/resources/services/elasticache/engine_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EngineVersions() *schema.Table { @@ -13,6 +13,7 @@ func EngineVersions() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheEngineVersion.html`, Resolver: fetchElasticacheEngineVersions, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.CacheEngineVersion{}), Columns: []schema.Column{ { Name: "account_id", @@ -48,21 +49,6 @@ func EngineVersions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cache_engine_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheEngineDescription"), - }, - { - Name: "cache_engine_version_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheEngineVersionDescription"), - }, - { - Name: "cache_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheParameterGroupFamily"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/global_replication_groups.go b/plugins/source/aws/resources/services/elasticache/global_replication_groups.go index 033747a8139b17..1574e984e6bbe8 100644 --- a/plugins/source/aws/resources/services/elasticache/global_replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/global_replication_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GlobalReplicationGroups() *schema.Table { @@ -13,6 +13,7 @@ func GlobalReplicationGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_GlobalReplicationGroup.html`, Resolver: fetchElasticacheGlobalReplicationGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.GlobalReplicationGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,6 @@ func GlobalReplicationGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "at_rest_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AtRestEncryptionEnabled"), - }, - { - Name: "auth_token_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AuthTokenEnabled"), - }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "cluster_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ClusterEnabled"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "global_node_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalNodeGroups"), - }, - { - Name: "global_replication_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalReplicationGroupDescription"), - }, - { - Name: "global_replication_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalReplicationGroupId"), - }, - { - Name: "members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Members"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "transit_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TransitEncryptionEnabled"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/parameter_groups.go b/plugins/source/aws/resources/services/elasticache/parameter_groups.go index 502383d4d9d846..854a98419ec8d9 100644 --- a/plugins/source/aws/resources/services/elasticache/parameter_groups.go +++ b/plugins/source/aws/resources/services/elasticache/parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ParameterGroups() *schema.Table { @@ -13,6 +13,7 @@ func ParameterGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheParameterGroup.html`, Resolver: fetchElasticacheParameterGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.CacheParameterGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,26 +33,6 @@ func ParameterGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cache_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheParameterGroupFamily"), - }, - { - Name: "cache_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheParameterGroupName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_global", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsGlobal"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/replication_groups.go b/plugins/source/aws/resources/services/elasticache/replication_groups.go index afa20876631dfe..2a645fb945d891 100644 --- a/plugins/source/aws/resources/services/elasticache/replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/replication_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ReplicationGroups() *schema.Table { @@ -13,6 +13,7 @@ func ReplicationGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReplicationGroup.html`, Resolver: fetchElasticacheReplicationGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.ReplicationGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,151 +33,6 @@ func ReplicationGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "at_rest_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AtRestEncryptionEnabled"), - }, - { - Name: "auth_token_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AuthTokenEnabled"), - }, - { - Name: "auth_token_last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AuthTokenLastModifiedDate"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "automatic_failover", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutomaticFailover"), - }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "cluster_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ClusterEnabled"), - }, - { - Name: "configuration_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConfigurationEndpoint"), - }, - { - Name: "data_tiering", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataTiering"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "global_replication_group_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalReplicationGroupInfo"), - }, - { - Name: "ip_discovery", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpDiscovery"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "log_delivery_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LogDeliveryConfigurations"), - }, - { - Name: "member_clusters", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("MemberClusters"), - }, - { - Name: "member_clusters_outpost_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("MemberClustersOutpostArns"), - }, - { - Name: "multi_az", - Type: schema.TypeString, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "network_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkType"), - }, - { - Name: "node_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NodeGroups"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "replication_group_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ReplicationGroupCreateTime"), - }, - { - Name: "replication_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationGroupId"), - }, - { - Name: "snapshot_retention_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SnapshotRetentionLimit"), - }, - { - Name: "snapshot_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotWindow"), - }, - { - Name: "snapshotting_cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshottingClusterId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "transit_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TransitEncryptionEnabled"), - }, - { - Name: "transit_encryption_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransitEncryptionMode"), - }, - { - Name: "user_group_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("UserGroupIds"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go index c5a8f7dc992c74..34af56ac9cae17 100644 --- a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go +++ b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ReservedCacheNodes() *schema.Table { @@ -13,6 +13,7 @@ func ReservedCacheNodes() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNode.html`, Resolver: fetchElasticacheReservedCacheNodes, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.ReservedCacheNode{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,6 @@ func ReservedCacheNodes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cache_node_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CacheNodeCount"), - }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "duration", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Duration"), - }, - { - Name: "fixed_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("FixedPrice"), - }, - { - Name: "offering_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("OfferingType"), - }, - { - Name: "product_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductDescription"), - }, - { - Name: "recurring_charges", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RecurringCharges"), - }, - { - Name: "reserved_cache_node_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReservedCacheNodeId"), - }, - { - Name: "reserved_cache_nodes_offering_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReservedCacheNodesOfferingId"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "usage_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("UsagePrice"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go index 332c8f552e8cb4..ac207eff2b60cb 100644 --- a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go +++ b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ReservedCacheNodesOfferings() *schema.Table { @@ -13,6 +13,7 @@ func ReservedCacheNodesOfferings() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNodesOffering.html`, Resolver: fetchElasticacheReservedCacheNodesOfferings, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.ReservedCacheNodesOffering{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func ReservedCacheNodesOfferings() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "duration", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Duration"), - }, - { - Name: "fixed_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("FixedPrice"), - }, - { - Name: "offering_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("OfferingType"), - }, - { - Name: "product_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductDescription"), - }, - { - Name: "recurring_charges", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RecurringCharges"), - }, - { - Name: "reserved_cache_nodes_offering_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReservedCacheNodesOfferingId"), - }, - { - Name: "usage_price", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("UsagePrice"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/service_updates.go b/plugins/source/aws/resources/services/elasticache/service_updates.go index c354a9999c468e..268df574abd9a8 100644 --- a/plugins/source/aws/resources/services/elasticache/service_updates.go +++ b/plugins/source/aws/resources/services/elasticache/service_updates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ServiceUpdates() *schema.Table { @@ -13,6 +13,7 @@ func ServiceUpdates() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ServiceUpdate.html`, Resolver: fetchElasticacheServiceUpdates, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.ServiceUpdate{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,6 @@ func ServiceUpdates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_update_after_recommended_apply_by_date", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoUpdateAfterRecommendedApplyByDate"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "estimated_update_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("EstimatedUpdateTime"), - }, - { - Name: "service_update_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUpdateDescription"), - }, - { - Name: "service_update_end_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ServiceUpdateEndDate"), - }, - { - Name: "service_update_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUpdateName"), - }, - { - Name: "service_update_recommended_apply_by_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ServiceUpdateRecommendedApplyByDate"), - }, - { - Name: "service_update_release_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ServiceUpdateReleaseDate"), - }, - { - Name: "service_update_severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUpdateSeverity"), - }, - { - Name: "service_update_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUpdateStatus"), - }, - { - Name: "service_update_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceUpdateType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/snapshots.go b/plugins/source/aws/resources/services/elasticache/snapshots.go index 8e875134d60530..22ada0c2b30f3f 100644 --- a/plugins/source/aws/resources/services/elasticache/snapshots.go +++ b/plugins/source/aws/resources/services/elasticache/snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Snapshots() *schema.Table { @@ -13,6 +13,7 @@ func Snapshots() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_Snapshot.html`, Resolver: fetchElasticacheSnapshots, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.Snapshot{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,141 +33,6 @@ func Snapshots() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "automatic_failover", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutomaticFailover"), - }, - { - Name: "cache_cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CacheClusterCreateTime"), - }, - { - Name: "cache_cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheClusterId"), - }, - { - Name: "cache_node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheNodeType"), - }, - { - Name: "cache_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheParameterGroupName"), - }, - { - Name: "cache_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheSubnetGroupName"), - }, - { - Name: "data_tiering", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataTiering"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "node_snapshots", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NodeSnapshots"), - }, - { - Name: "num_cache_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumCacheNodes"), - }, - { - Name: "num_node_groups", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumNodeGroups"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "preferred_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredAvailabilityZone"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "preferred_outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredOutpostArn"), - }, - { - Name: "replication_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationGroupDescription"), - }, - { - Name: "replication_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationGroupId"), - }, - { - Name: "snapshot_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotName"), - }, - { - Name: "snapshot_retention_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SnapshotRetentionLimit"), - }, - { - Name: "snapshot_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotSource"), - }, - { - Name: "snapshot_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotStatus"), - }, - { - Name: "snapshot_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotWindow"), - }, - { - Name: "topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TopicArn"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/subnet_groups.go b/plugins/source/aws/resources/services/elasticache/subnet_groups.go index e69674f19a79e0..7552e31dae8e54 100644 --- a/plugins/source/aws/resources/services/elasticache/subnet_groups.go +++ b/plugins/source/aws/resources/services/elasticache/subnet_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubnetGroups() *schema.Table { @@ -13,6 +13,7 @@ func SubnetGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheSubnetGroup.html`, Resolver: fetchElasticacheSubnetGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.CacheSubnetGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,31 +33,6 @@ func SubnetGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cache_subnet_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheSubnetGroupDescription"), - }, - { - Name: "cache_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CacheSubnetGroupName"), - }, - { - Name: "subnets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Subnets"), - }, - { - Name: "supported_network_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedNetworkTypes"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/user_groups.go b/plugins/source/aws/resources/services/elasticache/user_groups.go index a52bb89f017ea7..919744bf131c16 100644 --- a/plugins/source/aws/resources/services/elasticache/user_groups.go +++ b/plugins/source/aws/resources/services/elasticache/user_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserGroups() *schema.Table { @@ -13,6 +13,7 @@ func UserGroups() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_UserGroup.html`, Resolver: fetchElasticacheUserGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.UserGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,6 @@ func UserGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "pending_changes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingChanges"), - }, - { - Name: "replication_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReplicationGroups"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "user_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserGroupId"), - }, - { - Name: "user_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("UserIds"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticache/users.go b/plugins/source/aws/resources/services/elasticache/users.go index 7ae87498d7ec09..719f2d001a836e 100644 --- a/plugins/source/aws/resources/services/elasticache/users.go +++ b/plugins/source/aws/resources/services/elasticache/users.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticache import ( + "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Users() *schema.Table { @@ -13,6 +13,7 @@ func Users() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_User.html`, Resolver: fetchElasticacheUsers, Multiplex: client.ServiceAccountRegionMultiplexer("elasticache"), + Transform: transformers.TransformWithStruct(&types.User{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func Users() *schema.Table { PrimaryKey: true, }, }, - { - Name: "access_string", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessString"), - }, - { - Name: "authentication", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Authentication"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "user_group_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("UserGroupIds"), - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserId"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go index 71dc2f010d387b..350319c492c9eb 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticbeanstalk import ( + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApplicationVersions() *schema.Table { @@ -13,6 +13,7 @@ func ApplicationVersions() *schema.Table { Description: `https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationVersionDescription.html`, Resolver: fetchElasticbeanstalkApplicationVersions, Multiplex: client.ServiceAccountRegionMultiplexer("elasticbeanstalk"), + Transform: transformers.TransformWithStruct(&types.ApplicationVersionDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,51 +33,6 @@ func ApplicationVersions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "application_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationName"), - }, - { - Name: "build_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("BuildArn"), - }, - { - Name: "date_created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateCreated"), - }, - { - Name: "date_updated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateUpdated"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "source_build_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceBuildInformation"), - }, - { - Name: "source_bundle", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceBundle"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "version_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionLabel"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go index baf827d94bf960..3d5afec2931dc2 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticbeanstalk import ( + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Applications() *schema.Table { @@ -13,6 +13,7 @@ func Applications() *schema.Table { Description: `https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationDescription.html`, Resolver: fetchElasticbeanstalkApplications, Multiplex: client.ServiceAccountRegionMultiplexer("elasticbeanstalk"), + Transform: transformers.TransformWithStruct(&types.ApplicationDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,36 +40,6 @@ func Applications() *schema.Table { PrimaryKey: true, }, }, - { - Name: "application_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationName"), - }, - { - Name: "configuration_templates", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ConfigurationTemplates"), - }, - { - Name: "date_updated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateUpdated"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "resource_lifecycle_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceLifecycleConfig"), - }, - { - Name: "versions", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Versions"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go index 94b3c763a70d04..f172e9ddf4c3b9 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticbeanstalk import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/elasticbeanstalk/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigurationOptions() *schema.Table { @@ -13,6 +13,7 @@ func ConfigurationOptions() *schema.Table { Description: `https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationOptionDescription.html`, Resolver: fetchElasticbeanstalkConfigurationOptions, Multiplex: client.ServiceAccountRegionMultiplexer("elasticbeanstalk"), + Transform: transformers.TransformWithStruct(&models.ConfigurationOptionDescriptionWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -29,66 +30,6 @@ func ConfigurationOptions() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "change_severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("ChangeSeverity"), - }, - { - Name: "default_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultValue"), - }, - { - Name: "max_length", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxLength"), - }, - { - Name: "max_value", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxValue"), - }, - { - Name: "min_value", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinValue"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "namespace", - Type: schema.TypeString, - Resolver: schema.PathResolver("Namespace"), - }, - { - Name: "regex", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Regex"), - }, - { - Name: "user_defined", - Type: schema.TypeBool, - Resolver: schema.PathResolver("UserDefined"), - }, - { - Name: "value_options", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ValueOptions"), - }, - { - Name: "value_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ValueType"), - }, - { - Name: "application_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go index 2f76c6d728e6cf..131cd5f5fd5a51 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticbeanstalk import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/elasticbeanstalk/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigurationSettings() *schema.Table { @@ -13,6 +13,7 @@ func ConfigurationSettings() *schema.Table { Description: `https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationSettingsDescription.html`, Resolver: fetchElasticbeanstalkConfigurationSettings, Multiplex: client.ServiceAccountRegionMultiplexer("elasticbeanstalk"), + Transform: transformers.TransformWithStruct(models.ConfigurationSettingsDescriptionWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -29,61 +30,6 @@ func ConfigurationSettings() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "application_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationName"), - }, - { - Name: "date_created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateCreated"), - }, - { - Name: "date_updated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateUpdated"), - }, - { - Name: "deployment_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentStatus"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "environment_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EnvironmentName"), - }, - { - Name: "option_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OptionSettings"), - }, - { - Name: "platform_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformArn"), - }, - { - Name: "solution_stack_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SolutionStackName"), - }, - { - Name: "template_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateName"), - }, - { - Name: "application_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go index 6d3a6f62fc3a67..161845c984d972 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticbeanstalk import ( + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Environments() *schema.Table { @@ -13,6 +13,7 @@ func Environments() *schema.Table { Description: `https://docs.aws.amazon.com/elasticbeanstalk/latest/APIReference/API_EnvironmentDescription.html`, Resolver: fetchElasticbeanstalkEnvironments, Multiplex: client.ServiceAccountRegionMultiplexer("elasticbeanstalk"), + Transform: transformers.TransformWithStruct(&types.EnvironmentDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -50,101 +51,6 @@ func Environments() *schema.Table { Type: schema.TypeJSON, Resolver: resolveElasticbeanstalkEnvironmentListeners, }, - { - Name: "abortable_operation_in_progress", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AbortableOperationInProgress"), - }, - { - Name: "application_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplicationName"), - }, - { - Name: "cname", - Type: schema.TypeString, - Resolver: schema.PathResolver("CNAME"), - }, - { - Name: "date_created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateCreated"), - }, - { - Name: "date_updated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DateUpdated"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "endpoint_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointURL"), - }, - { - Name: "environment_links", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnvironmentLinks"), - }, - { - Name: "environment_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EnvironmentName"), - }, - { - Name: "health", - Type: schema.TypeString, - Resolver: schema.PathResolver("Health"), - }, - { - Name: "health_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthStatus"), - }, - { - Name: "operations_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("OperationsRole"), - }, - { - Name: "platform_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformArn"), - }, - { - Name: "resources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Resources"), - }, - { - Name: "solution_stack_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SolutionStackName"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "template_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateName"), - }, - { - Name: "tier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tier"), - }, - { - Name: "version_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionLabel"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/elasticsearch/domains.go b/plugins/source/aws/resources/services/elasticsearch/domains.go index 9aca73aecf8306..383f7db78f3e23 100644 --- a/plugins/source/aws/resources/services/elasticsearch/domains.go +++ b/plugins/source/aws/resources/services/elasticsearch/domains.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticsearch import ( + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Domains() *schema.Table { @@ -14,6 +14,7 @@ func Domains() *schema.Table { Resolver: fetchElasticsearchDomains, PreResourceResolver: getDomain, Multiplex: client.ServiceAccountRegionMultiplexer("es"), + Transform: transformers.TransformWithStruct(&types.ElasticsearchDomainStatus{}), Columns: []schema.Column{ { Name: "account_id", @@ -43,126 +44,6 @@ func Domains() *schema.Table { PrimaryKey: true, }, }, - { - Name: "domain_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainId"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "elasticsearch_cluster_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ElasticsearchClusterConfig"), - }, - { - Name: "access_policies", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessPolicies"), - }, - { - Name: "advanced_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdvancedOptions"), - }, - { - Name: "advanced_security_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdvancedSecurityOptions"), - }, - { - Name: "auto_tune_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AutoTuneOptions"), - }, - { - Name: "change_progress_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ChangeProgressDetails"), - }, - { - Name: "cognito_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CognitoOptions"), - }, - { - Name: "created", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Created"), - }, - { - Name: "deleted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Deleted"), - }, - { - Name: "domain_endpoint_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainEndpointOptions"), - }, - { - Name: "ebs_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EBSOptions"), - }, - { - Name: "elasticsearch_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("ElasticsearchVersion"), - }, - { - Name: "encryption_at_rest_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionAtRestOptions"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "endpoints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoints"), - }, - { - Name: "log_publishing_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LogPublishingOptions"), - }, - { - Name: "node_to_node_encryption_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NodeToNodeEncryptionOptions"), - }, - { - Name: "processing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Processing"), - }, - { - Name: "service_software_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceSoftwareOptions"), - }, - { - Name: "snapshot_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SnapshotOptions"), - }, - { - Name: "upgrade_processing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("UpgradeProcessing"), - }, - { - Name: "vpc_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VPCOptions"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticsearch/packages.go b/plugins/source/aws/resources/services/elasticsearch/packages.go index 91c883f02461aa..4c5517828ddad6 100644 --- a/plugins/source/aws/resources/services/elasticsearch/packages.go +++ b/plugins/source/aws/resources/services/elasticsearch/packages.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticsearch import ( + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Packages() *schema.Table { @@ -13,6 +13,7 @@ func Packages() *schema.Table { Description: `https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_PackageDetails.html`, Resolver: fetchElasticsearchPackages, Multiplex: client.ServiceAccountRegionMultiplexer("es"), + Transform: transformers.TransformWithStruct(&types.PackageDetails{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,31 +31,6 @@ func Packages() *schema.Table { PrimaryKey: true, }, }, - { - Name: "available_package_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailablePackageVersion"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "error_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ErrorDetails"), - }, - { - Name: "last_updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedAt"), - }, - { - Name: "package_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("PackageDescription"), - }, { Name: "id", Type: schema.TypeString, @@ -63,21 +39,6 @@ func Packages() *schema.Table { PrimaryKey: true, }, }, - { - Name: "package_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PackageName"), - }, - { - Name: "package_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("PackageStatus"), - }, - { - Name: "package_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PackageType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elasticsearch/versions.go b/plugins/source/aws/resources/services/elasticsearch/versions.go index e92597ac79f5e2..fd110169f464a2 100644 --- a/plugins/source/aws/resources/services/elasticsearch/versions.go +++ b/plugins/source/aws/resources/services/elasticsearch/versions.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticsearch import ( diff --git a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go index f8798e41105c79..ea21bee0ef433c 100644 --- a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elasticsearch import ( + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VpcEndpoints() *schema.Table { @@ -13,6 +13,7 @@ func VpcEndpoints() *schema.Table { Description: `https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_VpcEndpoint.html`, Resolver: fetchElasticsearchVpcEndpoints, Multiplex: client.ServiceAccountRegionMultiplexer("es"), + Transform: transformers.TransformWithStruct(&types.VpcEndpoint{}), Columns: []schema.Column{ { Name: "account_id", @@ -24,21 +25,6 @@ func VpcEndpoints() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "domain_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainArn"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, { Name: "id", Type: schema.TypeString, @@ -47,16 +33,6 @@ func VpcEndpoints() *schema.Table { PrimaryKey: true, }, }, - { - Name: "vpc_endpoint_owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcEndpointOwner"), - }, - { - Name: "vpc_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcOptions"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go index f152c5d32efe0c..6f5df176d3abf5 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elastictranscoder import ( + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PipelineJobs() *schema.Table { @@ -12,6 +12,7 @@ func PipelineJobs() *schema.Table { Name: "aws_elastictranscoder_pipeline_jobs", Description: `https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-jobs-by-pipeline.html`, Resolver: fetchElastictranscoderPipelineJobs, + Transform: transformers.TransformWithStruct(&types.Job{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,61 +32,6 @@ func PipelineJobs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "input", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Input"), - }, - { - Name: "inputs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Inputs"), - }, - { - Name: "output", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Output"), - }, - { - Name: "output_key_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputKeyPrefix"), - }, - { - Name: "outputs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Outputs"), - }, - { - Name: "pipeline_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PipelineId"), - }, - { - Name: "playlists", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Playlists"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "timing", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Timing"), - }, - { - Name: "user_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UserMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go index fdd0204c739aef..221fa44a6d1711 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elastictranscoder import ( + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Pipelines() *schema.Table { @@ -13,6 +13,7 @@ func Pipelines() *schema.Table { Description: `https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-pipelines.html`, Resolver: fetchElastictranscoderPipelines, Multiplex: client.ServiceAccountRegionMultiplexer("elastictranscoder"), + Transform: transformers.TransformWithStruct(&types.Pipeline{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,56 +33,6 @@ func Pipelines() *schema.Table { PrimaryKey: true, }, }, - { - Name: "aws_kms_key_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsKmsKeyArn"), - }, - { - Name: "content_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ContentConfig"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "input_bucket", - Type: schema.TypeString, - Resolver: schema.PathResolver("InputBucket"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "notifications", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Notifications"), - }, - { - Name: "output_bucket", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputBucket"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "thumbnail_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ThumbnailConfig"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/elastictranscoder/presets.go b/plugins/source/aws/resources/services/elastictranscoder/presets.go index 1a0ca58ea43560..b1936451bb576e 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/presets.go +++ b/plugins/source/aws/resources/services/elastictranscoder/presets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elastictranscoder import ( + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Presets() *schema.Table { @@ -13,6 +13,7 @@ func Presets() *schema.Table { Description: `https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-presets.html`, Resolver: fetchElastictranscoderPresets, Multiplex: client.ServiceAccountRegionMultiplexer("elastictranscoder"), + Transform: transformers.TransformWithStruct(&types.Preset{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func Presets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "audio", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Audio"), - }, - { - Name: "container", - Type: schema.TypeString, - Resolver: schema.PathResolver("Container"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "thumbnails", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Thumbnails"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "video", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Video"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go b/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go index 3decf59c443696..ed4b72969a5de0 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv1 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancerPolicies() *schema.Table { @@ -13,6 +13,7 @@ func LoadBalancerPolicies() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_PolicyDescription.html`, Resolver: fetchElbv1LoadBalancerPolicies, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.PolicyDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -39,16 +40,6 @@ func LoadBalancerPolicies() *schema.Table { Type: schema.TypeJSON, Resolver: resolveElbv1loadBalancerPolicyAttributeDescriptions, }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "policy_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyTypeName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elbv1/load_balancers.go b/plugins/source/aws/resources/services/elbv1/load_balancers.go index 568a5548202373..a53c172e4f39cb 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv1 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/elbv1/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancers() *schema.Table { @@ -13,6 +13,7 @@ func LoadBalancers() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_LoadBalancerDescription.html`, Resolver: fetchElbv1LoadBalancers, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&models.ELBv1LoadBalancerWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ { Name: "account_id", @@ -32,98 +33,7 @@ func LoadBalancers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "backend_server_descriptions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BackendServerDescriptions"), - }, - { - Name: "canonical_hosted_zone_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CanonicalHostedZoneName"), - }, - { - Name: "canonical_hosted_zone_name_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CanonicalHostedZoneNameID"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DNSName"), - }, - { - Name: "health_check", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HealthCheck"), - }, - { - Name: "instances", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Instances"), - }, - { - Name: "listener_descriptions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ListenerDescriptions"), - }, - { - Name: "load_balancer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoadBalancerName"), - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Policies"), - }, - { - Name: "scheme", - Type: schema.TypeString, - Resolver: schema.PathResolver("Scheme"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "source_security_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceSecurityGroup"), - }, - { - Name: "subnets", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Subnets"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VPCId"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attributes"), - }, }, - Relations: []*schema.Table{ LoadBalancerPolicies(), }, diff --git a/plugins/source/aws/resources/services/elbv2/listeners.go b/plugins/source/aws/resources/services/elbv2/listeners.go index 72bf25679a4f73..4801fbc3def264 100644 --- a/plugins/source/aws/resources/services/elbv2/listeners.go +++ b/plugins/source/aws/resources/services/elbv2/listeners.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv2 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Listeners() *schema.Table { @@ -13,6 +13,7 @@ func Listeners() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Listener.html`, Resolver: fetchElbv2Listeners, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.Listener{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,41 +38,6 @@ func Listeners() *schema.Table { Type: schema.TypeJSON, Resolver: resolveElbv2listenerTags, }, - { - Name: "alpn_policy", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AlpnPolicy"), - }, - { - Name: "certificates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Certificates"), - }, - { - Name: "default_actions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultActions"), - }, - { - Name: "load_balancer_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoadBalancerArn"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "ssl_policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("SslPolicy"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go b/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go index a1554a942856c0..b08da0117c92a9 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv2 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancerAttributes() *schema.Table { @@ -13,6 +13,7 @@ func LoadBalancerAttributes() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancerAttribute.html`, Resolver: fetchElbv2LoadBalancerAttributes, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.LoadBalancerAttribute{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,16 +30,6 @@ func LoadBalancerAttributes() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "key", - Type: schema.TypeString, - Resolver: schema.PathResolver("Key"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elbv2/load_balancers.go b/plugins/source/aws/resources/services/elbv2/load_balancers.go index 1adc8a0d3407ca..28f1b982fec9ce 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv2 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancers() *schema.Table { @@ -13,6 +13,7 @@ func LoadBalancers() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancer.html`, Resolver: fetchElbv2LoadBalancers, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.LoadBalancer{}), Columns: []schema.Column{ { Name: "account_id", @@ -43,66 +44,6 @@ func LoadBalancers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "availability_zones", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "canonical_hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CanonicalHostedZoneId"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "customer_owned_ipv4_pool", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerOwnedIpv4Pool"), - }, - { - Name: "dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DNSName"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "load_balancer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoadBalancerName"), - }, - { - Name: "scheme", - Type: schema.TypeString, - Resolver: schema.PathResolver("Scheme"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "state", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("State"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go b/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go index c7e1f6aa6062d7..0e9781f8730692 100644 --- a/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go +++ b/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv2 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TargetGroupTargetHealthDescriptions() *schema.Table { @@ -13,6 +13,7 @@ func TargetGroupTargetHealthDescriptions() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetHealthDescription.html`, Resolver: fetchElbv2TargetGroupTargetHealthDescriptions, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.TargetHealthDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,21 +30,6 @@ func TargetGroupTargetHealthDescriptions() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "health_check_port", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckPort"), - }, - { - Name: "target", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Target"), - }, - { - Name: "target_health", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetHealth"), - }, }, } } diff --git a/plugins/source/aws/resources/services/elbv2/target_groups.go b/plugins/source/aws/resources/services/elbv2/target_groups.go index 400864d1393eaf..ab01276ae9aaf8 100644 --- a/plugins/source/aws/resources/services/elbv2/target_groups.go +++ b/plugins/source/aws/resources/services/elbv2/target_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package elbv2 import ( + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TargetGroups() *schema.Table { @@ -13,6 +13,7 @@ func TargetGroups() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetGroup.html`, Resolver: fetchElbv2TargetGroups, Multiplex: client.ServiceAccountRegionMultiplexer("elasticloadbalancing"), + Transform: transformers.TransformWithStruct(&types.TargetGroup{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,91 +38,6 @@ func TargetGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "health_check_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HealthCheckEnabled"), - }, - { - Name: "health_check_interval_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthCheckIntervalSeconds"), - }, - { - Name: "health_check_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckPath"), - }, - { - Name: "health_check_port", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckPort"), - }, - { - Name: "health_check_protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckProtocol"), - }, - { - Name: "health_check_timeout_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthCheckTimeoutSeconds"), - }, - { - Name: "healthy_threshold_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthyThresholdCount"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "load_balancer_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("LoadBalancerArns"), - }, - { - Name: "matcher", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Matcher"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "protocol_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProtocolVersion"), - }, - { - Name: "target_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetGroupName"), - }, - { - Name: "target_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetType"), - }, - { - Name: "unhealthy_threshold_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UnhealthyThresholdCount"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/emr/block_public_access_configs.go b/plugins/source/aws/resources/services/emr/block_public_access_configs.go index 3975b35b29af28..1941e3cab8c7e0 100644 --- a/plugins/source/aws/resources/services/emr/block_public_access_configs.go +++ b/plugins/source/aws/resources/services/emr/block_public_access_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package emr import ( + "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BlockPublicAccessConfigs() *schema.Table { @@ -12,6 +12,7 @@ func BlockPublicAccessConfigs() *schema.Table { Name: "aws_emr_block_public_access_configs", Resolver: fetchEmrBlockPublicAccessConfigs, Multiplex: client.ServiceAccountRegionMultiplexer("elasticmapreduce"), + Transform: transformers.TransformWithStruct(&emr.GetBlockPublicAccessConfigurationOutput{}), Columns: []schema.Column{ { Name: "account_id", @@ -29,21 +30,6 @@ func BlockPublicAccessConfigs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "block_public_access_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlockPublicAccessConfiguration"), - }, - { - Name: "block_public_access_configuration_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlockPublicAccessConfigurationMetadata"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/emr/clusters.go b/plugins/source/aws/resources/services/emr/clusters.go index 88fbb27d7a991e..236e3f78334667 100644 --- a/plugins/source/aws/resources/services/emr/clusters.go +++ b/plugins/source/aws/resources/services/emr/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package emr import ( + "github.com/aws/aws-sdk-go-v2/service/emr/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -14,6 +14,7 @@ func Clusters() *schema.Table { Resolver: fetchEmrClusters, PreResourceResolver: getCluster, Multiplex: client.ServiceAccountRegionMultiplexer("elasticmapreduce"), + Transform: transformers.TransformWithStruct(&types.Cluster{}), Columns: []schema.Column{ { Name: "account_id", @@ -33,156 +34,11 @@ func Clusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "applications", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Applications"), - }, - { - Name: "auto_scaling_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoScalingRole"), - }, - { - Name: "auto_terminate", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoTerminate"), - }, - { - Name: "configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Configurations"), - }, - { - Name: "custom_ami_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomAmiId"), - }, - { - Name: "ebs_root_volume_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EbsRootVolumeSize"), - }, - { - Name: "ec2_instance_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Ec2InstanceAttributes"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "instance_collection_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceCollectionType"), - }, - { - Name: "kerberos_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KerberosAttributes"), - }, - { - Name: "log_encryption_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogEncryptionKmsKeyId"), - }, - { - Name: "log_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogUri"), - }, - { - Name: "master_public_dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterPublicDnsName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "normalized_instance_hours", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NormalizedInstanceHours"), - }, - { - Name: "os_release_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("OSReleaseLabel"), - }, - { - Name: "outpost_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutpostArn"), - }, - { - Name: "placement_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PlacementGroups"), - }, - { - Name: "release_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReleaseLabel"), - }, - { - Name: "repo_upgrade_on_boot", - Type: schema.TypeString, - Resolver: schema.PathResolver("RepoUpgradeOnBoot"), - }, - { - Name: "requested_ami_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequestedAmiVersion"), - }, - { - Name: "running_ami_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("RunningAmiVersion"), - }, - { - Name: "scale_down_behavior", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScaleDownBehavior"), - }, - { - Name: "security_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityConfiguration"), - }, - { - Name: "service_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceRole"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "step_concurrency_level", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StepConcurrencyLevel"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "termination_protected", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TerminationProtected"), - }, - { - Name: "visible_to_all_users", - Type: schema.TypeBool, - Resolver: schema.PathResolver("VisibleToAllUsers"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/api_destinations.go b/plugins/source/aws/resources/services/eventbridge/api_destinations.go index 0da60e53e08594..03bdcc8abee530 100644 --- a/plugins/source/aws/resources/services/eventbridge/api_destinations.go +++ b/plugins/source/aws/resources/services/eventbridge/api_destinations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ApiDestinations() *schema.Table { @@ -13,6 +13,7 @@ func ApiDestinations() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_ApiDestination.html`, Resolver: fetchEventbridgeApiDestinations, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.ApiDestination{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func ApiDestinations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "api_destination_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApiDestinationState"), - }, - { - Name: "connection_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionArn"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "http_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("HttpMethod"), - }, - { - Name: "invocation_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("InvocationEndpoint"), - }, - { - Name: "invocation_rate_limit_per_second", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InvocationRateLimitPerSecond"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/archives.go b/plugins/source/aws/resources/services/eventbridge/archives.go index 436e324d94dd7d..af21f2c80345aa 100644 --- a/plugins/source/aws/resources/services/eventbridge/archives.go +++ b/plugins/source/aws/resources/services/eventbridge/archives.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Archives() *schema.Table { @@ -13,6 +13,7 @@ func Archives() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Archive.html`, Resolver: fetchEventbridgeArchives, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.Archive{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func Archives() *schema.Table { PrimaryKey: true, }, }, - { - Name: "archive_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ArchiveName"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "event_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EventCount"), - }, - { - Name: "event_source_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventSourceArn"), - }, - { - Name: "retention_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RetentionDays"), - }, - { - Name: "size_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeBytes"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/connections.go b/plugins/source/aws/resources/services/eventbridge/connections.go index 97f072461e3b41..94a4327b5efd9c 100644 --- a/plugins/source/aws/resources/services/eventbridge/connections.go +++ b/plugins/source/aws/resources/services/eventbridge/connections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Connections() *schema.Table { @@ -13,6 +13,7 @@ func Connections() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Connection.html`, Resolver: fetchEventbridgeConnections, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.Connection{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,41 +33,6 @@ func Connections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "authorization_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthorizationType"), - }, - { - Name: "connection_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionState"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "last_authorized_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAuthorizedTime"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/endpoints.go b/plugins/source/aws/resources/services/eventbridge/endpoints.go index 820e05eca16d05..270c8e85c91290 100644 --- a/plugins/source/aws/resources/services/eventbridge/endpoints.go +++ b/plugins/source/aws/resources/services/eventbridge/endpoints.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Endpoints() *schema.Table { @@ -13,6 +13,7 @@ func Endpoints() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Endpoint.html`, Resolver: fetchEventbridgeEndpoints, Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct(&types.Endpoint{}), Columns: []schema.Column{ { Name: "account_id", @@ -27,66 +28,6 @@ func Endpoints() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "endpoint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointId"), - }, - { - Name: "endpoint_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointUrl"), - }, - { - Name: "event_buses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EventBuses"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "replication_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicationConfig"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "routing_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RoutingConfig"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go b/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go index b7fe325ab7e257..b736db0b29ae37 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go +++ b/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventBusRules() *schema.Table { @@ -13,6 +13,7 @@ func EventBusRules() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Rule.html`, Resolver: fetchEventbridgeEventBusRules, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.Rule{}), Columns: []schema.Column{ { Name: "account_id", @@ -34,51 +35,6 @@ func EventBusRules() *schema.Table { Type: schema.TypeJSON, Resolver: resolveEventbridgeEventBusRuleTags, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "event_bus_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventBusName"), - }, - { - Name: "event_pattern", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventPattern"), - }, - { - Name: "managed_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("ManagedBy"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "schedule_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScheduleExpression"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/event_buses.go b/plugins/source/aws/resources/services/eventbridge/event_buses.go index 2fc31244ab9350..ee2a12939fba74 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_buses.go +++ b/plugins/source/aws/resources/services/eventbridge/event_buses.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventBuses() *schema.Table { @@ -13,6 +13,7 @@ func EventBuses() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventBus.html`, Resolver: fetchEventbridgeEventBuses, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.EventBus{}), Columns: []schema.Column{ { Name: "account_id", @@ -36,16 +37,6 @@ func EventBuses() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("Policy"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/eventbridge/event_sources.go b/plugins/source/aws/resources/services/eventbridge/event_sources.go index a778cc4b9becec..37fb2c35f0e5a9 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_sources.go +++ b/plugins/source/aws/resources/services/eventbridge/event_sources.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventSources() *schema.Table { @@ -13,6 +13,7 @@ func EventSources() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventSource.html`, Resolver: fetchEventbridgeEventSources, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.EventSource{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,31 +33,6 @@ func EventSources() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "expiration_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpirationTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, }, } } diff --git a/plugins/source/aws/resources/services/eventbridge/replays.go b/plugins/source/aws/resources/services/eventbridge/replays.go index c2722d0a8dc74e..2dd3ede5c13d79 100644 --- a/plugins/source/aws/resources/services/eventbridge/replays.go +++ b/plugins/source/aws/resources/services/eventbridge/replays.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package eventbridge import ( + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Replays() *schema.Table { @@ -13,6 +13,7 @@ func Replays() *schema.Table { Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Replay.html`, Resolver: fetchEventbridgeReplays, Multiplex: client.ServiceAccountRegionMultiplexer("events"), + Transform: transformers.TransformWithStruct(&types.Replay{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,51 +33,6 @@ func Replays() *schema.Table { PrimaryKey: true, }, }, - { - Name: "event_end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EventEndTime"), - }, - { - Name: "event_last_replayed_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EventLastReplayedTime"), - }, - { - Name: "event_source_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventSourceArn"), - }, - { - Name: "event_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EventStartTime"), - }, - { - Name: "replay_end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ReplayEndTime"), - }, - { - Name: "replay_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplayName"), - }, - { - Name: "replay_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ReplayStartTime"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/firehose/delivery_streams.go b/plugins/source/aws/resources/services/firehose/delivery_streams.go index 725b539f48f55f..6beddb5150298c 100644 --- a/plugins/source/aws/resources/services/firehose/delivery_streams.go +++ b/plugins/source/aws/resources/services/firehose/delivery_streams.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package firehose import ( + "github.com/aws/aws-sdk-go-v2/service/firehose/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DeliveryStreams() *schema.Table { @@ -14,6 +14,7 @@ func DeliveryStreams() *schema.Table { Resolver: fetchFirehoseDeliveryStreams, PreResourceResolver: getDeliveryStream, Multiplex: client.ServiceAccountRegionMultiplexer("firehose"), + Transform: transformers.TransformWithStruct(&types.DeliveryStreamDescription{}), Columns: []schema.Column{ { Name: "account_id", @@ -38,61 +39,6 @@ func DeliveryStreams() *schema.Table { PrimaryKey: true, }, }, - { - Name: "delivery_stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliveryStreamName"), - }, - { - Name: "delivery_stream_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliveryStreamStatus"), - }, - { - Name: "delivery_stream_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeliveryStreamType"), - }, - { - Name: "destinations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Destinations"), - }, - { - Name: "has_more_destinations", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HasMoreDestinations"), - }, - { - Name: "version_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionId"), - }, - { - Name: "create_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTimestamp"), - }, - { - Name: "delivery_stream_encryption_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeliveryStreamEncryptionConfiguration"), - }, - { - Name: "failure_description", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDescription"), - }, - { - Name: "last_update_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdateTimestamp"), - }, - { - Name: "source", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Source"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/batch_imports.go b/plugins/source/aws/resources/services/frauddetector/batch_imports.go index 9ef95a2bc928ed..1f2766ebb986dc 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_imports.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_imports.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BatchImports() *schema.Table { @@ -13,6 +13,7 @@ func BatchImports() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchImport.html`, Resolver: fetchFrauddetectorBatchImports, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.BatchImport{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,66 +33,6 @@ func BatchImports() *schema.Table { PrimaryKey: true, }, }, - { - Name: "completion_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CompletionTime"), - }, - { - Name: "event_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventTypeName"), - }, - { - Name: "failed_records_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("FailedRecordsCount"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "input_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("InputPath"), - }, - { - Name: "job_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobId"), - }, - { - Name: "output_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputPath"), - }, - { - Name: "processed_records_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ProcessedRecordsCount"), - }, - { - Name: "start_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "total_records_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalRecordsCount"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go index c1cecc3052b661..ee2b787c48676c 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BatchPredictions() *schema.Table { @@ -13,6 +13,7 @@ func BatchPredictions() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchPrediction.html`, Resolver: fetchFrauddetectorBatchPredictions, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.BatchPrediction{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,76 +33,6 @@ func BatchPredictions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "completion_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CompletionTime"), - }, - { - Name: "detector_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetectorName"), - }, - { - Name: "detector_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetectorVersion"), - }, - { - Name: "event_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventTypeName"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleArn"), - }, - { - Name: "input_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("InputPath"), - }, - { - Name: "job_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobId"), - }, - { - Name: "last_heartbeat_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastHeartbeatTime"), - }, - { - Name: "output_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputPath"), - }, - { - Name: "processed_records_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ProcessedRecordsCount"), - }, - { - Name: "start_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "total_records_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalRecordsCount"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/detectors.go b/plugins/source/aws/resources/services/frauddetector/detectors.go index fdb783300b0de2..7975563a2b74e1 100644 --- a/plugins/source/aws/resources/services/frauddetector/detectors.go +++ b/plugins/source/aws/resources/services/frauddetector/detectors.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Detectors() *schema.Table { @@ -13,6 +13,7 @@ func Detectors() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_Detector.html`, Resolver: fetchFrauddetectorDetectors, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.Detector{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,31 +38,6 @@ func Detectors() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "detector_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetectorId"), - }, - { - Name: "event_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventTypeName"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/frauddetector/entity_types.go b/plugins/source/aws/resources/services/frauddetector/entity_types.go index 356043c787f2f1..86075725e2e115 100644 --- a/plugins/source/aws/resources/services/frauddetector/entity_types.go +++ b/plugins/source/aws/resources/services/frauddetector/entity_types.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EntityTypes() *schema.Table { @@ -13,6 +13,7 @@ func EntityTypes() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_EntityType.html`, Resolver: fetchFrauddetectorEntityTypes, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.EntityType{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,26 +38,6 @@ func EntityTypes() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/event_types.go b/plugins/source/aws/resources/services/frauddetector/event_types.go index 793db394cbe97f..91af5f02eee00e 100644 --- a/plugins/source/aws/resources/services/frauddetector/event_types.go +++ b/plugins/source/aws/resources/services/frauddetector/event_types.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventTypes() *schema.Table { @@ -13,6 +13,7 @@ func EventTypes() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_EventType.html`, Resolver: fetchFrauddetectorEventTypes, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.EventType{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,51 +38,6 @@ func EventTypes() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "entity_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EntityTypes"), - }, - { - Name: "event_ingestion", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventIngestion"), - }, - { - Name: "event_variables", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventVariables"), - }, - { - Name: "ingested_event_statistics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IngestedEventStatistics"), - }, - { - Name: "labels", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Labels"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/external_models.go b/plugins/source/aws/resources/services/frauddetector/external_models.go index de1633c372df61..8a19a5cb3144f7 100644 --- a/plugins/source/aws/resources/services/frauddetector/external_models.go +++ b/plugins/source/aws/resources/services/frauddetector/external_models.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ExternalModels() *schema.Table { @@ -13,6 +13,7 @@ func ExternalModels() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_ExternalModel.html`, Resolver: fetchFrauddetectorExternalModels, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.ExternalModel{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,46 +33,6 @@ func ExternalModels() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "input_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InputConfiguration"), - }, - { - Name: "invoke_model_endpoint_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("InvokeModelEndpointRoleArn"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "model_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelEndpoint"), - }, - { - Name: "model_endpoint_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelEndpointStatus"), - }, - { - Name: "model_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelSource"), - }, - { - Name: "output_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OutputConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/labels.go b/plugins/source/aws/resources/services/frauddetector/labels.go index 26c43de96f6ee1..20703306f90ff0 100644 --- a/plugins/source/aws/resources/services/frauddetector/labels.go +++ b/plugins/source/aws/resources/services/frauddetector/labels.go @@ -1,10 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" + "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Labels() *schema.Table { @@ -13,6 +14,7 @@ func Labels() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_Label.html`, Resolver: fetchFrauddetectorLabels, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.Label{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,26 +39,6 @@ func Labels() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/model_versions.go b/plugins/source/aws/resources/services/frauddetector/model_versions.go index 4f1dd2c51022fd..e1d0e91a917782 100644 --- a/plugins/source/aws/resources/services/frauddetector/model_versions.go +++ b/plugins/source/aws/resources/services/frauddetector/model_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ModelVersions() *schema.Table { @@ -12,6 +12,7 @@ func ModelVersions() *schema.Table { Name: "aws_frauddetector_model_versions", Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_ModelVersionDetail.html`, Resolver: fetchFrauddetectorModelVersions, + Transform: transformers.TransformWithStruct(&types.ModelVersionDetail{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,66 +32,6 @@ func ModelVersions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "external_events_detail", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExternalEventsDetail"), - }, - { - Name: "ingested_events_detail", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IngestedEventsDetail"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "model_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelId"), - }, - { - Name: "model_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelType"), - }, - { - Name: "model_version_number", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelVersionNumber"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "training_data_schema", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TrainingDataSchema"), - }, - { - Name: "training_data_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrainingDataSource"), - }, - { - Name: "training_result", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TrainingResult"), - }, - { - Name: "training_result_v2", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TrainingResultV2"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/models.go b/plugins/source/aws/resources/services/frauddetector/models.go index 0413ff49e61849..8a59d6c422766d 100644 --- a/plugins/source/aws/resources/services/frauddetector/models.go +++ b/plugins/source/aws/resources/services/frauddetector/models.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Models() *schema.Table { @@ -13,6 +13,7 @@ func Models() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_Model.html`, Resolver: fetchFrauddetectorModels, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.Model{}), Columns: []schema.Column{ { Name: "account_id", @@ -32,36 +33,6 @@ func Models() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "event_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventTypeName"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "model_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelId"), - }, - { - Name: "model_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelType"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/frauddetector/outcomes.go b/plugins/source/aws/resources/services/frauddetector/outcomes.go index 329535178eda5a..e922df2860bc10 100644 --- a/plugins/source/aws/resources/services/frauddetector/outcomes.go +++ b/plugins/source/aws/resources/services/frauddetector/outcomes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Outcomes() *schema.Table { @@ -13,6 +13,7 @@ func Outcomes() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_Outcome.html`, Resolver: fetchFrauddetectorOutcomes, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.Outcome{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,26 +38,6 @@ func Outcomes() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/rules.go b/plugins/source/aws/resources/services/frauddetector/rules.go index 4e2bf71d1c612a..ac09eedbcc87a8 100644 --- a/plugins/source/aws/resources/services/frauddetector/rules.go +++ b/plugins/source/aws/resources/services/frauddetector/rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Rules() *schema.Table { @@ -12,6 +12,7 @@ func Rules() *schema.Table { Name: "aws_frauddetector_rules", Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_RuleDetail.html`, Resolver: fetchFrauddetectorRules, + Transform: transformers.TransformWithStruct(&types.RuleDetail{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,51 +32,6 @@ func Rules() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "detector_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetectorId"), - }, - { - Name: "expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("Expression"), - }, - { - Name: "language", - Type: schema.TypeString, - Resolver: schema.PathResolver("Language"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "outcomes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Outcomes"), - }, - { - Name: "rule_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleId"), - }, - { - Name: "rule_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleVersion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/frauddetector/variables.go b/plugins/source/aws/resources/services/frauddetector/variables.go index b147913d1ab3ba..5a0bf8b37c264c 100644 --- a/plugins/source/aws/resources/services/frauddetector/variables.go +++ b/plugins/source/aws/resources/services/frauddetector/variables.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package frauddetector import ( + "github.com/aws/aws-sdk-go-v2/service/frauddetector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Variables() *schema.Table { @@ -13,6 +13,7 @@ func Variables() *schema.Table { Description: `https://docs.aws.amazon.com/frauddetector/latest/api/API_Variable.html`, Resolver: fetchFrauddetectorVariables, Multiplex: client.ServiceAccountRegionMultiplexer("frauddetector"), + Transform: transformers.TransformWithStruct(&types.Variable{}), Columns: []schema.Column{ { Name: "account_id", @@ -37,46 +38,6 @@ func Variables() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourceTags, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataSource"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "default_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultValue"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "variable_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VariableType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/backups.go b/plugins/source/aws/resources/services/fsx/backups.go index a019fe9c38114d..745ea59de7373a 100644 --- a/plugins/source/aws/resources/services/fsx/backups.go +++ b/plugins/source/aws/resources/services/fsx/backups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Backups() *schema.Table { @@ -12,6 +12,7 @@ func Backups() *schema.Table { Name: "aws_fsx_backups", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_Backup.html`, Resolver: fetchFsxBackups, + Transform: transformers.TransformWithStruct(&types.Backup{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -38,81 +39,11 @@ func Backups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "file_system", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FileSystem"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "directory_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DirectoryInformation"), - }, - { - Name: "failure_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDetails"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "progress_percent", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ProgressPercent"), - }, - { - Name: "resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceARN"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "source_backup_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBackupId"), - }, - { - Name: "source_backup_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBackupRegion"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "volume", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Volume"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/data_repository_associations.go b/plugins/source/aws/resources/services/fsx/data_repository_associations.go index f23d823416e690..a72cc29195e5bb 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_associations.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataRepositoryAssociations() *schema.Table { @@ -12,6 +12,7 @@ func DataRepositoryAssociations() *schema.Table { Name: "aws_fsx_data_repository_associations", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryAssociation.html`, Resolver: fetchFsxDataRepositoryAssociations, + Transform: transformers.TransformWithStruct(&types.DataRepositoryAssociation{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -32,76 +33,6 @@ func DataRepositoryAssociations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "association_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationId"), - }, - { - Name: "batch_import_meta_data_on_create", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BatchImportMetaDataOnCreate"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "data_repository_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataRepositoryPath"), - }, - { - Name: "data_repository_subdirectories", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DataRepositorySubdirectories"), - }, - { - Name: "failure_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDetails"), - }, - { - Name: "file_cache_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCacheId"), - }, - { - Name: "file_cache_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCachePath"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "file_system_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemPath"), - }, - { - Name: "imported_file_chunk_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ImportedFileChunkSize"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "nfs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NFS"), - }, - { - Name: "s3", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("S3"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/fsx/data_repository_tasks.go b/plugins/source/aws/resources/services/fsx/data_repository_tasks.go index 9c7173247dafbe..06ee069931f32f 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_tasks.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_tasks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataRepositoryTasks() *schema.Table { @@ -12,6 +12,7 @@ func DataRepositoryTasks() *schema.Table { Name: "aws_fsx_data_repository_tasks", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryTask.html`, Resolver: fetchFsxDataRepositoryTasks, + Transform: transformers.TransformWithStruct(&types.DataRepositoryTask{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -32,71 +33,6 @@ func DataRepositoryTasks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "task_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TaskId"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "capacity_to_release", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CapacityToRelease"), - }, - { - Name: "end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndTime"), - }, - { - Name: "failure_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDetails"), - }, - { - Name: "file_cache_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCacheId"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "paths", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Paths"), - }, - { - Name: "report", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Report"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Status"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/fsx/file_caches.go b/plugins/source/aws/resources/services/fsx/file_caches.go index 8a5b70031fbf99..8e11b6ea7e7c2d 100644 --- a/plugins/source/aws/resources/services/fsx/file_caches.go +++ b/plugins/source/aws/resources/services/fsx/file_caches.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FileCaches() *schema.Table { @@ -12,6 +12,7 @@ func FileCaches() *schema.Table { Name: "aws_fsx_file_caches", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileCache.html`, Resolver: fetchFsxFileCaches, + Transform: transformers.TransformWithStruct(&types.FileCache{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -37,81 +38,6 @@ func FileCaches() *schema.Table { Type: schema.TypeJSON, Resolver: resolveFileCacheTags, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DNSName"), - }, - { - Name: "data_repository_association_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DataRepositoryAssociationIds"), - }, - { - Name: "failure_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDetails"), - }, - { - Name: "file_cache_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCacheId"), - }, - { - Name: "file_cache_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCacheType"), - }, - { - Name: "file_cache_type_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileCacheTypeVersion"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "lustre_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LustreConfiguration"), - }, - { - Name: "network_interface_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NetworkInterfaceIds"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "storage_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StorageCapacity"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/file_systems.go b/plugins/source/aws/resources/services/fsx/file_systems.go index 3f3f7943fd36a4..042c45d73064f2 100644 --- a/plugins/source/aws/resources/services/fsx/file_systems.go +++ b/plugins/source/aws/resources/services/fsx/file_systems.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FileSystems() *schema.Table { @@ -12,6 +12,7 @@ func FileSystems() *schema.Table { Name: "aws_fsx_file_systems", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileSystem.html`, Resolver: fetchFsxFileSystems, + Transform: transformers.TransformWithStruct(&types.FileSystem{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -37,102 +38,6 @@ func FileSystems() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "administrative_actions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdministrativeActions"), - IgnoreInTests: true, - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DNSName"), - }, - { - Name: "failure_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FailureDetails"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "file_system_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemType"), - }, - { - Name: "file_system_type_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemTypeVersion"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "lustre_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LustreConfiguration"), - }, - { - Name: "network_interface_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NetworkInterfaceIds"), - }, - { - Name: "ontap_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OntapConfiguration"), - }, - { - Name: "open_zfs_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OpenZFSConfiguration"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "storage_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StorageCapacity"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, - { - Name: "windows_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WindowsConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/snapshots.go b/plugins/source/aws/resources/services/fsx/snapshots.go index 7d51be0744b230..d4ce6e3f6f5c9b 100644 --- a/plugins/source/aws/resources/services/fsx/snapshots.go +++ b/plugins/source/aws/resources/services/fsx/snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Snapshots() *schema.Table { @@ -12,6 +12,7 @@ func Snapshots() *schema.Table { Name: "aws_fsx_snapshots", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_Snapshot.html`, Resolver: fetchFsxSnapshots, + Transform: transformers.TransformWithStruct(&types.Snapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -38,41 +39,11 @@ func Snapshots() *schema.Table { Resolver: schema.PathResolver("AdministrativeActions"), IgnoreInTests: true, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "lifecycle_transition_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LifecycleTransitionReason"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "snapshot_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotId"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "volume_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go b/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go index 2a700486cc2047..50481385ddff03 100644 --- a/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go +++ b/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StorageVirtualMachines() *schema.Table { @@ -12,6 +12,7 @@ func StorageVirtualMachines() *schema.Table { Name: "aws_fsx_storage_virtual_machines", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_StorageVirtualMachine.html`, Resolver: fetchFsxStorageVirtualMachines, + Transform: transformers.TransformWithStruct(&types.StorageVirtualMachine{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -32,66 +33,11 @@ func StorageVirtualMachines() *schema.Table { PrimaryKey: true, }, }, - { - Name: "active_directory_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ActiveDirectoryConfiguration"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "endpoints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoints"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "lifecycle_transition_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LifecycleTransitionReason"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "root_volume_security_style", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootVolumeSecurityStyle"), - }, - { - Name: "storage_virtual_machine_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageVirtualMachineId"), - }, - { - Name: "subtype", - Type: schema.TypeString, - Resolver: schema.PathResolver("Subtype"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "uuid", - Type: schema.TypeString, - Resolver: schema.PathResolver("UUID"), - }, }, } } diff --git a/plugins/source/aws/resources/services/fsx/volumes.go b/plugins/source/aws/resources/services/fsx/volumes.go index 8d288bb20133af..74257e9e493a41 100644 --- a/plugins/source/aws/resources/services/fsx/volumes.go +++ b/plugins/source/aws/resources/services/fsx/volumes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package fsx import ( + "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Volumes() *schema.Table { @@ -12,6 +12,7 @@ func Volumes() *schema.Table { Name: "aws_fsx_volumes", Description: `https://docs.aws.amazon.com/fsx/latest/APIReference/API_Volume.html`, Resolver: fetchFsxVolumes, + Transform: transformers.TransformWithStruct(&types.Volume{}), Multiplex: client.ServiceAccountRegionMultiplexer("fsx"), Columns: []schema.Column{ { @@ -38,56 +39,11 @@ func Volumes() *schema.Table { Resolver: schema.PathResolver("AdministrativeActions"), IgnoreInTests: true, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "file_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), - }, - { - Name: "lifecycle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Lifecycle"), - }, - { - Name: "lifecycle_transition_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LifecycleTransitionReason"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "ontap_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OntapConfiguration"), - }, - { - Name: "open_zfs_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OpenZFSConfiguration"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "volume_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeId"), - }, - { - Name: "volume_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go b/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go index b07e7d256f7262..69eefc45a8f336 100644 --- a/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go +++ b/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glacier import ( + "github.com/aws/aws-sdk-go-v2/service/glacier/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataRetrievalPolicies() *schema.Table { return &schema.Table{ Name: "aws_glacier_data_retrieval_policies", Resolver: fetchGlacierDataRetrievalPolicies, + Transform: transformers.TransformWithStruct(&types.DataRetrievalPolicy{}), Multiplex: client.ServiceAccountRegionMultiplexer("glacier"), Columns: []schema.Column{ { @@ -29,11 +30,6 @@ func DataRetrievalPolicies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glacier/vault_access_policies.go b/plugins/source/aws/resources/services/glacier/vault_access_policies.go index badc63ff205fe8..c145e32f58ef32 100644 --- a/plugins/source/aws/resources/services/glacier/vault_access_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_access_policies.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glacier import ( + "github.com/aws/aws-sdk-go-v2/service/glacier/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VaultAccessPolicies() *schema.Table { return &schema.Table{ Name: "aws_glacier_vault_access_policies", Resolver: fetchGlacierVaultAccessPolicies, + Transform: transformers.TransformWithStruct(&types.VaultAccessPolicy{}), Multiplex: client.ServiceAccountRegionMultiplexer("glacier"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/glacier/vault_lock_policies.go b/plugins/source/aws/resources/services/glacier/vault_lock_policies.go index b215b3b36c8692..5709a1a57cef4e 100644 --- a/plugins/source/aws/resources/services/glacier/vault_lock_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_lock_policies.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glacier import ( + "github.com/aws/aws-sdk-go-v2/service/glacier" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VaultLockPolicies() *schema.Table { return &schema.Table{ Name: "aws_glacier_vault_lock_policies", Resolver: fetchGlacierVaultLockPolicies, + Transform: transformers.TransformWithStruct(&glacier.GetVaultLockOutput{}, transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("glacier"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/glacier/vault_notifications.go b/plugins/source/aws/resources/services/glacier/vault_notifications.go index 9a10d5e6d8fe00..0d3364dc19d5c1 100644 --- a/plugins/source/aws/resources/services/glacier/vault_notifications.go +++ b/plugins/source/aws/resources/services/glacier/vault_notifications.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glacier import ( + "github.com/aws/aws-sdk-go-v2/service/glacier/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VaultNotifications() *schema.Table { return &schema.Table{ Name: "aws_glacier_vault_notifications", Resolver: fetchGlacierVaultNotifications, + Transform: transformers.TransformWithStruct(&types.VaultNotificationConfig{}), Multiplex: client.ServiceAccountRegionMultiplexer("glacier"), Columns: []schema.Column{ { @@ -31,16 +32,6 @@ func VaultNotifications() *schema.Table { PrimaryKey: true, }, }, - { - Name: "events", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Events"), - }, - { - Name: "sns_topic", - Type: schema.TypeString, - Resolver: schema.PathResolver("SNSTopic"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glacier/vaults.go b/plugins/source/aws/resources/services/glacier/vaults.go index 7512f980b6aa98..64ee8049902a37 100644 --- a/plugins/source/aws/resources/services/glacier/vaults.go +++ b/plugins/source/aws/resources/services/glacier/vaults.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glacier import ( + "github.com/aws/aws-sdk-go-v2/service/glacier/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Vaults() *schema.Table { return &schema.Table{ Name: "aws_glacier_vaults", Resolver: fetchGlacierVaults, + Transform: transformers.TransformWithStruct(&types.DescribeVaultOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("glacier"), Columns: []schema.Column{ { @@ -36,31 +37,6 @@ func Vaults() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_date", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "last_inventory_date", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastInventoryDate"), - }, - { - Name: "number_of_archives", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfArchives"), - }, - { - Name: "size_in_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeInBytes"), - }, - { - Name: "vault_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VaultName"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/classifiers.go b/plugins/source/aws/resources/services/glue/classifiers.go index ce5b2cf0e01bf8..d8a1fb323f52b8 100644 --- a/plugins/source/aws/resources/services/glue/classifiers.go +++ b/plugins/source/aws/resources/services/glue/classifiers.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Classifiers() *schema.Table { return &schema.Table{ Name: "aws_glue_classifiers", Resolver: fetchGlueClassifiers, + Transform: transformers.TransformWithStruct(&types.Classifier{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -37,26 +38,6 @@ func Classifiers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "csv_classifier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CsvClassifier"), - }, - { - Name: "grok_classifier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GrokClassifier"), - }, - { - Name: "json_classifier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("JsonClassifier"), - }, - { - Name: "xml_classifier", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("XMLClassifier"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/connections.go b/plugins/source/aws/resources/services/glue/connections.go index 3b856e5e27b9ab..6c574f1ec9e25f 100644 --- a/plugins/source/aws/resources/services/glue/connections.go +++ b/plugins/source/aws/resources/services/glue/connections.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Connections() *schema.Table { return &schema.Table{ Name: "aws_glue_connections", Resolver: fetchGlueConnections, + Transform: transformers.TransformWithStruct(&types.Connection{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -31,51 +32,6 @@ func Connections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "connection_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConnectionProperties"), - }, - { - Name: "connection_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConnectionType"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdatedBy"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "match_criteria", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("MatchCriteria"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "physical_connection_requirements", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PhysicalConnectionRequirements"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/crawlers.go b/plugins/source/aws/resources/services/glue/crawlers.go index 0b0ab8cca18163..d53f73c57e2169 100644 --- a/plugins/source/aws/resources/services/glue/crawlers.go +++ b/plugins/source/aws/resources/services/glue/crawlers.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Crawlers() *schema.Table { return &schema.Table{ Name: "aws_glue_crawlers", Resolver: fetchGlueCrawlers, + Transform: transformers.TransformWithStruct(&types.Crawler{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,106 +37,6 @@ func Crawlers() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueCrawlerTags, }, - { - Name: "classifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Classifiers"), - }, - { - Name: "configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("Configuration"), - }, - { - Name: "crawl_elapsed_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CrawlElapsedTime"), - }, - { - Name: "crawler_security_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("CrawlerSecurityConfiguration"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "lake_formation_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LakeFormationConfiguration"), - }, - { - Name: "last_crawl", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastCrawl"), - }, - { - Name: "last_updated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdated"), - }, - { - Name: "lineage_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LineageConfiguration"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "recrawl_policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RecrawlPolicy"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "schedule", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Schedule"), - }, - { - Name: "schema_change_policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SchemaChangePolicy"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "table_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("TablePrefix"), - }, - { - Name: "targets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Targets"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/database_table_indexes.go b/plugins/source/aws/resources/services/glue/database_table_indexes.go index 1ea54dd7df2678..736588a443933a 100644 --- a/plugins/source/aws/resources/services/glue/database_table_indexes.go +++ b/plugins/source/aws/resources/services/glue/database_table_indexes.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseTableIndexes() *schema.Table { return &schema.Table{ Name: "aws_glue_database_table_indexes", Resolver: fetchGlueDatabaseTableIndexes, + Transform: transformers.TransformWithStruct(&types.PartitionIndexDescriptor{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -47,21 +48,6 @@ func DatabaseTableIndexes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "index_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("IndexStatus"), - }, - { - Name: "keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Keys"), - }, - { - Name: "backfill_errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BackfillErrors"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/database_tables.go b/plugins/source/aws/resources/services/glue/database_tables.go index bc83d75f935f12..88c043d9e4205a 100644 --- a/plugins/source/aws/resources/services/glue/database_tables.go +++ b/plugins/source/aws/resources/services/glue/database_tables.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseTables() *schema.Table { return &schema.Table{ Name: "aws_glue_database_tables", Resolver: fetchGlueDatabaseTables, + Transform: transformers.TransformWithStruct(&types.Table{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -39,101 +40,6 @@ func DatabaseTables() *schema.Table { PrimaryKey: true, }, }, - { - Name: "catalog_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CatalogId"), - }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_registered_with_lake_formation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsRegisteredWithLakeFormation"), - }, - { - Name: "last_access_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAccessTime"), - }, - { - Name: "last_analyzed_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAnalyzedTime"), - }, - { - Name: "owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "partition_keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PartitionKeys"), - }, - { - Name: "retention", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Retention"), - }, - { - Name: "storage_descriptor", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StorageDescriptor"), - }, - { - Name: "table_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableType"), - }, - { - Name: "target_table", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetTable"), - }, - { - Name: "update_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdateTime"), - }, - { - Name: "version_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionId"), - }, - { - Name: "view_expanded_text", - Type: schema.TypeString, - Resolver: schema.PathResolver("ViewExpandedText"), - }, - { - Name: "view_original_text", - Type: schema.TypeString, - Resolver: schema.PathResolver("ViewOriginalText"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/databases.go b/plugins/source/aws/resources/services/glue/databases.go index 86c3dc489b6553..24401f0380b5e2 100644 --- a/plugins/source/aws/resources/services/glue/databases.go +++ b/plugins/source/aws/resources/services/glue/databases.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Databases() *schema.Table { return &schema.Table{ Name: "aws_glue_databases", Resolver: fetchGlueDatabases, + Transform: transformers.TransformWithStruct(&types.Database{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,46 +37,6 @@ func Databases() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueDatabaseTags, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "catalog_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CatalogId"), - }, - { - Name: "create_table_default_permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CreateTableDefaultPermissions"), - }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "location_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("LocationUri"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "target_database", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetDatabase"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go b/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go index c0e87d2a76ba54..ff4d473ebf6f9c 100644 --- a/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go +++ b/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatacatalogEncryptionSettings() *schema.Table { return &schema.Table{ Name: "aws_glue_datacatalog_encryption_settings", Resolver: fetchGlueDatacatalogEncryptionSettings, + Transform: transformers.TransformWithStruct(&types.DataCatalogEncryptionSettings{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -26,16 +27,6 @@ func DatacatalogEncryptionSettings() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "connection_password_encryption", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConnectionPasswordEncryption"), - }, - { - Name: "encryption_at_rest", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionAtRest"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/dev_endpoints.go b/plugins/source/aws/resources/services/glue/dev_endpoints.go index 477affe9f0f425..d8393a49d31e41 100644 --- a/plugins/source/aws/resources/services/glue/dev_endpoints.go +++ b/plugins/source/aws/resources/services/glue/dev_endpoints.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DevEndpoints() *schema.Table { return &schema.Table{ Name: "aws_glue_dev_endpoints", Resolver: fetchGlueDevEndpoints, + Transform: transformers.TransformWithStruct(&types.DevEndpoint{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,131 +37,6 @@ func DevEndpoints() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueDevEndpointTags, }, - { - Name: "arguments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Arguments"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "created_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTimestamp"), - }, - { - Name: "endpoint_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointName"), - }, - { - Name: "extra_jars_s3_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExtraJarsS3Path"), - }, - { - Name: "extra_python_libs_s3_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExtraPythonLibsS3Path"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "glue_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlueVersion"), - }, - { - Name: "last_modified_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTimestamp"), - }, - { - Name: "last_update_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdateStatus"), - }, - { - Name: "number_of_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfNodes"), - }, - { - Name: "number_of_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfWorkers"), - }, - { - Name: "private_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateAddress"), - }, - { - Name: "public_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicAddress"), - }, - { - Name: "public_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicKey"), - }, - { - Name: "public_keys", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("PublicKeys"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "security_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityConfiguration"), - }, - { - Name: "security_group_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroupIds"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, - { - Name: "worker_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkerType"), - }, - { - Name: "yarn_endpoint_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("YarnEndpointAddress"), - }, - { - Name: "zeppelin_remote_spark_interpreter_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ZeppelinRemoteSparkInterpreterPort"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/job_runs.go b/plugins/source/aws/resources/services/glue/job_runs.go index b447fa1ffbea5e..d0852a803fe24c 100644 --- a/plugins/source/aws/resources/services/glue/job_runs.go +++ b/plugins/source/aws/resources/services/glue/job_runs.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func JobRuns() *schema.Table { return &schema.Table{ Name: "aws_glue_job_runs", Resolver: fetchGlueJobRuns, + Transform: transformers.TransformWithStruct(&types.JobRun{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -28,126 +29,6 @@ func JobRuns() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allocated_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedCapacity"), - }, - { - Name: "arguments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Arguments"), - }, - { - Name: "attempt", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Attempt"), - }, - { - Name: "completed_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletedOn"), - }, - { - Name: "dpu_seconds", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("DPUSeconds"), - }, - { - Name: "error_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorMessage"), - }, - { - Name: "execution_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExecutionClass"), - }, - { - Name: "execution_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ExecutionTime"), - }, - { - Name: "glue_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlueVersion"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "job_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobName"), - }, - { - Name: "job_run_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobRunState"), - }, - { - Name: "last_modified_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedOn"), - }, - { - Name: "log_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogGroupName"), - }, - { - Name: "max_capacity", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("MaxCapacity"), - }, - { - Name: "notification_property", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NotificationProperty"), - }, - { - Name: "number_of_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfWorkers"), - }, - { - Name: "predecessor_runs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PredecessorRuns"), - }, - { - Name: "previous_run_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreviousRunId"), - }, - { - Name: "security_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityConfiguration"), - }, - { - Name: "started_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartedOn"), - }, - { - Name: "timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Timeout"), - }, - { - Name: "trigger_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TriggerName"), - }, - { - Name: "worker_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkerType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/jobs.go b/plugins/source/aws/resources/services/glue/jobs.go index a31cb9b89dfa64..2885628669710c 100644 --- a/plugins/source/aws/resources/services/glue/jobs.go +++ b/plugins/source/aws/resources/services/glue/jobs.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Jobs() *schema.Table { return &schema.Table{ Name: "aws_glue_jobs", Resolver: fetchGlueJobs, + Transform: transformers.TransformWithStruct(&types.Job{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,121 +37,6 @@ func Jobs() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueJobTags, }, - { - Name: "allocated_capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedCapacity"), - }, - { - Name: "code_gen_configuration_nodes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CodeGenConfigurationNodes"), - }, - { - Name: "command", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Command"), - }, - { - Name: "connections", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Connections"), - }, - { - Name: "created_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedOn"), - }, - { - Name: "default_arguments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultArguments"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "execution_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExecutionClass"), - }, - { - Name: "execution_property", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExecutionProperty"), - }, - { - Name: "glue_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlueVersion"), - }, - { - Name: "last_modified_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedOn"), - }, - { - Name: "log_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogUri"), - }, - { - Name: "max_capacity", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("MaxCapacity"), - }, - { - Name: "max_retries", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxRetries"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "non_overridable_arguments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NonOverridableArguments"), - }, - { - Name: "notification_property", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NotificationProperty"), - }, - { - Name: "number_of_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfWorkers"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "security_configuration", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityConfiguration"), - }, - { - Name: "source_control_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceControlDetails"), - }, - { - Name: "timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Timeout"), - }, - { - Name: "worker_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkerType"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go b/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go index 8e2ebbbd46fbd6..63191697d79315 100644 --- a/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go +++ b/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func MlTransformTaskRuns() *schema.Table { return &schema.Table{ Name: "aws_glue_ml_transform_task_runs", Resolver: fetchGlueMlTransformTaskRuns, + Transform: transformers.TransformWithStruct(&types.TaskRun{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -28,56 +29,6 @@ func MlTransformTaskRuns() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "completed_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletedOn"), - }, - { - Name: "error_string", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorString"), - }, - { - Name: "execution_time", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ExecutionTime"), - }, - { - Name: "last_modified_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedOn"), - }, - { - Name: "log_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogGroupName"), - }, - { - Name: "properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Properties"), - }, - { - Name: "started_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartedOn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "task_run_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TaskRunId"), - }, - { - Name: "transform_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransformId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/ml_transforms.go b/plugins/source/aws/resources/services/glue/ml_transforms.go index 310006f1354142..7d04aad1b5ce6a 100644 --- a/plugins/source/aws/resources/services/glue/ml_transforms.go +++ b/plugins/source/aws/resources/services/glue/ml_transforms.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func MlTransforms() *schema.Table { return &schema.Table{ Name: "aws_glue_ml_transforms", Resolver: fetchGlueMlTransforms, + Transform: transformers.TransformWithStruct(&types.MLTransform{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -41,96 +42,6 @@ func MlTransforms() *schema.Table { Type: schema.TypeJSON, Resolver: resolveMlTransformsSchema, }, - { - Name: "created_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedOn"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "evaluation_metrics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EvaluationMetrics"), - }, - { - Name: "glue_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlueVersion"), - }, - { - Name: "input_record_tables", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InputRecordTables"), - }, - { - Name: "label_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LabelCount"), - }, - { - Name: "last_modified_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedOn"), - }, - { - Name: "max_capacity", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("MaxCapacity"), - }, - { - Name: "max_retries", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxRetries"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "number_of_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfWorkers"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Timeout"), - }, - { - Name: "transform_encryption", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TransformEncryption"), - }, - { - Name: "transform_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransformId"), - }, - { - Name: "worker_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkerType"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/registries.go b/plugins/source/aws/resources/services/glue/registries.go index 9c2c30093dad83..0ef7e205209724 100644 --- a/plugins/source/aws/resources/services/glue/registries.go +++ b/plugins/source/aws/resources/services/glue/registries.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Registries() *schema.Table { return &schema.Table{ Name: "aws_glue_registries", Resolver: fetchGlueRegistries, + Transform: transformers.TransformWithStruct(&types.RegistryListItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,31 +37,6 @@ func Registries() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "registry_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryName"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("UpdatedTime"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/registry_schema_versions.go b/plugins/source/aws/resources/services/glue/registry_schema_versions.go index 729f12ece3dab1..99d1105029d247 100644 --- a/plugins/source/aws/resources/services/glue/registry_schema_versions.go +++ b/plugins/source/aws/resources/services/glue/registry_schema_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegistrySchemaVersions() *schema.Table { @@ -12,6 +12,7 @@ func RegistrySchemaVersions() *schema.Table { Name: "aws_glue_registry_schema_versions", Resolver: fetchGlueRegistrySchemaVersions, PreResourceResolver: getRegistrySchemaVersion, + Transform: transformers.TransformWithStruct(&glue.GetSchemaVersionOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -34,46 +35,6 @@ func RegistrySchemaVersions() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueRegistrySchemaVersionMetadata, }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_format", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataFormat"), - }, - { - Name: "schema_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaArn"), - }, - { - Name: "schema_definition", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaDefinition"), - }, - { - Name: "schema_version_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaVersionId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "version_number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VersionNumber"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/registry_schemas.go b/plugins/source/aws/resources/services/glue/registry_schemas.go index de70ff6db87346..127aa1144a240e 100644 --- a/plugins/source/aws/resources/services/glue/registry_schemas.go +++ b/plugins/source/aws/resources/services/glue/registry_schemas.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegistrySchemas() *schema.Table { @@ -12,6 +12,7 @@ func RegistrySchemas() *schema.Table { Name: "aws_glue_registry_schemas", Resolver: fetchGlueRegistrySchemas, PreResourceResolver: getRegistrySchema, + Transform: transformers.TransformWithStruct(&glue.GetSchemaOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -34,71 +35,6 @@ func RegistrySchemas() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueRegistrySchemaTags, }, - { - Name: "compatibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("Compatibility"), - }, - { - Name: "created_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_format", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataFormat"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "latest_schema_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LatestSchemaVersion"), - }, - { - Name: "next_schema_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NextSchemaVersion"), - }, - { - Name: "registry_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryArn"), - }, - { - Name: "registry_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryName"), - }, - { - Name: "schema_checkpoint", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SchemaCheckpoint"), - }, - { - Name: "schema_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaName"), - }, - { - Name: "schema_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaStatus"), - }, - { - Name: "updated_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("UpdatedTime"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/glue/security_configurations.go b/plugins/source/aws/resources/services/glue/security_configurations.go index 38eb634e7efb2d..b0d76d2a50530f 100644 --- a/plugins/source/aws/resources/services/glue/security_configurations.go +++ b/plugins/source/aws/resources/services/glue/security_configurations.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SecurityConfigurations() *schema.Table { return &schema.Table{ Name: "aws_glue_security_configurations", Resolver: fetchGlueSecurityConfigurations, + Transform: transformers.TransformWithStruct(&types.SecurityConfiguration{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -36,16 +37,6 @@ func SecurityConfigurations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time_stamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTimeStamp"), - }, - { - Name: "encryption_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/triggers.go b/plugins/source/aws/resources/services/glue/triggers.go index 0380626d62f4ed..166bbc63a4c5e1 100644 --- a/plugins/source/aws/resources/services/glue/triggers.go +++ b/plugins/source/aws/resources/services/glue/triggers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Triggers() *schema.Table { @@ -12,6 +12,7 @@ func Triggers() *schema.Table { Name: "aws_glue_triggers", Resolver: fetchGlueTriggers, PreResourceResolver: getTrigger, + Transform: transformers.TransformWithStruct(&types.Trigger{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -37,56 +38,6 @@ func Triggers() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueTriggerTags, }, - { - Name: "actions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Actions"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "event_batching_condition", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EventBatchingCondition"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "predicate", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Predicate"), - }, - { - Name: "schedule", - Type: schema.TypeString, - Resolver: schema.PathResolver("Schedule"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "workflow_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkflowName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/glue/workflows.go b/plugins/source/aws/resources/services/glue/workflows.go index ba9cdbf4076e9f..b44518985c1dc2 100644 --- a/plugins/source/aws/resources/services/glue/workflows.go +++ b/plugins/source/aws/resources/services/glue/workflows.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package glue import ( + "github.com/aws/aws-sdk-go-v2/service/glue/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Workflows() *schema.Table { @@ -12,6 +12,7 @@ func Workflows() *schema.Table { Name: "aws_glue_workflows", Resolver: fetchGlueWorkflows, PreResourceResolver: getWorkflow, + Transform: transformers.TransformWithStruct(&types.Workflow{}), Multiplex: client.ServiceAccountRegionMultiplexer("glue"), Columns: []schema.Column{ { @@ -37,51 +38,6 @@ func Workflows() *schema.Table { Type: schema.TypeJSON, Resolver: resolveGlueWorkflowTags, }, - { - Name: "blueprint_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BlueprintDetails"), - }, - { - Name: "created_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedOn"), - }, - { - Name: "default_run_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultRunProperties"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "graph", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Graph"), - }, - { - Name: "last_modified_on", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedOn"), - }, - { - Name: "last_run", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastRun"), - }, - { - Name: "max_concurrent_runs", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxConcurrentRuns"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/guardduty/detector_members.go b/plugins/source/aws/resources/services/guardduty/detector_members.go index 3daf534b562e1c..788df2252e2865 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_members.go +++ b/plugins/source/aws/resources/services/guardduty/detector_members.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package guardduty import ( + "github.com/aws/aws-sdk-go-v2/service/guardduty/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DetectorMembers() *schema.Table { @@ -12,6 +12,7 @@ func DetectorMembers() *schema.Table { Name: "aws_guardduty_detector_members", Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Member.html`, Resolver: fetchGuarddutyDetectorMembers, + Transform: transformers.TransformWithStruct(&types.Member{}), Multiplex: client.ServiceAccountRegionMultiplexer("guardduty"), Columns: []schema.Column{ { @@ -24,46 +25,6 @@ func DetectorMembers() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccountId"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "master_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterId"), - }, - { - Name: "relationship_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("RelationshipStatus"), - }, - { - Name: "updated_at", - Type: schema.TypeString, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "administrator_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdministratorId"), - }, - { - Name: "detector_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetectorId"), - }, - { - Name: "invited_at", - Type: schema.TypeString, - Resolver: schema.PathResolver("InvitedAt"), - }, }, } } diff --git a/plugins/source/aws/resources/services/guardduty/detectors.go b/plugins/source/aws/resources/services/guardduty/detectors.go index c5e8b9ce98b1c8..5032df20b0795e 100644 --- a/plugins/source/aws/resources/services/guardduty/detectors.go +++ b/plugins/source/aws/resources/services/guardduty/detectors.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package guardduty import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/guardduty/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Detectors() *schema.Table { @@ -13,6 +13,7 @@ func Detectors() *schema.Table { Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetDetector.html`, Resolver: fetchGuarddutyDetectors, PreResourceResolver: getDetector, + Transform: transformers.TransformWithStruct(&models.DetectorWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.ServiceAccountRegionMultiplexer("guardduty"), Columns: []schema.Column{ { @@ -43,46 +44,6 @@ func Detectors() *schema.Table { PrimaryKey: true, }, }, - { - Name: "service_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceRole"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "created_at", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "data_sources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DataSources"), - }, - { - Name: "finding_publishing_frequency", - Type: schema.TypeString, - Resolver: schema.PathResolver("FindingPublishingFrequency"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "updated_at", - Type: schema.TypeString, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/iam/accounts.go b/plugins/source/aws/resources/services/iam/accounts.go index 961fd7c4c53835..563de258bea0b6 100644 --- a/plugins/source/aws/resources/services/iam/accounts.go +++ b/plugins/source/aws/resources/services/iam/accounts.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Accounts() *schema.Table { return &schema.Table{ Name: "aws_iam_accounts", Resolver: fetchIamAccounts, + Transform: transformers.TransformWithStruct(&models.Account{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -21,141 +22,6 @@ func Accounts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "users", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Users"), - }, - { - Name: "users_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UsersQuota"), - }, - { - Name: "groups", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Groups"), - }, - { - Name: "groups_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GroupsQuota"), - }, - { - Name: "server_certificates", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ServerCertificates"), - }, - { - Name: "server_certificates_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ServerCertificatesQuota"), - }, - { - Name: "user_policy_size_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UserPolicySizeQuota"), - }, - { - Name: "group_policy_size_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GroupPolicySizeQuota"), - }, - { - Name: "groups_per_user_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GroupsPerUserQuota"), - }, - { - Name: "signing_certificates_per_user_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SigningCertificatesPerUserQuota"), - }, - { - Name: "access_keys_per_user_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AccessKeysPerUserQuota"), - }, - { - Name: "mfa_devices", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MFADevices"), - }, - { - Name: "mfa_devices_in_use", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MFADevicesInUse"), - }, - { - Name: "account_mfa_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AccountMFAEnabled"), - }, - { - Name: "account_access_keys_present", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AccountAccessKeysPresent"), - }, - { - Name: "account_signing_certificates_present", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AccountSigningCertificatesPresent"), - }, - { - Name: "attached_policies_per_group_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AttachedPoliciesPerGroupQuota"), - }, - { - Name: "attached_policies_per_role_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AttachedPoliciesPerRoleQuota"), - }, - { - Name: "attached_policies_per_user_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AttachedPoliciesPerUserQuota"), - }, - { - Name: "policies", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Policies"), - }, - { - Name: "policies_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PoliciesQuota"), - }, - { - Name: "policy_size_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PolicySizeQuota"), - }, - { - Name: "policy_versions_in_use", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PolicyVersionsInUse"), - }, - { - Name: "policy_versions_in_use_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PolicyVersionsInUseQuota"), - }, - { - Name: "versions_per_policy_quota", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VersionsPerPolicyQuota"), - }, - { - Name: "global_endpoint_token_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GlobalEndpointTokenVersion"), - }, - { - Name: "aliases", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Aliases"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/credential_reports.go b/plugins/source/aws/resources/services/iam/credential_reports.go index f5bc826d5f58e8..07e68384db7ff0 100644 --- a/plugins/source/aws/resources/services/iam/credential_reports.go +++ b/plugins/source/aws/resources/services/iam/credential_reports.go @@ -1,16 +1,27 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CredentialReports() *schema.Table { return &schema.Table{ - Name: "aws_iam_credential_reports", - Resolver: fetchIamCredentialReports, + Name: "aws_iam_credential_reports", + Resolver: fetchIamCredentialReports, + Transform: transformers.TransformWithStruct( + &models.CredentialReportEntry{}, + transformers.WithSkipFields( + "AccessKey1LastRotated", + "AccessKey1LastUsedDate", + "Cert1LastRotated", + "AccessKey2LastRotated", + "AccessKey2LastUsedDate", + "Cert2LastRotated", + ), + ), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -79,61 +90,6 @@ func CredentialReports() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("PasswordStatus"), }, - { - Name: "user", - Type: schema.TypeString, - Resolver: schema.PathResolver("User"), - }, - { - Name: "password_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("PasswordStatus"), - }, - { - Name: "mfa_active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MfaActive"), - }, - { - Name: "access_key1_active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AccessKey1Active"), - }, - { - Name: "access_key2_active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AccessKey2Active"), - }, - { - Name: "cert1_active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Cert1Active"), - }, - { - Name: "cert2_active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Cert2Active"), - }, - { - Name: "access_key1_last_used_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKey1LastUsedRegion"), - }, - { - Name: "access_key1_last_used_service", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKey1LastUsedService"), - }, - { - Name: "access_key2_last_used_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKey2LastUsedRegion"), - }, - { - Name: "access_key2_last_used_service", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKey2LastUsedService"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/group_policies.go b/plugins/source/aws/resources/services/iam/group_policies.go index 3299e7345c8d94..29739d9f9b7b66 100644 --- a/plugins/source/aws/resources/services/iam/group_policies.go +++ b/plugins/source/aws/resources/services/iam/group_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GroupPolicies() *schema.Table { @@ -12,6 +12,7 @@ func GroupPolicies() *schema.Table { Name: "aws_iam_group_policies", Resolver: fetchIamGroupPolicies, PreResourceResolver: getGroupPolicy, + Transform: transformers.TransformWithStruct(&iam.GetGroupPolicyOutput{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -34,21 +35,6 @@ func GroupPolicies() *schema.Table { Type: schema.TypeJSON, Resolver: resolveIamGroupPolicyPolicyDocument, }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/groups.go b/plugins/source/aws/resources/services/iam/groups.go index 5e8e321fe6fa2b..a60d6464e399d9 100644 --- a/plugins/source/aws/resources/services/iam/groups.go +++ b/plugins/source/aws/resources/services/iam/groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Groups() *schema.Table { @@ -12,6 +12,7 @@ func Groups() *schema.Table { Name: "aws_iam_groups", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html`, Resolver: fetchIamGroups, + Transform: transformers.TransformWithStruct(&types.Group{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -35,26 +36,6 @@ func Groups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/iam/models/iam.go b/plugins/source/aws/resources/services/iam/models/iam.go index 4c040ba00596cd..40bfd0cd706e17 100644 --- a/plugins/source/aws/resources/services/iam/models/iam.go +++ b/plugins/source/aws/resources/services/iam/models/iam.go @@ -92,7 +92,8 @@ type IamOpenIdIdentityProviderWrapper struct { type IAMSAMLIdentityProviderWrapper struct { *iam.GetSAMLProviderOutput - Arn string + Arn string + Tags map[string]string } type PasswordPolicyWrapper struct { diff --git a/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go b/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go index 163af629a89d8a..258944bd79970f 100644 --- a/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go +++ b/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func OpenidConnectIdentityProviders() *schema.Table { @@ -12,6 +12,7 @@ func OpenidConnectIdentityProviders() *schema.Table { Name: "aws_iam_openid_connect_identity_providers", Resolver: fetchIamOpenidConnectIdentityProviders, PreResourceResolver: getOpenIdConnectIdentityProvider, + Transform: transformers.TransformWithStruct(&models.IamOpenIdIdentityProviderWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -26,36 +27,11 @@ func OpenidConnectIdentityProviders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "client_id_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ClientIDList"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "thumbprint_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ThumbprintList"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/password_policies.go b/plugins/source/aws/resources/services/iam/password_policies.go index ec81e7fd657740..53f18163772b57 100644 --- a/plugins/source/aws/resources/services/iam/password_policies.go +++ b/plugins/source/aws/resources/services/iam/password_policies.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PasswordPolicies() *schema.Table { return &schema.Table{ Name: "aws_iam_password_policies", Resolver: fetchIamPasswordPolicies, + Transform: transformers.TransformWithStruct(&models.PasswordPolicyWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -21,61 +22,6 @@ func PasswordPolicies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allow_users_to_change_password", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowUsersToChangePassword"), - }, - { - Name: "expire_passwords", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ExpirePasswords"), - }, - { - Name: "hard_expiry", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HardExpiry"), - }, - { - Name: "max_password_age", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxPasswordAge"), - }, - { - Name: "minimum_password_length", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinimumPasswordLength"), - }, - { - Name: "password_reuse_prevention", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PasswordReusePrevention"), - }, - { - Name: "require_lowercase_characters", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequireLowercaseCharacters"), - }, - { - Name: "require_numbers", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequireNumbers"), - }, - { - Name: "require_symbols", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequireSymbols"), - }, - { - Name: "require_uppercase_characters", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequireUppercaseCharacters"), - }, - { - Name: "policy_exists", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PolicyExists"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/policies.go b/plugins/source/aws/resources/services/iam/policies.go index 5b8fc5183f42bf..f9ec16846dd9f5 100644 --- a/plugins/source/aws/resources/services/iam/policies.go +++ b/plugins/source/aws/resources/services/iam/policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Policies() *schema.Table { @@ -12,6 +12,7 @@ func Policies() *schema.Table { Name: "aws_iam_policies", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ManagedPolicyDetail.html`, Resolver: fetchIamPolicies, + Transform: transformers.TransformWithStruct(&types.ManagedPolicyDetail{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -40,56 +41,6 @@ func Policies() *schema.Table { Type: schema.TypeJSON, Resolver: resolveIamPolicyVersionList, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "attachment_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AttachmentCount"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "default_version_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultVersionId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_attachable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsAttachable"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "permissions_boundary_usage_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PermissionsBoundaryUsageCount"), - }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "update_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdateDate"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/role_policies.go b/plugins/source/aws/resources/services/iam/role_policies.go index 2f525e38790f7e..ca922cfc668a87 100644 --- a/plugins/source/aws/resources/services/iam/role_policies.go +++ b/plugins/source/aws/resources/services/iam/role_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RolePolicies() *schema.Table { @@ -12,6 +12,7 @@ func RolePolicies() *schema.Table { Name: "aws_iam_role_policies", Resolver: fetchIamRolePolicies, PreResourceResolver: getRolePolicy, + Transform: transformers.TransformWithStruct(&iam.GetRolePolicyOutput{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -29,21 +30,6 @@ func RolePolicies() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRolePoliciesPolicyDocument, }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "role_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleName"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/roles.go b/plugins/source/aws/resources/services/iam/roles.go index 822889189ca754..2e6b4fa9b43646 100644 --- a/plugins/source/aws/resources/services/iam/roles.go +++ b/plugins/source/aws/resources/services/iam/roles.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Roles() *schema.Table { @@ -13,6 +13,7 @@ func Roles() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_Role.html`, Resolver: fetchIamRoles, PreResourceResolver: getRole, + Transform: transformers.TransformWithStruct(&types.Role{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -41,46 +42,6 @@ func Roles() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRolesAssumeRolePolicyDocument, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "role_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "max_session_duration", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxSessionDuration"), - }, - { - Name: "permissions_boundary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PermissionsBoundary"), - }, - { - Name: "role_last_used", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RoleLastUsed"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/iam/saml_identity_providers.go b/plugins/source/aws/resources/services/iam/saml_identity_providers.go index 0dc8c6e9939e66..e3e37f8e8559ac 100644 --- a/plugins/source/aws/resources/services/iam/saml_identity_providers.go +++ b/plugins/source/aws/resources/services/iam/saml_identity_providers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SamlIdentityProviders() *schema.Table { @@ -13,7 +13,12 @@ func SamlIdentityProviders() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_SAMLProviderListEntry.html`, Resolver: fetchIamSamlIdentityProviders, PreResourceResolver: getSamlIdentityProvider, - Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct( + &models.IAMSAMLIdentityProviderWrapper{}, + transformers.WithUnwrapAllEmbeddedStructs(), + transformers.WithSkipFields("ResultMetadata"), + ), + Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { Name: "account_id", @@ -27,16 +32,6 @@ func SamlIdentityProviders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "valid_until", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidUntil"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/saml_identity_providers_fetch.go b/plugins/source/aws/resources/services/iam/saml_identity_providers_fetch.go index 58c2fce3617b94..0a1cd846a863ed 100644 --- a/plugins/source/aws/resources/services/iam/saml_identity_providers_fetch.go +++ b/plugins/source/aws/resources/services/iam/saml_identity_providers_fetch.go @@ -30,6 +30,10 @@ func getSamlIdentityProvider(ctx context.Context, meta schema.ClientMeta, resour return err } - resource.Item = models.IAMSAMLIdentityProviderWrapper{GetSAMLProviderOutput: providerResponse, Arn: *p.Arn} + resource.Item = models.IAMSAMLIdentityProviderWrapper{ + GetSAMLProviderOutput: providerResponse, + Arn: *p.Arn, + Tags: client.TagsToMap(providerResponse.Tags), + } return nil } diff --git a/plugins/source/aws/resources/services/iam/server_certificates.go b/plugins/source/aws/resources/services/iam/server_certificates.go index 2c848421c50c4f..c778026956ab4d 100644 --- a/plugins/source/aws/resources/services/iam/server_certificates.go +++ b/plugins/source/aws/resources/services/iam/server_certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ServerCertificates() *schema.Table { @@ -12,6 +12,7 @@ func ServerCertificates() *schema.Table { Name: "aws_iam_server_certificates", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServerCertificateMetadata.html`, Resolver: fetchIamServerCertificates, + Transform: transformers.TransformWithStruct(&types.ServerCertificateMetadata{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -30,31 +31,6 @@ func ServerCertificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "server_certificate_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServerCertificateName"), - }, - { - Name: "expiration", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Expiration"), - }, - { - Name: "upload_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UploadDate"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/ssh_public_keys.go b/plugins/source/aws/resources/services/iam/ssh_public_keys.go index 120888909f24b2..9dff96740f472e 100644 --- a/plugins/source/aws/resources/services/iam/ssh_public_keys.go +++ b/plugins/source/aws/resources/services/iam/ssh_public_keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SshPublicKeys() *schema.Table { @@ -12,6 +12,7 @@ func SshPublicKeys() *schema.Table { Name: "aws_iam_ssh_public_keys", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_SSHPublicKeyMetadata.html`, Resolver: fetchIamSshPublicKeys, + Transform: transformers.TransformWithStruct(&types.SSHPublicKeyMetadata{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func SshPublicKeys() *schema.Table { PrimaryKey: true, }, }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "upload_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UploadDate"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/user_access_keys.go b/plugins/source/aws/resources/services/iam/user_access_keys.go index 2472e2d78c0bea..6b9849450d8e08 100644 --- a/plugins/source/aws/resources/services/iam/user_access_keys.go +++ b/plugins/source/aws/resources/services/iam/user_access_keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/iam/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserAccessKeys() *schema.Table { @@ -12,6 +12,7 @@ func UserAccessKeys() *schema.Table { Name: "aws_iam_user_access_keys", Resolver: fetchIamUserAccessKeys, PostResourceResolver: postIamUserAccessKeyResolver, + Transform: transformers.TransformWithStruct(&models.AccessKeyWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -37,31 +38,6 @@ func UserAccessKeys() *schema.Table { Name: "last_used_service_name", Type: schema.TypeString, }, - { - Name: "access_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKeyId"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, - { - Name: "last_rotated", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastRotated"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/user_attached_policies.go b/plugins/source/aws/resources/services/iam/user_attached_policies.go index 825dc011d070f5..34c98a18fd728c 100644 --- a/plugins/source/aws/resources/services/iam/user_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/user_attached_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserAttachedPolicies() *schema.Table { @@ -12,6 +12,7 @@ func UserAttachedPolicies() *schema.Table { Name: "aws_iam_user_attached_policies", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html`, Resolver: fetchIamUserAttachedPolicies, + Transform: transformers.TransformWithStruct(&types.AttachedPolicy{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -29,16 +30,6 @@ func UserAttachedPolicies() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "policy_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyArn"), - }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/user_groups.go b/plugins/source/aws/resources/services/iam/user_groups.go index 4eefb9722dd9ef..cafa67c3b981c5 100644 --- a/plugins/source/aws/resources/services/iam/user_groups.go +++ b/plugins/source/aws/resources/services/iam/user_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserGroups() *schema.Table { @@ -12,6 +12,7 @@ func UserGroups() *schema.Table { Name: "aws_iam_user_groups", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html`, Resolver: fetchIamUserGroups, + Transform: transformers.TransformWithStruct(&types.Group{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -29,31 +30,6 @@ func UserGroups() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("id"), }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupId"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/user_policies.go b/plugins/source/aws/resources/services/iam/user_policies.go index 3fcedd09aac188..5c7b44edc278e2 100644 --- a/plugins/source/aws/resources/services/iam/user_policies.go +++ b/plugins/source/aws/resources/services/iam/user_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func UserPolicies() *schema.Table { @@ -12,6 +12,7 @@ func UserPolicies() *schema.Table { Name: "aws_iam_user_policies", Resolver: fetchIamUserPolicies, PreResourceResolver: getUserPolicy, + Transform: transformers.TransformWithStruct(&iam.GetUserPolicyOutput{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -34,21 +35,6 @@ func UserPolicies() *schema.Table { Type: schema.TypeJSON, Resolver: resolveIamUserPolicyPolicyDocument, }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iam/users.go b/plugins/source/aws/resources/services/iam/users.go index e57355ca1e598a..b4e721fa9476f4 100644 --- a/plugins/source/aws/resources/services/iam/users.go +++ b/plugins/source/aws/resources/services/iam/users.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Users() *schema.Table { @@ -13,6 +13,7 @@ func Users() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_User.html`, Resolver: fetchIamUsers, PreResourceResolver: getUser, + Transform: transformers.TransformWithStruct(&types.User{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -36,31 +37,6 @@ func Users() *schema.Table { PrimaryKey: true, }, }, - { - Name: "create_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateDate"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, - { - Name: "password_last_used", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("PasswordLastUsed"), - }, - { - Name: "permissions_boundary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PermissionsBoundary"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go b/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go index 83c3c770d673aa..23ebf7ed59fd96 100644 --- a/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go +++ b/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iam import ( + "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func VirtualMfaDevices() *schema.Table { @@ -12,6 +12,7 @@ func VirtualMfaDevices() *schema.Table { Name: "aws_iam_virtual_mfa_devices", Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_VirtualMFADevice.html`, Resolver: fetchIamVirtualMfaDevices, + Transform: transformers.TransformWithStruct(&types.VirtualMFADevice{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -26,31 +27,11 @@ func VirtualMfaDevices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "base32_string_seed", - Type: schema.TypeIntArray, - Resolver: schema.PathResolver("Base32StringSeed"), - }, - { - Name: "enable_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EnableDate"), - }, - { - Name: "qr_code_png", - Type: schema.TypeIntArray, - Resolver: schema.PathResolver("QRCodePNG"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } diff --git a/plugins/source/aws/resources/services/identitystore/group_memberships.go b/plugins/source/aws/resources/services/identitystore/group_memberships.go index 026ae30f1c5f92..fef248ace25995 100644 --- a/plugins/source/aws/resources/services/identitystore/group_memberships.go +++ b/plugins/source/aws/resources/services/identitystore/group_memberships.go @@ -1,33 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package identitystore import ( + "github.com/aws/aws-sdk-go-v2/service/identitystore/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GroupMemberships() *schema.Table { return &schema.Table{ Name: "aws_identitystore_group_memberships", Resolver: fetchIdentitystoreGroupMemberships, + Transform: transformers.TransformWithStruct(&types.GroupMembership{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), - Columns: []schema.Column{ - { - Name: "identity_store_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityStoreId"), - }, - { - Name: "group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupId"), - }, - { - Name: "membership_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("MembershipId"), - }, - }, } } diff --git a/plugins/source/aws/resources/services/identitystore/groups.go b/plugins/source/aws/resources/services/identitystore/groups.go index d8fb8d3085c5b6..1adac8d8317a51 100644 --- a/plugins/source/aws/resources/services/identitystore/groups.go +++ b/plugins/source/aws/resources/services/identitystore/groups.go @@ -1,44 +1,18 @@ -// Code generated by codegen; DO NOT EDIT. - package identitystore import ( + "github.com/aws/aws-sdk-go-v2/service/identitystore/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Groups() *schema.Table { return &schema.Table{ Name: "aws_identitystore_groups", Resolver: fetchIdentitystoreGroups, + Transform: transformers.TransformWithStruct(&types.Group{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), - Columns: []schema.Column{ - { - Name: "group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupId"), - }, - { - Name: "identity_store_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityStoreId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "external_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExternalIds"), - }, - }, Relations: []*schema.Table{ GroupMemberships(), diff --git a/plugins/source/aws/resources/services/identitystore/instance_fetch.go b/plugins/source/aws/resources/services/identitystore/instance_fetch.go index c698806218dd4a..575314a0e7c30a 100644 --- a/plugins/source/aws/resources/services/identitystore/instance_fetch.go +++ b/plugins/source/aws/resources/services/identitystore/instance_fetch.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/service/ssoadmin" - types "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" + "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" ) diff --git a/plugins/source/aws/resources/services/identitystore/users.go b/plugins/source/aws/resources/services/identitystore/users.go index 584dee092451de..48713880ec78fc 100644 --- a/plugins/source/aws/resources/services/identitystore/users.go +++ b/plugins/source/aws/resources/services/identitystore/users.go @@ -1,98 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package identitystore import ( + "github.com/aws/aws-sdk-go-v2/service/identitystore/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Users() *schema.Table { return &schema.Table{ Name: "aws_identitystore_users", Resolver: fetchIdentitystoreUsers, + Transform: transformers.TransformWithStruct(&types.User{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), - Columns: []schema.Column{ - { - Name: "identity_store_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityStoreId"), - }, - { - Name: "user_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserId"), - }, - { - Name: "addresses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Addresses"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "emails", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Emails"), - }, - { - Name: "external_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExternalIds"), - }, - { - Name: "locale", - Type: schema.TypeString, - Resolver: schema.PathResolver("Locale"), - }, - { - Name: "name", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "nick_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("NickName"), - }, - { - Name: "phone_numbers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PhoneNumbers"), - }, - { - Name: "preferred_language", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredLanguage"), - }, - { - Name: "profile_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProfileUrl"), - }, - { - Name: "timezone", - Type: schema.TypeString, - Resolver: schema.PathResolver("Timezone"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, - { - Name: "user_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserType"), - }, - }, } } diff --git a/plugins/source/aws/resources/services/inspector/findings.go b/plugins/source/aws/resources/services/inspector/findings.go index f9eff911dec51b..334ff58aee3539 100644 --- a/plugins/source/aws/resources/services/inspector/findings.go +++ b/plugins/source/aws/resources/services/inspector/findings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package inspector import ( + "github.com/aws/aws-sdk-go-v2/service/inspector/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Findings() *schema.Table { @@ -12,6 +12,7 @@ func Findings() *schema.Table { Name: "aws_inspector_findings", Description: `https://docs.aws.amazon.com/inspector/v1/APIReference/API_Finding.html`, Resolver: fetchInspectorFindings, + Transform: transformers.TransformWithStruct(&types.Finding{}), Multiplex: client.ServiceAccountRegionMultiplexer("inspector"), Columns: []schema.Column{ { @@ -41,81 +42,6 @@ func Findings() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTagField("UserAttributes"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "asset_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssetAttributes"), - }, - { - Name: "asset_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssetType"), - }, - { - Name: "confidence", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Confidence"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "indicator_of_compromise", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IndicatorOfCompromise"), - }, - { - Name: "numeric_severity", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("NumericSeverity"), - }, - { - Name: "recommendation", - Type: schema.TypeString, - Resolver: schema.PathResolver("Recommendation"), - }, - { - Name: "schema_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SchemaVersion"), - }, - { - Name: "service", - Type: schema.TypeString, - Resolver: schema.PathResolver("Service"), - }, - { - Name: "service_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServiceAttributes"), - }, - { - Name: "severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Severity"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, }, } } diff --git a/plugins/source/aws/resources/services/inspector2/findings.go b/plugins/source/aws/resources/services/inspector2/findings.go index d521b98272dbf0..b9ada5502e1790 100644 --- a/plugins/source/aws/resources/services/inspector2/findings.go +++ b/plugins/source/aws/resources/services/inspector2/findings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package inspector2 import ( + "github.com/aws/aws-sdk-go-v2/service/inspector2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Findings() *schema.Table { @@ -12,6 +12,7 @@ func Findings() *schema.Table { Name: "aws_inspector2_findings", Description: `https://docs.aws.amazon.com/inspector/v2/APIReference/API_Finding.html`, Resolver: fetchInspector2Findings, + Transform: transformers.TransformWithStruct(&types.Finding{}), Multiplex: client.ServiceAccountRegionMultiplexer("inspector2"), Columns: []schema.Column{ { @@ -32,96 +33,6 @@ func Findings() *schema.Table { PrimaryKey: true, }, }, - { - Name: "aws_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsAccountId"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "first_observed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("FirstObservedAt"), - }, - { - Name: "last_observed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastObservedAt"), - }, - { - Name: "remediation", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Remediation"), - }, - { - Name: "resources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Resources"), - }, - { - Name: "severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Severity"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "exploit_available", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExploitAvailable"), - }, - { - Name: "exploitability_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExploitabilityDetails"), - }, - { - Name: "fix_available", - Type: schema.TypeString, - Resolver: schema.PathResolver("FixAvailable"), - }, - { - Name: "inspector_score", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("InspectorScore"), - }, - { - Name: "inspector_score_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InspectorScoreDetails"), - }, - { - Name: "network_reachability_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkReachabilityDetails"), - }, - { - Name: "package_vulnerability_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PackageVulnerabilityDetails"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/billing_groups.go b/plugins/source/aws/resources/services/iot/billing_groups.go index d79157e90eae58..86c946bd601f2e 100644 --- a/plugins/source/aws/resources/services/iot/billing_groups.go +++ b/plugins/source/aws/resources/services/iot/billing_groups.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BillingGroups() *schema.Table { return &schema.Table{ Name: "aws_iot_billing_groups", Resolver: fetchIotBillingGroups, + Transform: transformers.TransformWithStruct(&iot.DescribeBillingGroupOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -41,36 +42,6 @@ func BillingGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "billing_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BillingGroupId"), - }, - { - Name: "billing_group_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BillingGroupMetadata"), - }, - { - Name: "billing_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BillingGroupName"), - }, - { - Name: "billing_group_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BillingGroupProperties"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/ca_certificates.go b/plugins/source/aws/resources/services/iot/ca_certificates.go index daa0b76cf49c4f..f2352a36b4cb6d 100644 --- a/plugins/source/aws/resources/services/iot/ca_certificates.go +++ b/plugins/source/aws/resources/services/iot/ca_certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CaCertificates() *schema.Table { @@ -12,6 +12,7 @@ func CaCertificates() *schema.Table { Name: "aws_iot_ca_certificates", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_CACertificateDescription.html`, Resolver: fetchIotCaCertificates, + Transform: transformers.TransformWithStruct(&types.CACertificateDescription{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -37,61 +38,6 @@ func CaCertificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "auto_registration_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoRegistrationStatus"), - }, - { - Name: "certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateId"), - }, - { - Name: "certificate_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateMode"), - }, - { - Name: "certificate_pem", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificatePem"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "customer_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CustomerVersion"), - }, - { - Name: "generation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GenerationId"), - }, - { - Name: "last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedDate"), - }, - { - Name: "owned_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnedBy"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "validity", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Validity"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/certificates.go b/plugins/source/aws/resources/services/iot/certificates.go index d59161303e1a1e..745f58983de7be 100644 --- a/plugins/source/aws/resources/services/iot/certificates.go +++ b/plugins/source/aws/resources/services/iot/certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Certificates() *schema.Table { @@ -12,6 +12,7 @@ func Certificates() *schema.Table { Name: "aws_iot_certificates", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_CertificateDescription.html`, Resolver: fetchIotCertificates, + Transform: transformers.TransformWithStruct(&types.CertificateDescription{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -37,71 +38,6 @@ func Certificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ca_certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CaCertificateId"), - }, - { - Name: "certificate_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateId"), - }, - { - Name: "certificate_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateMode"), - }, - { - Name: "certificate_pem", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificatePem"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "customer_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CustomerVersion"), - }, - { - Name: "generation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GenerationId"), - }, - { - Name: "last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedDate"), - }, - { - Name: "owned_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnedBy"), - }, - { - Name: "previous_owned_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreviousOwnedBy"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "transfer_data", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TransferData"), - }, - { - Name: "validity", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Validity"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/jobs.go b/plugins/source/aws/resources/services/iot/jobs.go index e02c0b459a772b..e98007f3b32109 100644 --- a/plugins/source/aws/resources/services/iot/jobs.go +++ b/plugins/source/aws/resources/services/iot/jobs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Jobs() *schema.Table { @@ -12,6 +12,7 @@ func Jobs() *schema.Table { Name: "aws_iot_jobs", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_Job.html`, Resolver: fetchIotJobs, + Transform: transformers.TransformWithStruct(&types.Job{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -37,116 +38,6 @@ func Jobs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "abort_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AbortConfig"), - }, - { - Name: "comment", - Type: schema.TypeString, - Resolver: schema.PathResolver("Comment"), - }, - { - Name: "completed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletedAt"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "document_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DocumentParameters"), - }, - { - Name: "force_canceled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ForceCanceled"), - }, - { - Name: "is_concurrent", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsConcurrent"), - }, - { - Name: "job_executions_retry_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("JobExecutionsRetryConfig"), - }, - { - Name: "job_executions_rollout_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("JobExecutionsRolloutConfig"), - }, - { - Name: "job_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobId"), - }, - { - Name: "job_process_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("JobProcessDetails"), - }, - { - Name: "job_template_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("JobTemplateArn"), - }, - { - Name: "last_updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedAt"), - }, - { - Name: "namespace_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NamespaceId"), - }, - { - Name: "presigned_url_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PresignedUrlConfig"), - }, - { - Name: "reason_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReasonCode"), - }, - { - Name: "scheduling_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SchedulingConfig"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "target_selection", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetSelection"), - }, - { - Name: "targets", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Targets"), - }, - { - Name: "timeout_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TimeoutConfig"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/policies.go b/plugins/source/aws/resources/services/iot/policies.go index 51e0335b8fee97..453259a44c3f35 100644 --- a/plugins/source/aws/resources/services/iot/policies.go +++ b/plugins/source/aws/resources/services/iot/policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Policies() *schema.Table { @@ -12,6 +12,7 @@ func Policies() *schema.Table { Name: "aws_iot_policies", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_Policy.html`, Resolver: fetchIotPolicies, + Transform: transformers.TransformWithStruct(&types.Policy{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -37,11 +38,6 @@ func Policies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PolicyName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/streams.go b/plugins/source/aws/resources/services/iot/streams.go index 3697d558398e65..5abf6dd7e0aca0 100644 --- a/plugins/source/aws/resources/services/iot/streams.go +++ b/plugins/source/aws/resources/services/iot/streams.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Streams() *schema.Table { @@ -12,6 +12,7 @@ func Streams() *schema.Table { Name: "aws_iot_streams", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_StreamInfo.html`, Resolver: fetchIotStreams, + Transform: transformers.TransformWithStruct(&types.StreamInfo{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -32,41 +33,6 @@ func Streams() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "files", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Files"), - }, - { - Name: "last_updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedAt"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "stream_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamId"), - }, - { - Name: "stream_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StreamVersion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/thing_groups.go b/plugins/source/aws/resources/services/iot/thing_groups.go index 6a6abb624150d7..7b2a1f4d519300 100644 --- a/plugins/source/aws/resources/services/iot/thing_groups.go +++ b/plugins/source/aws/resources/services/iot/thing_groups.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ThingGroups() *schema.Table { return &schema.Table{ Name: "aws_iot_thing_groups", Resolver: fetchIotThingGroups, + Transform: transformers.TransformWithStruct(&iot.DescribeThingGroupOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -47,56 +48,6 @@ func ThingGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "index_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("IndexName"), - }, - { - Name: "query_string", - Type: schema.TypeString, - Resolver: schema.PathResolver("QueryString"), - }, - { - Name: "query_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("QueryVersion"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "thing_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThingGroupId"), - }, - { - Name: "thing_group_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ThingGroupMetadata"), - }, - { - Name: "thing_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThingGroupName"), - }, - { - Name: "thing_group_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ThingGroupProperties"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/thing_types.go b/plugins/source/aws/resources/services/iot/thing_types.go index 71143563d91798..9c1390a5f8a1c0 100644 --- a/plugins/source/aws/resources/services/iot/thing_types.go +++ b/plugins/source/aws/resources/services/iot/thing_types.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ThingTypes() *schema.Table { @@ -12,6 +12,7 @@ func ThingTypes() *schema.Table { Name: "aws_iot_thing_types", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_ThingTypeDefinition.html`, Resolver: fetchIotThingTypes, + Transform: transformers.TransformWithStruct(&types.ThingTypeDefinition{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func ThingTypes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "thing_type_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ThingTypeMetadata"), - }, - { - Name: "thing_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThingTypeName"), - }, - { - Name: "thing_type_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ThingTypeProperties"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/things.go b/plugins/source/aws/resources/services/iot/things.go index b188d7154d18b5..f94e1e9cf14da6 100644 --- a/plugins/source/aws/resources/services/iot/things.go +++ b/plugins/source/aws/resources/services/iot/things.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Things() *schema.Table { @@ -12,6 +12,7 @@ func Things() *schema.Table { Name: "aws_iot_things", Description: `https://docs.aws.amazon.com/iot/latest/apireference/API_ThingAttribute.html`, Resolver: fetchIotThings, + Transform: transformers.TransformWithStruct(&types.ThingAttribute{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -38,26 +39,6 @@ func Things() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attributes"), - }, - { - Name: "thing_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThingName"), - }, - { - Name: "thing_type_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThingTypeName"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/iot/topic_rules.go b/plugins/source/aws/resources/services/iot/topic_rules.go index a3b1d40f43e063..f9034ca7e4ba98 100644 --- a/plugins/source/aws/resources/services/iot/topic_rules.go +++ b/plugins/source/aws/resources/services/iot/topic_rules.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package iot import ( + "github.com/aws/aws-sdk-go-v2/service/iot" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TopicRules() *schema.Table { return &schema.Table{ Name: "aws_iot_topic_rules", Resolver: fetchIotTopicRules, + Transform: transformers.TransformWithStruct(&iot.GetTopicRuleOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("iot"), Columns: []schema.Column{ { @@ -36,16 +37,6 @@ func TopicRules() *schema.Table { PrimaryKey: true, }, }, - { - Name: "rule", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rule"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kafka/cluster_operations.go b/plugins/source/aws/resources/services/kafka/cluster_operations.go index 287fb982a67598..97f8862ac357d1 100644 --- a/plugins/source/aws/resources/services/kafka/cluster_operations.go +++ b/plugins/source/aws/resources/services/kafka/cluster_operations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kafka import ( + "github.com/aws/aws-sdk-go-v2/service/kafka/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterOperations() *schema.Table { @@ -12,6 +12,7 @@ func ClusterOperations() *schema.Table { Name: "aws_kafka_cluster_operations", Description: `https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-operations.html`, Resolver: fetchKafkaClusterOperations, + Transform: transformers.TransformWithStruct(&types.ClusterOperationInfo{}), Multiplex: client.ServiceAccountRegionMultiplexer("kafka"), Columns: []schema.Column{ { @@ -37,51 +38,6 @@ func ClusterOperations() *schema.Table { Type: schema.TypeJSON, Resolver: resolveKafkaTags("OperationArn"), }, - { - Name: "client_request_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClientRequestId"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndTime"), - }, - { - Name: "error_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ErrorInfo"), - }, - { - Name: "operation_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("OperationState"), - }, - { - Name: "operation_steps", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OperationSteps"), - }, - { - Name: "operation_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("OperationType"), - }, - { - Name: "source_cluster_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceClusterInfo"), - }, - { - Name: "target_cluster_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetClusterInfo"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kafka/clusters.go b/plugins/source/aws/resources/services/kafka/clusters.go index 0ce48437df264a..4d2378e773469c 100644 --- a/plugins/source/aws/resources/services/kafka/clusters.go +++ b/plugins/source/aws/resources/services/kafka/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kafka import ( + "github.com/aws/aws-sdk-go-v2/service/kafka/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -13,6 +13,7 @@ func Clusters() *schema.Table { Description: `https://docs.aws.amazon.com/MSK/2.0/APIReference/v2-clusters-clusterarn.html#v2-clusters-clusterarn-properties`, Resolver: fetchKafkaClusters, PreResourceResolver: getCluster, + Transform: transformers.TransformWithStruct(&types.Cluster{}), Multiplex: client.ServiceAccountRegionMultiplexer("kafka"), Columns: []schema.Column{ { @@ -28,56 +29,6 @@ func Clusters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "active_operation_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActiveOperationArn"), - }, - { - Name: "cluster_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterName"), - }, - { - Name: "cluster_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterType"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "current_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrentVersion"), - }, - { - Name: "provisioned", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Provisioned"), - }, - { - Name: "serverless", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Serverless"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateInfo"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/kafka/configurations.go b/plugins/source/aws/resources/services/kafka/configurations.go index 0b2c2f55ab3c6f..3fefc7a6cf8c0d 100644 --- a/plugins/source/aws/resources/services/kafka/configurations.go +++ b/plugins/source/aws/resources/services/kafka/configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kafka import ( + "github.com/aws/aws-sdk-go-v2/service/kafka/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Configurations() *schema.Table { @@ -12,6 +12,7 @@ func Configurations() *schema.Table { Name: "aws_kafka_configurations", Description: `https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-configuration.html`, Resolver: fetchKafkaConfigurations, + Transform: transformers.TransformWithStruct(&types.Configuration{}), Multiplex: client.ServiceAccountRegionMultiplexer("kafka"), Columns: []schema.Column{ { @@ -27,36 +28,6 @@ func Configurations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "kafka_versions", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("KafkaVersions"), - }, - { - Name: "latest_revision", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LatestRevision"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kafka/nodes.go b/plugins/source/aws/resources/services/kafka/nodes.go index e9795b0cb52370..e9c50229ce974c 100644 --- a/plugins/source/aws/resources/services/kafka/nodes.go +++ b/plugins/source/aws/resources/services/kafka/nodes.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kafka import ( + "github.com/aws/aws-sdk-go-v2/service/kafka/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Nodes() *schema.Table { @@ -12,6 +12,7 @@ func Nodes() *schema.Table { Name: "aws_kafka_nodes", Description: `https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-nodes.html#ListNodes`, Resolver: fetchKafkaNodes, + Transform: transformers.TransformWithStruct(&types.NodeInfo{}), Multiplex: client.ServiceAccountRegionMultiplexer("kafka"), Columns: []schema.Column{ { @@ -32,31 +33,6 @@ func Nodes() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "added_to_cluster_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("AddedToClusterTime"), - }, - { - Name: "broker_node_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BrokerNodeInfo"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NodeType"), - }, - { - Name: "zookeeper_node_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ZookeeperNodeInfo"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kinesis/streams.go b/plugins/source/aws/resources/services/kinesis/streams.go index a8b007fe86214a..2cac15b8064668 100644 --- a/plugins/source/aws/resources/services/kinesis/streams.go +++ b/plugins/source/aws/resources/services/kinesis/streams.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kinesis import ( + "github.com/aws/aws-sdk-go-v2/service/kinesis/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Streams() *schema.Table { @@ -13,6 +13,7 @@ func Streams() *schema.Table { Description: `https://docs.aws.amazon.com/kinesis/latest/APIReference/API_StreamDescriptionSummary.html`, Resolver: fetchKinesisStreams, PreResourceResolver: getStream, + Transform: transformers.TransformWithStruct(&types.StreamDescriptionSummary{}), Multiplex: client.ServiceAccountRegionMultiplexer("kinesis"), Columns: []schema.Column{ { @@ -38,56 +39,6 @@ func Streams() *schema.Table { Type: schema.TypeJSON, Resolver: resolveKinesisStreamTags, }, - { - Name: "enhanced_monitoring", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnhancedMonitoring"), - }, - { - Name: "open_shard_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("OpenShardCount"), - }, - { - Name: "retention_period_hours", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RetentionPeriodHours"), - }, - { - Name: "stream_creation_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StreamCreationTimestamp"), - }, - { - Name: "stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamName"), - }, - { - Name: "stream_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamStatus"), - }, - { - Name: "consumer_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ConsumerCount"), - }, - { - Name: "encryption_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("EncryptionType"), - }, - { - Name: "key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyId"), - }, - { - Name: "stream_mode_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StreamModeDetails"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kms/aliases.go b/plugins/source/aws/resources/services/kms/aliases.go index c65acf916bdd2a..9e02241f880022 100644 --- a/plugins/source/aws/resources/services/kms/aliases.go +++ b/plugins/source/aws/resources/services/kms/aliases.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kms import ( + "github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Aliases() *schema.Table { @@ -12,6 +12,7 @@ func Aliases() *schema.Table { Name: "aws_kms_aliases", Description: `https://docs.aws.amazon.com/kms/latest/APIReference/API_AliasListEntry.html`, Resolver: fetchKmsAliases, + Transform: transformers.TransformWithStruct(&types.AliasListEntry{}), Multiplex: client.ServiceAccountRegionMultiplexer("kms"), Columns: []schema.Column{ { @@ -32,26 +33,6 @@ func Aliases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "alias_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AliasName"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "last_updated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedDate"), - }, - { - Name: "target_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetKeyId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kms/key_grants.go b/plugins/source/aws/resources/services/kms/key_grants.go index 430c24410837d0..45fe27f47f7b35 100644 --- a/plugins/source/aws/resources/services/kms/key_grants.go +++ b/plugins/source/aws/resources/services/kms/key_grants.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kms import ( + "github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func KeyGrants() *schema.Table { @@ -12,6 +12,7 @@ func KeyGrants() *schema.Table { Name: "aws_kms_key_grants", Description: `https://docs.aws.amazon.com/kms/latest/APIReference/API_GrantListEntry.html`, Resolver: fetchKmsKeyGrants, + Transform: transformers.TransformWithStruct(&types.GrantListEntry{}), Multiplex: client.ServiceAccountRegionMultiplexer("kms"), Columns: []schema.Column{ { @@ -40,46 +41,6 @@ func KeyGrants() *schema.Table { PrimaryKey: true, }, }, - { - Name: "constraints", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Constraints"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "grantee_principal", - Type: schema.TypeString, - Resolver: schema.PathResolver("GranteePrincipal"), - }, - { - Name: "issuing_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("IssuingAccount"), - }, - { - Name: "key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyId"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "operations", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Operations"), - }, - { - Name: "retiring_principal", - Type: schema.TypeString, - Resolver: schema.PathResolver("RetiringPrincipal"), - }, }, } } diff --git a/plugins/source/aws/resources/services/kms/keys.go b/plugins/source/aws/resources/services/kms/keys.go index 41894e16798663..d1f7f15dbe5e5d 100644 --- a/plugins/source/aws/resources/services/kms/keys.go +++ b/plugins/source/aws/resources/services/kms/keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package kms import ( + "github.com/aws/aws-sdk-go-v2/service/kms/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Keys() *schema.Table { @@ -13,6 +13,7 @@ func Keys() *schema.Table { Description: `https://docs.aws.amazon.com/kms/latest/APIReference/API_KeyMetadata.html`, Resolver: fetchKmsKeys, PreResourceResolver: getKey, + Transform: transformers.TransformWithStruct(&types.KeyMetadata{}), Multiplex: client.ServiceAccountRegionMultiplexer("kms"), Columns: []schema.Column{ { @@ -48,121 +49,6 @@ func Keys() *schema.Table { Resolver: resolveKeysReplicaKeys, IgnoreInTests: true, }, - { - Name: "key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyId"), - }, - { - Name: "aws_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AWSAccountId"), - }, - { - Name: "cloud_hsm_cluster_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloudHsmClusterId"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "custom_key_store_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomKeyStoreId"), - }, - { - Name: "customer_master_key_spec", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerMasterKeySpec"), - }, - { - Name: "deletion_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletionDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "encryption_algorithms", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EncryptionAlgorithms"), - }, - { - Name: "expiration_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExpirationModel"), - }, - { - Name: "key_manager", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyManager"), - }, - { - Name: "key_spec", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeySpec"), - }, - { - Name: "key_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyState"), - }, - { - Name: "key_usage", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyUsage"), - }, - { - Name: "mac_algorithms", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("MacAlgorithms"), - }, - { - Name: "multi_region", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiRegion"), - }, - { - Name: "multi_region_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MultiRegionConfiguration"), - }, - { - Name: "origin", - Type: schema.TypeString, - Resolver: schema.PathResolver("Origin"), - }, - { - Name: "pending_deletion_window_in_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PendingDeletionWindowInDays"), - }, - { - Name: "signing_algorithms", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SigningAlgorithms"), - }, - { - Name: "valid_to", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidTo"), - }, - { - Name: "xks_key_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("XksKeyConfiguration"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lambda/function_aliases.go b/plugins/source/aws/resources/services/lambda/function_aliases.go index 8090bbfe6c683f..53e972386d3ee8 100644 --- a/plugins/source/aws/resources/services/lambda/function_aliases.go +++ b/plugins/source/aws/resources/services/lambda/function_aliases.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lambda/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FunctionAliases() *schema.Table { @@ -12,6 +12,7 @@ func FunctionAliases() *schema.Table { Name: "aws_lambda_function_aliases", Resolver: fetchLambdaFunctionAliases, PreResourceResolver: getFunctionAliasURLConfig, + Transform: transformers.TransformWithStruct(&models.AliasWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -37,36 +38,6 @@ func FunctionAliases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "function_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("FunctionVersion"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "revision_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevisionId"), - }, - { - Name: "routing_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RoutingConfig"), - }, - { - Name: "url_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UrlConfig"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go b/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go index e5d4f38873551b..0f23459069280d 100644 --- a/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FunctionConcurrencyConfigs() *schema.Table { @@ -12,6 +12,7 @@ func FunctionConcurrencyConfigs() *schema.Table { Name: "aws_lambda_function_concurrency_configs", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_ProvisionedConcurrencyConfigListItem.html`, Resolver: fetchLambdaFunctionConcurrencyConfigs, + Transform: transformers.TransformWithStruct(&types.ProvisionedConcurrencyConfigListItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -29,36 +30,6 @@ func FunctionConcurrencyConfigs() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allocated_provisioned_concurrent_executions", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedProvisionedConcurrentExecutions"), - }, - { - Name: "available_provisioned_concurrent_executions", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AvailableProvisionedConcurrentExecutions"), - }, - { - Name: "last_modified", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastModified"), - }, - { - Name: "requested_provisioned_concurrent_executions", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RequestedProvisionedConcurrentExecutions"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusReason"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go b/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go index 7c4605e2f8d464..a673092b302f08 100644 --- a/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FunctionEventInvokeConfigs() *schema.Table { @@ -12,6 +12,7 @@ func FunctionEventInvokeConfigs() *schema.Table { Name: "aws_lambda_function_event_invoke_configs", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionEventInvokeConfig.html`, Resolver: fetchLambdaFunctionEventInvokeConfigs, + Transform: transformers.TransformWithStruct(&types.FunctionEventInvokeConfig{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -29,26 +30,6 @@ func FunctionEventInvokeConfigs() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "destination_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DestinationConfig"), - }, - { - Name: "last_modified", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModified"), - }, - { - Name: "maximum_event_age_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumEventAgeInSeconds"), - }, - { - Name: "maximum_retry_attempts", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumRetryAttempts"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go b/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go index ef76882877cc7f..6a6a1131257432 100644 --- a/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go +++ b/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FunctionEventSourceMappings() *schema.Table { @@ -12,6 +12,7 @@ func FunctionEventSourceMappings() *schema.Table { Name: "aws_lambda_function_event_source_mappings", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_EventSourceMappingConfiguration.html`, Resolver: fetchLambdaFunctionEventSourceMappings, + Transform: transformers.TransformWithStruct(&types.EventSourceMappingConfiguration{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -29,126 +30,6 @@ func FunctionEventSourceMappings() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "amazon_managed_kafka_event_source_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AmazonManagedKafkaEventSourceConfig"), - }, - { - Name: "batch_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BatchSize"), - }, - { - Name: "bisect_batch_on_function_error", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BisectBatchOnFunctionError"), - }, - { - Name: "destination_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DestinationConfig"), - }, - { - Name: "event_source_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EventSourceArn"), - }, - { - Name: "filter_criteria", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FilterCriteria"), - }, - { - Name: "function_response_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("FunctionResponseTypes"), - }, - { - Name: "last_modified", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModified"), - }, - { - Name: "last_processing_result", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastProcessingResult"), - }, - { - Name: "maximum_batching_window_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumBatchingWindowInSeconds"), - }, - { - Name: "maximum_record_age_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumRecordAgeInSeconds"), - }, - { - Name: "maximum_retry_attempts", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumRetryAttempts"), - }, - { - Name: "parallelization_factor", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ParallelizationFactor"), - }, - { - Name: "queues", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Queues"), - }, - { - Name: "self_managed_event_source", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SelfManagedEventSource"), - }, - { - Name: "self_managed_kafka_event_source_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SelfManagedKafkaEventSourceConfig"), - }, - { - Name: "source_access_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceAccessConfigurations"), - }, - { - Name: "starting_position", - Type: schema.TypeString, - Resolver: schema.PathResolver("StartingPosition"), - }, - { - Name: "starting_position_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartingPositionTimestamp"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_transition_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateTransitionReason"), - }, - { - Name: "topics", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Topics"), - }, - { - Name: "tumbling_window_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TumblingWindowInSeconds"), - }, - { - Name: "uuid", - Type: schema.TypeString, - Resolver: schema.PathResolver("UUID"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/function_versions.go b/plugins/source/aws/resources/services/lambda/function_versions.go index 8eb160f32c3bee..871757c5acc097 100644 --- a/plugins/source/aws/resources/services/lambda/function_versions.go +++ b/plugins/source/aws/resources/services/lambda/function_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func FunctionVersions() *schema.Table { @@ -12,6 +12,7 @@ func FunctionVersions() *schema.Table { Name: "aws_lambda_function_versions", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionConfiguration.html`, Resolver: fetchLambdaFunctionVersions, + Transform: transformers.TransformWithStruct(&types.FunctionConfiguration{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -29,171 +30,6 @@ func FunctionVersions() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "architectures", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Architectures"), - }, - { - Name: "code_sha256", - Type: schema.TypeString, - Resolver: schema.PathResolver("CodeSha256"), - }, - { - Name: "code_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CodeSize"), - }, - { - Name: "dead_letter_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeadLetterConfig"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "environment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Environment"), - }, - { - Name: "ephemeral_storage", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EphemeralStorage"), - }, - { - Name: "file_system_configs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FileSystemConfigs"), - }, - { - Name: "function_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FunctionName"), - }, - { - Name: "handler", - Type: schema.TypeString, - Resolver: schema.PathResolver("Handler"), - }, - { - Name: "image_config_response", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ImageConfigResponse"), - }, - { - Name: "kms_key_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("KMSKeyArn"), - }, - { - Name: "last_modified", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastModified"), - }, - { - Name: "last_update_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdateStatus"), - }, - { - Name: "last_update_status_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdateStatusReason"), - }, - { - Name: "last_update_status_reason_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastUpdateStatusReasonCode"), - }, - { - Name: "layers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Layers"), - }, - { - Name: "master_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterArn"), - }, - { - Name: "memory_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MemorySize"), - }, - { - Name: "package_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PackageType"), - }, - { - Name: "revision_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevisionId"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "runtime", - Type: schema.TypeString, - Resolver: schema.PathResolver("Runtime"), - }, - { - Name: "signing_job_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SigningJobArn"), - }, - { - Name: "signing_profile_version_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SigningProfileVersionArn"), - }, - { - Name: "snap_start", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SnapStart"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReason"), - }, - { - Name: "state_reason_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("StateReasonCode"), - }, - { - Name: "timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Timeout"), - }, - { - Name: "tracing_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TracingConfig"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/functions.go b/plugins/source/aws/resources/services/lambda/functions.go index 9dab5d0960c55d..2e8458ce94b958 100644 --- a/plugins/source/aws/resources/services/lambda/functions.go +++ b/plugins/source/aws/resources/services/lambda/functions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Functions() *schema.Table { @@ -13,6 +13,7 @@ func Functions() *schema.Table { Resolver: fetchLambdaFunctions, PreResourceResolver: getFunction, PostResourceResolver: resolvePolicyCodeSigningConfig, + Transform: transformers.TransformWithStruct(&lambda.GetFunctionOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -47,31 +48,6 @@ func Functions() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("Code.RepositoryType"), }, - { - Name: "code", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Code"), - }, - { - Name: "concurrency", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Concurrency"), - }, - { - Name: "configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Configuration"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lambda/layer_version_policies.go b/plugins/source/aws/resources/services/lambda/layer_version_policies.go index d4cb205a1b3925..d123b299cc9a36 100644 --- a/plugins/source/aws/resources/services/lambda/layer_version_policies.go +++ b/plugins/source/aws/resources/services/lambda/layer_version_policies.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LayerVersionPolicies() *schema.Table { return &schema.Table{ Name: "aws_lambda_layer_version_policies", Resolver: fetchLambdaLayerVersionPolicies, + Transform: transformers.TransformWithStruct(&lambda.GetLayerVersionPolicyOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -33,21 +34,6 @@ func LayerVersionPolicies() *schema.Table { Type: schema.TypeInt, Resolver: schema.ParentColumnResolver("version"), }, - { - Name: "policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("Policy"), - }, - { - Name: "revision_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevisionId"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lambda/layer_versions.go b/plugins/source/aws/resources/services/lambda/layer_versions.go index aa872ed4df4899..1700df1485e941 100644 --- a/plugins/source/aws/resources/services/lambda/layer_versions.go +++ b/plugins/source/aws/resources/services/lambda/layer_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LayerVersions() *schema.Table { @@ -12,6 +12,7 @@ func LayerVersions() *schema.Table { Name: "aws_lambda_layer_versions", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_LayerVersionsListItem.html`, Resolver: fetchLambdaLayerVersions, + Transform: transformers.TransformWithStruct(&types.LayerVersionsListItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -34,36 +35,6 @@ func LayerVersions() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "compatible_architectures", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CompatibleArchitectures"), - }, - { - Name: "compatible_runtimes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CompatibleRuntimes"), - }, - { - Name: "created_date", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "license_info", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseInfo"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lambda/layers.go b/plugins/source/aws/resources/services/lambda/layers.go index aca14f60729f47..c9f4373760f60f 100644 --- a/plugins/source/aws/resources/services/lambda/layers.go +++ b/plugins/source/aws/resources/services/lambda/layers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( + "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Layers() *schema.Table { @@ -12,6 +12,7 @@ func Layers() *schema.Table { Name: "aws_lambda_layers", Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_LayersListItem.html`, Resolver: fetchLambdaLayers, + Transform: transformers.TransformWithStruct(&types.LayersListItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { @@ -32,21 +33,6 @@ func Layers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "latest_matching_version", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LatestMatchingVersion"), - }, - { - Name: "layer_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("LayerArn"), - }, - { - Name: "layer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LayerName"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lambda/runtimes.go b/plugins/source/aws/resources/services/lambda/runtimes.go index c865403fae4f5b..e166596a629066 100644 --- a/plugins/source/aws/resources/services/lambda/runtimes.go +++ b/plugins/source/aws/resources/services/lambda/runtimes.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package lambda import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lambda/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Runtimes() *schema.Table { return &schema.Table{ Name: "aws_lambda_runtimes", Resolver: fetchLambdaRuntimes, + Transform: transformers.TransformWithStruct(&models.RuntimeWrapper{}), Multiplex: client.ServiceAccountRegionMultiplexer("lambda"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/lightsail/alarms.go b/plugins/source/aws/resources/services/lightsail/alarms.go index 520041de7df27c..e537771063102f 100644 --- a/plugins/source/aws/resources/services/lightsail/alarms.go +++ b/plugins/source/aws/resources/services/lightsail/alarms.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Alarms() *schema.Table { @@ -12,6 +12,7 @@ func Alarms() *schema.Table { Name: "aws_lightsail_alarms", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Alarm.html`, Resolver: fetchLightsailAlarms, + Transform: transformers.TransformWithStruct(&types.Alarm{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,101 +32,6 @@ func Alarms() *schema.Table { PrimaryKey: true, }, }, - { - Name: "comparison_operator", - Type: schema.TypeString, - Resolver: schema.PathResolver("ComparisonOperator"), - }, - { - Name: "contact_protocols", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ContactProtocols"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "datapoints_to_alarm", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DatapointsToAlarm"), - }, - { - Name: "evaluation_periods", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EvaluationPeriods"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "monitored_resource_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MonitoredResourceInfo"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "notification_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("NotificationEnabled"), - }, - { - Name: "notification_triggers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NotificationTriggers"), - }, - { - Name: "period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Period"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "statistic", - Type: schema.TypeString, - Resolver: schema.PathResolver("Statistic"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, - { - Name: "threshold", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Threshold"), - }, - { - Name: "treat_missing_data", - Type: schema.TypeString, - Resolver: schema.PathResolver("TreatMissingData"), - }, - { - Name: "unit", - Type: schema.TypeString, - Resolver: schema.PathResolver("Unit"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go b/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go index c6726db89fcaa6..a8334d8d9685b9 100644 --- a/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go +++ b/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BucketAccessKeys() *schema.Table { @@ -12,6 +12,7 @@ func BucketAccessKeys() *schema.Table { Name: "aws_lightsail_bucket_access_keys", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_AccessKey.html`, Resolver: fetchLightsailBucketAccessKeys, + Transform: transformers.TransformWithStruct(&types.AccessKey{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,31 +30,6 @@ func BucketAccessKeys() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "access_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccessKeyId"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "last_used", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastUsed"), - }, - { - Name: "secret_access_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecretAccessKey"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/buckets.go b/plugins/source/aws/resources/services/lightsail/buckets.go index ab1dabe00e3194..38d362729ad45d 100644 --- a/plugins/source/aws/resources/services/lightsail/buckets.go +++ b/plugins/source/aws/resources/services/lightsail/buckets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Buckets() *schema.Table { @@ -12,6 +12,7 @@ func Buckets() *schema.Table { Name: "aws_lightsail_buckets", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Bucket.html`, Resolver: fetchLightsailBuckets, + Transform: transformers.TransformWithStruct(&types.Bucket{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,81 +30,11 @@ func Buckets() *schema.Table { Type: schema.TypeBool, Resolver: schema.PathResolver("AbleToUpdateBundle"), }, - { - Name: "access_log_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessLogConfig"), - }, - { - Name: "access_rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessRules"), - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BundleId"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "object_versioning", - Type: schema.TypeString, - Resolver: schema.PathResolver("ObjectVersioning"), - }, - { - Name: "readonly_access_accounts", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadonlyAccessAccounts"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "resources_receiving_access", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourcesReceivingAccess"), - }, - { - Name: "state", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lightsail/certificates.go b/plugins/source/aws/resources/services/lightsail/certificates.go index cad9183aa9c007..fb59bfb0ce5b54 100644 --- a/plugins/source/aws/resources/services/lightsail/certificates.go +++ b/plugins/source/aws/resources/services/lightsail/certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Certificates() *schema.Table { @@ -12,6 +12,7 @@ func Certificates() *schema.Table { Name: "aws_lightsail_certificates", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Certificate.html`, Resolver: fetchLightsailCertificates, + Transform: transformers.TransformWithStruct(&types.Certificate{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,106 +30,6 @@ func Certificates() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "domain_validation_records", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainValidationRecords"), - }, - { - Name: "eligible_to_renew", - Type: schema.TypeString, - Resolver: schema.PathResolver("EligibleToRenew"), - }, - { - Name: "in_use_resource_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InUseResourceCount"), - }, - { - Name: "issued_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("IssuedAt"), - }, - { - Name: "issuer_ca", - Type: schema.TypeString, - Resolver: schema.PathResolver("IssuerCA"), - }, - { - Name: "key_algorithm", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyAlgorithm"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "not_after", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotAfter"), - }, - { - Name: "not_before", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotBefore"), - }, - { - Name: "renewal_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RenewalSummary"), - }, - { - Name: "request_failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequestFailureReason"), - }, - { - Name: "revocation_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevocationReason"), - }, - { - Name: "revoked_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RevokedAt"), - }, - { - Name: "serial_number", - Type: schema.TypeString, - Resolver: schema.PathResolver("SerialNumber"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subject_alternative_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubjectAlternativeNames"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/container_service_deployments.go b/plugins/source/aws/resources/services/lightsail/container_service_deployments.go index 8ff3297ef9fc67..a6f39649993520 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_deployments.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_deployments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ContainerServiceDeployments() *schema.Table { @@ -12,6 +12,7 @@ func ContainerServiceDeployments() *schema.Table { Name: "aws_lightsail_container_service_deployments", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerServiceDeployment.html`, Resolver: fetchLightsailContainerServiceDeployments, + Transform: transformers.TransformWithStruct(&types.ContainerServiceDeployment{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,31 +30,6 @@ func ContainerServiceDeployments() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "containers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Containers"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "public_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PublicEndpoint"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/container_service_images.go b/plugins/source/aws/resources/services/lightsail/container_service_images.go index 2a01691fdcfe60..a66fa111c68519 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_images.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_images.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ContainerServiceImages() *schema.Table { @@ -12,6 +12,7 @@ func ContainerServiceImages() *schema.Table { Name: "aws_lightsail_container_service_images", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerImage.html`, Resolver: fetchLightsailContainerServiceImages, + Transform: transformers.TransformWithStruct(&types.ContainerImage{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,21 +30,6 @@ func ContainerServiceImages() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "digest", - Type: schema.TypeString, - Resolver: schema.PathResolver("Digest"), - }, - { - Name: "image", - Type: schema.TypeString, - Resolver: schema.PathResolver("Image"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/container_services.go b/plugins/source/aws/resources/services/lightsail/container_services.go index ff51f76f160c24..1b9931a8ab3cec 100644 --- a/plugins/source/aws/resources/services/lightsail/container_services.go +++ b/plugins/source/aws/resources/services/lightsail/container_services.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ContainerServices() *schema.Table { @@ -12,6 +12,7 @@ func ContainerServices() *schema.Table { Name: "aws_lightsail_container_services", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerService.html`, Resolver: fetchLightsailContainerServices, + Transform: transformers.TransformWithStruct(&types.ContainerService{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,96 +32,11 @@ func ContainerServices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "container_service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContainerServiceName"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "current_deployment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CurrentDeployment"), - }, - { - Name: "is_disabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsDisabled"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "next_deployment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NextDeployment"), - }, - { - Name: "power", - Type: schema.TypeString, - Resolver: schema.PathResolver("Power"), - }, - { - Name: "power_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PowerId"), - }, - { - Name: "principal_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrincipalArn"), - }, - { - Name: "private_domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateDomainName"), - }, - { - Name: "private_registry_access", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrivateRegistryAccess"), - }, - { - Name: "public_domain_names", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PublicDomainNames"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "scale", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Scale"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "state_detail", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StateDetail"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lightsail/database_events.go b/plugins/source/aws/resources/services/lightsail/database_events.go index ba42e9e91d5723..e12f0a372a5878 100644 --- a/plugins/source/aws/resources/services/lightsail/database_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_events.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseEvents() *schema.Table { @@ -12,6 +12,7 @@ func DatabaseEvents() *schema.Table { Name: "aws_lightsail_database_events", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseEvent.html`, Resolver: fetchLightsailDatabaseEvents, + Transform: transformers.TransformWithStruct(&types.RelationalDatabaseEvent{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,26 +30,6 @@ func DatabaseEvents() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "event_categories", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategories"), - }, - { - Name: "message", - Type: schema.TypeString, - Resolver: schema.PathResolver("Message"), - }, - { - Name: "resource", - Type: schema.TypeString, - Resolver: schema.PathResolver("Resource"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/database_log_events.go b/plugins/source/aws/resources/services/lightsail/database_log_events.go index 823cb99b5878e2..ca2ee9814fc96a 100644 --- a/plugins/source/aws/resources/services/lightsail/database_log_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_log_events.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lightsail/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseLogEvents() *schema.Table { return &schema.Table{ Name: "aws_lightsail_database_log_events", Resolver: fetchLightsailDatabaseLogEvents, + Transform: transformers.TransformWithStruct(&models.LogEventWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -28,21 +29,6 @@ func DatabaseLogEvents() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "message", - Type: schema.TypeString, - Resolver: schema.PathResolver("Message"), - }, - { - Name: "log_stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogStreamName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/database_parameters.go b/plugins/source/aws/resources/services/lightsail/database_parameters.go index ba519d65af19ad..cf71895e8a94dc 100644 --- a/plugins/source/aws/resources/services/lightsail/database_parameters.go +++ b/plugins/source/aws/resources/services/lightsail/database_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseParameters() *schema.Table { @@ -12,6 +12,7 @@ func DatabaseParameters() *schema.Table { Name: "aws_lightsail_database_parameters", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseParameter.html`, Resolver: fetchLightsailDatabaseParameters, + Transform: transformers.TransformWithStruct(&types.RelationalDatabaseParameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,46 +30,6 @@ func DatabaseParameters() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/database_snapshots.go b/plugins/source/aws/resources/services/lightsail/database_snapshots.go index 8279740160c031..c1ebaa70858398 100644 --- a/plugins/source/aws/resources/services/lightsail/database_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/database_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DatabaseSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func DatabaseSnapshots() *schema.Table { Name: "aws_lightsail_database_snapshots", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseSnapshot.html`, Resolver: fetchLightsailDatabaseSnapshots, + Transform: transformers.TransformWithStruct(&types.RelationalDatabaseSnapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,71 +32,6 @@ func DatabaseSnapshots() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "from_relational_database_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromRelationalDatabaseArn"), - }, - { - Name: "from_relational_database_blueprint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromRelationalDatabaseBlueprintId"), - }, - { - Name: "from_relational_database_bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromRelationalDatabaseBundleId"), - }, - { - Name: "from_relational_database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromRelationalDatabaseName"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "size_in_gb", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeInGb"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/lightsail/databases.go b/plugins/source/aws/resources/services/lightsail/databases.go index f0993154a20934..15d2014cc3ed8a 100644 --- a/plugins/source/aws/resources/services/lightsail/databases.go +++ b/plugins/source/aws/resources/services/lightsail/databases.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Databases() *schema.Table { @@ -12,6 +12,7 @@ func Databases() *schema.Table { Name: "aws_lightsail_databases", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabase.html`, Resolver: fetchLightsailDatabases, + Transform: transformers.TransformWithStruct(&types.RelationalDatabase{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,126 +30,6 @@ func Databases() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("Arn"), }, - { - Name: "backup_retention_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BackupRetentionEnabled"), - }, - { - Name: "ca_certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CaCertificateIdentifier"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "hardware", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Hardware"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "master_database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterDatabaseName"), - }, - { - Name: "master_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MasterEndpoint"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "parameter_apply_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterApplyStatus"), - }, - { - Name: "pending_maintenance_actions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingMaintenanceActions"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "relational_database_blueprint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RelationalDatabaseBlueprintId"), - }, - { - Name: "relational_database_bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RelationalDatabaseBundleId"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "secondary_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecondaryAvailabilityZone"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go index 618b5e8b21a6cb..1bf3d4cf9968c8 100644 --- a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DiskSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func DiskSnapshots() *schema.Table { Name: "aws_lightsail_disk_snapshots", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_DiskSnapshot.html`, Resolver: fetchLightsailDiskSnapshots, + Transform: transformers.TransformWithStruct(&types.DiskSnapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,76 +30,6 @@ func DiskSnapshots() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "from_disk_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromDiskArn"), - }, - { - Name: "from_disk_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromDiskName"), - }, - { - Name: "from_instance_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromInstanceArn"), - }, - { - Name: "from_instance_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromInstanceName"), - }, - { - Name: "is_from_auto_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsFromAutoSnapshot"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("Progress"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "size_in_gb", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeInGb"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/lightsail/disks.go b/plugins/source/aws/resources/services/lightsail/disks.go index f86788fa3c219c..bf63cbc2fad491 100644 --- a/plugins/source/aws/resources/services/lightsail/disks.go +++ b/plugins/source/aws/resources/services/lightsail/disks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Disks() *schema.Table { @@ -12,6 +12,7 @@ func Disks() *schema.Table { Name: "aws_lightsail_disks", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Disk.html`, Resolver: fetchLightsailDisks, + Transform: transformers.TransformWithStruct(&types.Disk{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -36,81 +37,6 @@ func Disks() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "add_ons", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AddOns"), - }, - { - Name: "attached_to", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachedTo"), - }, - { - Name: "attachment_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachmentState"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "gb_in_use", - Type: schema.TypeInt, - Resolver: schema.PathResolver("GbInUse"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "is_attached", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsAttached"), - }, - { - Name: "is_system_disk", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsSystemDisk"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "size_in_gb", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeInGb"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lightsail/distributions.go b/plugins/source/aws/resources/services/lightsail/distributions.go index 1382f6898bdaf3..28807e30504445 100644 --- a/plugins/source/aws/resources/services/lightsail/distributions.go +++ b/plugins/source/aws/resources/services/lightsail/distributions.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/lightsail/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Distributions() *schema.Table { return &schema.Table{ Name: "aws_lightsail_distributions", Resolver: fetchLightsailDistributions, + Transform: transformers.TransformWithStruct(&models.DistributionWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -36,101 +37,6 @@ func Distributions() *schema.Table { Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "able_to_update_bundle", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AbleToUpdateBundle"), - }, - { - Name: "alternative_domain_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AlternativeDomainNames"), - }, - { - Name: "bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BundleId"), - }, - { - Name: "cache_behavior_settings", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CacheBehaviorSettings"), - }, - { - Name: "cache_behaviors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CacheBehaviors"), - }, - { - Name: "certificate_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateName"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "default_cache_behavior", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultCacheBehavior"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "is_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsEnabled"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "origin", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Origin"), - }, - { - Name: "origin_public_dns", - Type: schema.TypeString, - Resolver: schema.PathResolver("OriginPublicDNS"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, - { - Name: "latest_cache_reset", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LatestCacheReset"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/instance_port_states.go b/plugins/source/aws/resources/services/lightsail/instance_port_states.go index 1dd613cdca7199..b1788664c744db 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_port_states.go +++ b/plugins/source/aws/resources/services/lightsail/instance_port_states.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstancePortStates() *schema.Table { @@ -12,6 +12,7 @@ func InstancePortStates() *schema.Table { Name: "aws_lightsail_instance_port_states", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstancePortState.html`, Resolver: fetchLightsailInstancePortStates, + Transform: transformers.TransformWithStruct(&types.InstancePortState{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,41 +30,6 @@ func InstancePortStates() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "cidr_list_aliases", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CidrListAliases"), - }, - { - Name: "cidrs", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Cidrs"), - }, - { - Name: "from_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("FromPort"), - }, - { - Name: "ipv6_cidrs", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Ipv6Cidrs"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "to_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ToPort"), - }, }, } } diff --git a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go index 9d0da38ab8ed06..55e0d45d18a34a 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstanceSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func InstanceSnapshots() *schema.Table { Name: "aws_lightsail_instance_snapshots", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstanceSnapshot.html`, Resolver: fetchLightsailInstanceSnapshots, + Transform: transformers.TransformWithStruct(&types.InstanceSnapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,76 +32,6 @@ func InstanceSnapshots() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "from_attached_disks", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FromAttachedDisks"), - }, - { - Name: "from_blueprint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromBlueprintId"), - }, - { - Name: "from_bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromBundleId"), - }, - { - Name: "from_instance_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromInstanceArn"), - }, - { - Name: "from_instance_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromInstanceName"), - }, - { - Name: "is_from_auto_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsFromAutoSnapshot"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("Progress"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "size_in_gb", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SizeInGb"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/lightsail/instances.go b/plugins/source/aws/resources/services/lightsail/instances.go index 9b27b0ea3bc765..a1fcb4676e75ec 100644 --- a/plugins/source/aws/resources/services/lightsail/instances.go +++ b/plugins/source/aws/resources/services/lightsail/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -12,6 +12,7 @@ func Instances() *schema.Table { Name: "aws_lightsail_instances", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Instance.html`, Resolver: fetchLightsailInstances, + Transform: transformers.TransformWithStruct(&types.Instance{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -36,111 +37,11 @@ func Instances() *schema.Table { PrimaryKey: true, }, }, - { - Name: "add_ons", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AddOns"), - }, - { - Name: "blueprint_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BlueprintId"), - }, - { - Name: "blueprint_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BlueprintName"), - }, - { - Name: "bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BundleId"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "hardware", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Hardware"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "ipv6_addresses", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Ipv6Addresses"), - }, - { - Name: "is_static_ip", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsStaticIp"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "metadata_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MetadataOptions"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "networking", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Networking"), - }, - { - Name: "private_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrivateIpAddress"), - }, - { - Name: "public_ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicIpAddress"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "ssh_key_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SshKeyName"), - }, - { - Name: "state", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "username", - Type: schema.TypeString, - Resolver: schema.PathResolver("Username"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go b/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go index a7417e561f51d7..e7ce4f3f7fa882 100644 --- a/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go +++ b/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancerTlsCertificates() *schema.Table { @@ -12,6 +12,7 @@ func LoadBalancerTlsCertificates() *schema.Table { Name: "aws_lightsail_load_balancer_tls_certificates", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancerTlsCertificate.html`, Resolver: fetchLightsailLoadBalancerTlsCertificates, + Transform: transformers.TransformWithStruct(&types.LoadBalancerTlsCertificate{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -29,126 +30,6 @@ func LoadBalancerTlsCertificates() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DomainName"), - }, - { - Name: "domain_validation_records", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainValidationRecords"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "is_attached", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsAttached"), - }, - { - Name: "issued_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("IssuedAt"), - }, - { - Name: "issuer", - Type: schema.TypeString, - Resolver: schema.PathResolver("Issuer"), - }, - { - Name: "key_algorithm", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyAlgorithm"), - }, - { - Name: "load_balancer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoadBalancerName"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "not_after", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotAfter"), - }, - { - Name: "not_before", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NotBefore"), - }, - { - Name: "renewal_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RenewalSummary"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "revocation_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("RevocationReason"), - }, - { - Name: "revoked_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RevokedAt"), - }, - { - Name: "serial", - Type: schema.TypeString, - Resolver: schema.PathResolver("Serial"), - }, - { - Name: "signature_algorithm", - Type: schema.TypeString, - Resolver: schema.PathResolver("SignatureAlgorithm"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subject", - Type: schema.TypeString, - Resolver: schema.PathResolver("Subject"), - }, - { - Name: "subject_alternative_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubjectAlternativeNames"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/lightsail/load_balancers.go b/plugins/source/aws/resources/services/lightsail/load_balancers.go index d872bb225d8b83..da248b821b4fa5 100644 --- a/plugins/source/aws/resources/services/lightsail/load_balancers.go +++ b/plugins/source/aws/resources/services/lightsail/load_balancers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LoadBalancers() *schema.Table { @@ -12,6 +12,7 @@ func LoadBalancers() *schema.Table { Name: "aws_lightsail_load_balancers", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancer.html`, Resolver: fetchLightsailLoadBalancers, + Transform: transformers.TransformWithStruct(&types.LoadBalancer{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,96 +32,11 @@ func LoadBalancers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "configuration_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConfigurationOptions"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "dns_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DnsName"), - }, - { - Name: "health_check_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckPath"), - }, - { - Name: "https_redirection_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HttpsRedirectionEnabled"), - }, - { - Name: "instance_health_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceHealthSummary"), - }, - { - Name: "instance_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InstancePort"), - }, - { - Name: "ip_address_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddressType"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "public_ports", - Type: schema.TypeIntArray, - Resolver: schema.PathResolver("PublicPorts"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "tls_certificate_summaries", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TlsCertificateSummaries"), - }, - { - Name: "tls_policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TlsPolicyName"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/lightsail/static_ips.go b/plugins/source/aws/resources/services/lightsail/static_ips.go index 8046c19e36ae9c..02cd73ce5da3a7 100644 --- a/plugins/source/aws/resources/services/lightsail/static_ips.go +++ b/plugins/source/aws/resources/services/lightsail/static_ips.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package lightsail import ( + "github.com/aws/aws-sdk-go-v2/service/lightsail/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StaticIps() *schema.Table { @@ -12,6 +12,7 @@ func StaticIps() *schema.Table { Name: "aws_lightsail_static_ips", Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_StaticIp.html`, Resolver: fetchLightsailStaticIps, + Transform: transformers.TransformWithStruct(&types.StaticIp{}), Multiplex: client.ServiceAccountRegionMultiplexer("lightsail"), Columns: []schema.Column{ { @@ -31,46 +32,6 @@ func StaticIps() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attached_to", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachedTo"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddress"), - }, - { - Name: "is_attached", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsAttached"), - }, - { - Name: "location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Location"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "support_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("SupportCode"), - }, }, } } diff --git a/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go b/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go index 8f17be62e0b334..dd4365729b3d8c 100644 --- a/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go +++ b/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package mq import ( + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BrokerConfigurationRevisions() *schema.Table { @@ -13,6 +13,7 @@ func BrokerConfigurationRevisions() *schema.Table { Description: `https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id-revisions.html`, Resolver: fetchMqBrokerConfigurationRevisions, PreResourceResolver: getMqBrokerConfigurationRevision, + Transform: transformers.TransformWithStruct(&mq.DescribeConfigurationRevisionOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("mq"), Columns: []schema.Column{ { @@ -35,26 +36,6 @@ func BrokerConfigurationRevisions() *schema.Table { Type: schema.TypeJSON, Resolver: resolveBrokerConfigurationRevisionsData, }, - { - Name: "configuration_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigurationId"), - }, - { - Name: "created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Created"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/mq/broker_configurations.go b/plugins/source/aws/resources/services/mq/broker_configurations.go index 9a0c7afad19079..1e88420fc3ca20 100644 --- a/plugins/source/aws/resources/services/mq/broker_configurations.go +++ b/plugins/source/aws/resources/services/mq/broker_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package mq import ( + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BrokerConfigurations() *schema.Table { @@ -12,6 +12,7 @@ func BrokerConfigurations() *schema.Table { Name: "aws_mq_broker_configurations", Description: `https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id.html`, Resolver: fetchMqBrokerConfigurations, + Transform: transformers.TransformWithStruct(&mq.DescribeConfigurationOutput{}, transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("mq"), Columns: []schema.Column{ { @@ -29,56 +30,6 @@ func BrokerConfigurations() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "authentication_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthenticationStrategy"), - }, - { - Name: "created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Created"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "engine_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineType"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "latest_revision", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LatestRevision"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/mq/broker_users.go b/plugins/source/aws/resources/services/mq/broker_users.go index bbf4659b9c879d..a3e76a3d05889b 100644 --- a/plugins/source/aws/resources/services/mq/broker_users.go +++ b/plugins/source/aws/resources/services/mq/broker_users.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package mq import ( + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BrokerUsers() *schema.Table { return &schema.Table{ Name: "aws_mq_broker_users", Resolver: fetchMqBrokerUsers, + Transform: transformers.TransformWithStruct(&mq.DescribeUserOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("mq"), Columns: []schema.Column{ { @@ -28,36 +29,6 @@ func BrokerUsers() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "broker_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BrokerId"), - }, - { - Name: "console_access", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ConsoleAccess"), - }, - { - Name: "groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Groups"), - }, - { - Name: "pending", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Pending"), - }, - { - Name: "username", - Type: schema.TypeString, - Resolver: schema.PathResolver("Username"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/mq/brokers.go b/plugins/source/aws/resources/services/mq/brokers.go index 42a9de576124ea..62802539fbf4ed 100644 --- a/plugins/source/aws/resources/services/mq/brokers.go +++ b/plugins/source/aws/resources/services/mq/brokers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package mq import ( + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Brokers() *schema.Table { @@ -13,6 +13,7 @@ func Brokers() *schema.Table { Description: `https://docs.aws.amazon.com/amazon-mq/latest/api-reference/brokers.html`, Resolver: fetchMqBrokers, PreResourceResolver: getMqBroker, + Transform: transformers.TransformWithStruct(&mq.DescribeBrokerOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("mq"), Columns: []schema.Column{ { @@ -33,151 +34,6 @@ func Brokers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "actions_required", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ActionsRequired"), - }, - { - Name: "authentication_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthenticationStrategy"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "broker_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BrokerId"), - }, - { - Name: "broker_instances", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BrokerInstances"), - }, - { - Name: "broker_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BrokerName"), - }, - { - Name: "broker_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("BrokerState"), - }, - { - Name: "configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Configurations"), - }, - { - Name: "created", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Created"), - }, - { - Name: "deployment_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeploymentMode"), - }, - { - Name: "encryption_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionOptions"), - }, - { - Name: "engine_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineType"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "host_instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostInstanceType"), - }, - { - Name: "ldap_server_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LdapServerMetadata"), - }, - { - Name: "logs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Logs"), - }, - { - Name: "maintenance_window_start_time", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MaintenanceWindowStartTime"), - }, - { - Name: "pending_authentication_strategy", - Type: schema.TypeString, - Resolver: schema.PathResolver("PendingAuthenticationStrategy"), - }, - { - Name: "pending_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PendingEngineVersion"), - }, - { - Name: "pending_host_instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PendingHostInstanceType"), - }, - { - Name: "pending_ldap_server_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingLdapServerMetadata"), - }, - { - Name: "pending_security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("PendingSecurityGroups"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "users", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Users"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/mwaa/environments.go b/plugins/source/aws/resources/services/mwaa/environments.go index c54d52ed922f4e..ef2ce363d883a9 100644 --- a/plugins/source/aws/resources/services/mwaa/environments.go +++ b/plugins/source/aws/resources/services/mwaa/environments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package mwaa import ( + "github.com/aws/aws-sdk-go-v2/service/mwaa/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Environments() *schema.Table { @@ -12,6 +12,7 @@ func Environments() *schema.Table { Name: "aws_mwaa_environments", Description: `https://docs.aws.amazon.com/mwaa/latest/API/API_Environment.html`, Resolver: fetchMwaaEnvironments, + Transform: transformers.TransformWithStruct(&types.Environment{}), PreResourceResolver: getEnvironment, Multiplex: client.ServiceAccountRegionMultiplexer("airflow"), Columns: []schema.Column{ @@ -33,131 +34,6 @@ func Environments() *schema.Table { PrimaryKey: true, }, }, - { - Name: "airflow_configuration_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AirflowConfigurationOptions"), - }, - { - Name: "airflow_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AirflowVersion"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "dag_s3_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("DagS3Path"), - }, - { - Name: "environment_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("EnvironmentClass"), - }, - { - Name: "execution_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExecutionRoleArn"), - }, - { - Name: "kms_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKey"), - }, - { - Name: "last_update", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastUpdate"), - }, - { - Name: "logging_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LoggingConfiguration"), - }, - { - Name: "max_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxWorkers"), - }, - { - Name: "min_workers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MinWorkers"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "network_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NetworkConfiguration"), - }, - { - Name: "plugins_s3_object_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PluginsS3ObjectVersion"), - }, - { - Name: "plugins_s3_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("PluginsS3Path"), - }, - { - Name: "requirements_s3_object_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequirementsS3ObjectVersion"), - }, - { - Name: "requirements_s3_path", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequirementsS3Path"), - }, - { - Name: "schedulers", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Schedulers"), - }, - { - Name: "service_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceRoleArn"), - }, - { - Name: "source_bucket_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceBucketArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "webserver_access_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebserverAccessMode"), - }, - { - Name: "webserver_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebserverUrl"), - }, - { - Name: "weekly_maintenance_window_start", - Type: schema.TypeString, - Resolver: schema.PathResolver("WeeklyMaintenanceWindowStart"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go b/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go index 34b7ca034ba2d3..ecc6012af6469e 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go +++ b/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroupParameters() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameterGroupParameters() *schema.Table { Name: "aws_neptune_cluster_parameter_group_parameters", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameterGroups`, Resolver: fetchNeptuneClusterParameterGroupParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -29,56 +30,6 @@ func ClusterParameterGroupParameters() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go b/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go index 63521bd85f87fa..93d0e30f3210d1 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroups() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameterGroups() *schema.Table { Name: "aws_neptune_cluster_parameter_groups", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameters`, Resolver: fetchNeptuneClusterParameterGroups, + Transform: transformers.TransformWithStruct(&types.DBClusterParameterGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func ClusterParameterGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneClusterParameterGroupTags, }, - { - Name: "db_cluster_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterParameterGroupName"), - }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go index bd3d6d6130252a..57db2332aa37b6 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func ClusterSnapshots() *schema.Table { Name: "aws_neptune_cluster_snapshots", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-snapshots.html#DescribeDBClusterSnapshots`, Resolver: fetchNeptuneClusterSnapshots, + Transform: transformers.TransformWithStruct(&types.DBClusterSnapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -42,101 +43,6 @@ func ClusterSnapshots() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneClusterSnapshotTags, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_cluster_snapshot_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterSnapshotIdentifier"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "percent_progress", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotCreateTime"), - }, - { - Name: "snapshot_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotType"), - }, - { - Name: "source_db_cluster_snapshot_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceDBClusterSnapshotArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/clusters.go b/plugins/source/aws/resources/services/neptune/clusters.go index 2a9b362c5006d5..43356649954b11 100644 --- a/plugins/source/aws/resources/services/neptune/clusters.go +++ b/plugins/source/aws/resources/services/neptune/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -12,6 +12,7 @@ func Clusters() *schema.Table { Name: "aws_neptune_clusters", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-clusters.html#DescribeDBClusters`, Resolver: fetchNeptuneClusters, + Transform: transformers.TransformWithStruct(&types.DBCluster{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,206 +38,6 @@ func Clusters() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneClusterTags, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "associated_roles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociatedRoles"), - }, - { - Name: "automatic_restart_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AutomaticRestartTime"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "character_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CharacterSetName"), - }, - { - Name: "clone_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloneGroupId"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "copy_tags_to_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CopyTagsToSnapshot"), - }, - { - Name: "cross_account_clone", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CrossAccountClone"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_cluster_members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBClusterMembers"), - }, - { - Name: "db_cluster_option_group_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBClusterOptionGroupMemberships"), - }, - { - Name: "db_cluster_parameter_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterParameterGroup"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "db_cluster_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbClusterResourceId"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "earliest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EarliestRestorableTime"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostedZoneId"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "percent_progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "read_replica_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaIdentifiers"), - }, - { - Name: "reader_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReaderEndpoint"), - }, - { - Name: "replication_source_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationSourceIdentifier"), - }, - { - Name: "serverless_v2_scaling_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServerlessV2ScalingConfiguration"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/db_parameter_group_db_parameters.go b/plugins/source/aws/resources/services/neptune/db_parameter_group_db_parameters.go index bd190db6b1afa1..91d2eed18d4af3 100644 --- a/plugins/source/aws/resources/services/neptune/db_parameter_group_db_parameters.go +++ b/plugins/source/aws/resources/services/neptune/db_parameter_group_db_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbParameterGroupDbParameters() *schema.Table { @@ -12,6 +12,7 @@ func DbParameterGroupDbParameters() *schema.Table { Name: "aws_neptune_db_parameter_group_db_parameters", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameters`, Resolver: fetchNeptuneDbParameterGroupDbParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -29,56 +30,6 @@ func DbParameterGroupDbParameters() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/db_parameter_groups.go b/plugins/source/aws/resources/services/neptune/db_parameter_groups.go index e631b64e0ba845..fdf0e88a2a4391 100644 --- a/plugins/source/aws/resources/services/neptune/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/db_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbParameterGroups() *schema.Table { @@ -12,6 +12,7 @@ func DbParameterGroups() *schema.Table { Name: "aws_neptune_db_parameter_groups", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameterGroups`, Resolver: fetchNeptuneDbParameterGroups, + Transform: transformers.TransformWithStruct(&types.DBParameterGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func DbParameterGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneDbParameterGroupTags, }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "db_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/neptune/event_subscriptions.go b/plugins/source/aws/resources/services/neptune/event_subscriptions.go index dd9cef96559bb2..a5d1110a73c072 100644 --- a/plugins/source/aws/resources/services/neptune/event_subscriptions.go +++ b/plugins/source/aws/resources/services/neptune/event_subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventSubscriptions() *schema.Table { @@ -12,6 +12,7 @@ func EventSubscriptions() *schema.Table { Name: "aws_neptune_event_subscriptions", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-events.html#DescribeEventSubscriptions`, Resolver: fetchNeptuneEventSubscriptions, + Transform: transformers.TransformWithStruct(&types.EventSubscription{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,51 +38,6 @@ func EventSubscriptions() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneEventSubscriptionTags, }, - { - Name: "cust_subscription_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustSubscriptionId"), - }, - { - Name: "customer_aws_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerAwsId"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "event_categories_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategoriesList"), - }, - { - Name: "sns_topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicArn"), - }, - { - Name: "source_ids_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SourceIdsList"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subscription_creation_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubscriptionCreationTime"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/global_clusters.go b/plugins/source/aws/resources/services/neptune/global_clusters.go index ffbcf6b2e094db..b3d8fdc29c6d3a 100644 --- a/plugins/source/aws/resources/services/neptune/global_clusters.go +++ b/plugins/source/aws/resources/services/neptune/global_clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GlobalClusters() *schema.Table { @@ -12,6 +12,7 @@ func GlobalClusters() *schema.Table { Name: "aws_neptune_global_clusters", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#DescribeDBInstances`, Resolver: fetchNeptuneGlobalClusters, + Transform: transformers.TransformWithStruct(&types.GlobalCluster{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,46 +38,6 @@ func GlobalClusters() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneGlobalClusterTags, }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "global_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalClusterIdentifier"), - }, - { - Name: "global_cluster_members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GlobalClusterMembers"), - }, - { - Name: "global_cluster_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalClusterResourceId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/instances.go b/plugins/source/aws/resources/services/neptune/instances.go index 5216b0be282104..5806bd6d35da3e 100644 --- a/plugins/source/aws/resources/services/neptune/instances.go +++ b/plugins/source/aws/resources/services/neptune/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -12,6 +12,7 @@ func Instances() *schema.Table { Name: "aws_neptune_instances", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#DescribeDBInstances`, Resolver: fetchNeptuneInstances, + Transform: transformers.TransformWithStruct(&types.DBInstance{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { @@ -37,266 +38,6 @@ func Instances() *schema.Table { Type: schema.TypeJSON, Resolver: resolveNeptuneInstanceTags, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "ca_certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CACertificateIdentifier"), - }, - { - Name: "character_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CharacterSetName"), - }, - { - Name: "copy_tags_to_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CopyTagsToSnapshot"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceClass"), - }, - { - Name: "db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceIdentifier"), - }, - { - Name: "db_instance_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceStatus"), - }, - { - Name: "db_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBName"), - }, - { - Name: "db_parameter_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBParameterGroups"), - }, - { - Name: "db_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBSecurityGroups"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "db_instance_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DbInstancePort"), - }, - { - Name: "dbi_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbiResourceId"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "domain_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainMemberships"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "enhanced_monitoring_resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EnhancedMonitoringResourceArn"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "instance_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstanceCreateTime"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "monitoring_interval", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MonitoringInterval"), - }, - { - Name: "monitoring_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("MonitoringRoleArn"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "option_group_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OptionGroupMemberships"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "performance_insights_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PerformanceInsightsEnabled"), - }, - { - Name: "performance_insights_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PerformanceInsightsKMSKeyId"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "promotion_tier", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PromotionTier"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "read_replica_db_cluster_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaDBClusterIdentifiers"), - }, - { - Name: "read_replica_db_instance_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaDBInstanceIdentifiers"), - }, - { - Name: "read_replica_source_db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReadReplicaSourceDBInstanceIdentifier"), - }, - { - Name: "secondary_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecondaryAvailabilityZone"), - }, - { - Name: "status_infos", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StatusInfos"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "tde_credential_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TdeCredentialArn"), - }, - { - Name: "timezone", - Type: schema.TypeString, - Resolver: schema.PathResolver("Timezone"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, } } diff --git a/plugins/source/aws/resources/services/neptune/subnet_groups.go b/plugins/source/aws/resources/services/neptune/subnet_groups.go index 9d87e6c252693c..7390f03dee720f 100644 --- a/plugins/source/aws/resources/services/neptune/subnet_groups.go +++ b/plugins/source/aws/resources/services/neptune/subnet_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package neptune import ( + "github.com/aws/aws-sdk-go-v2/service/neptune/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubnetGroups() *schema.Table { @@ -12,6 +12,7 @@ func SubnetGroups() *schema.Table { Name: "aws_neptune_subnet_groups", Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-subnets.html#DescribeDBSubnetGroups`, Resolver: fetchNeptuneSubnetGroups, + Transform: transformers.TransformWithStruct(&types.DBSubnetGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("neptune"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/organizations/accounts.go b/plugins/source/aws/resources/services/organizations/accounts.go index 678abc548c6e4c..06ac88e70f7c27 100644 --- a/plugins/source/aws/resources/services/organizations/accounts.go +++ b/plugins/source/aws/resources/services/organizations/accounts.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package organizations import ( + "github.com/aws/aws-sdk-go-v2/service/organizations/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Accounts() *schema.Table { @@ -12,6 +12,7 @@ func Accounts() *schema.Table { Name: "aws_organizations_accounts", Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_Account.html`, Resolver: fetchOrganizationsAccounts, + Transform: transformers.TransformWithStruct(&types.Account{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,36 +33,6 @@ func Accounts() *schema.Table { Type: schema.TypeJSON, Resolver: resolveAccountTags, }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "joined_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("JoinedMethod"), - }, - { - Name: "joined_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("JoinedTimestamp"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/organizations/organizations.go b/plugins/source/aws/resources/services/organizations/organizations.go index 65a7f926061073..9fcb7e766824b3 100644 --- a/plugins/source/aws/resources/services/organizations/organizations.go +++ b/plugins/source/aws/resources/services/organizations/organizations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package organizations import ( + "github.com/aws/aws-sdk-go-v2/service/organizations/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Organizations() *schema.Table { @@ -12,7 +12,13 @@ func Organizations() *schema.Table { Name: "aws_organizations", Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_Organization.html`, Resolver: fetchOrganizationsOrganizations, - Multiplex: client.AccountMultiplex, + Transform: transformers.TransformWithStruct( + &types.Organization{}, + transformers.WithSkipFields( + "AvailablePolicyTypes", // deprecated and misleading field according to docs + ), + ), + Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { Name: "account_id", @@ -30,31 +36,6 @@ func Organizations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "feature_set", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeatureSet"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "master_account_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterAccountArn"), - }, - { - Name: "master_account_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterAccountEmail"), - }, - { - Name: "master_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterAccountId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go b/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go index 3b4ecdb276ddc1..cf55e2324b1a82 100644 --- a/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go +++ b/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package qldb import ( + "github.com/aws/aws-sdk-go-v2/service/qldb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LedgerJournalKinesisStreams() *schema.Table { @@ -12,6 +12,7 @@ func LedgerJournalKinesisStreams() *schema.Table { Name: "aws_qldb_ledger_journal_kinesis_streams", Description: `https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalKinesisStreamDescription.html`, Resolver: fetchQldbLedgerJournalKinesisStreams, + Transform: transformers.TransformWithStruct(&types.JournalKinesisStreamDescription{}), Multiplex: client.ServiceAccountRegionMultiplexer("qldb"), Columns: []schema.Column{ { @@ -29,61 +30,6 @@ func LedgerJournalKinesisStreams() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "kinesis_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KinesisConfiguration"), - }, - { - Name: "ledger_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LedgerName"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "stream_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamId"), - }, - { - Name: "stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("StreamName"), - }, - { - Name: "arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("Arn"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "error_cause", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorCause"), - }, - { - Name: "exclusive_end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExclusiveEndTime"), - }, - { - Name: "inclusive_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InclusiveStartTime"), - }, }, } } diff --git a/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go b/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go index b90eaad5c8750a..f22198d1216b16 100644 --- a/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go +++ b/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package qldb import ( + "github.com/aws/aws-sdk-go-v2/service/qldb/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func LedgerJournalS3Exports() *schema.Table { @@ -12,6 +12,7 @@ func LedgerJournalS3Exports() *schema.Table { Name: "aws_qldb_ledger_journal_s3_exports", Description: `https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalS3ExportDescription.html`, Resolver: fetchQldbLedgerJournalS3Exports, + Transform: transformers.TransformWithStruct(&types.JournalS3ExportDescription{}), Multiplex: client.ServiceAccountRegionMultiplexer("qldb"), Columns: []schema.Column{ { @@ -29,51 +30,6 @@ func LedgerJournalS3Exports() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "exclusive_end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExclusiveEndTime"), - }, - { - Name: "export_creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExportCreationTime"), - }, - { - Name: "export_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExportId"), - }, - { - Name: "inclusive_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InclusiveStartTime"), - }, - { - Name: "ledger_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LedgerName"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "s3_export_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("S3ExportConfiguration"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "output_format", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputFormat"), - }, }, } } diff --git a/plugins/source/aws/resources/services/qldb/ledgers.go b/plugins/source/aws/resources/services/qldb/ledgers.go index 068ed537c0124f..7e8212c69058e7 100644 --- a/plugins/source/aws/resources/services/qldb/ledgers.go +++ b/plugins/source/aws/resources/services/qldb/ledgers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package qldb import ( + "github.com/aws/aws-sdk-go-v2/service/qldb" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Ledgers() *schema.Table { @@ -12,6 +12,7 @@ func Ledgers() *schema.Table { Name: "aws_qldb_ledgers", Resolver: fetchQldbLedgers, PreResourceResolver: getLedger, + Transform: transformers.TransformWithStruct(&qldb.DescribeLedgerOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("qldb"), Columns: []schema.Column{ { @@ -37,41 +38,6 @@ func Ledgers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_date_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDateTime"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "encryption_description", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EncryptionDescription"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "permissions_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("PermissionsMode"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/quicksight/analyses.go b/plugins/source/aws/resources/services/quicksight/analyses.go index 4d1d0a41c8e96f..5af030fe8d4df3 100644 --- a/plugins/source/aws/resources/services/quicksight/analyses.go +++ b/plugins/source/aws/resources/services/quicksight/analyses.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Analyses() *schema.Table { return &schema.Table{ Name: "aws_quicksight_analyses", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Analysis.html", Resolver: fetchQuicksightAnalyses, PreResourceResolver: getAnalysis, + Transform: transformers.TransformWithStruct(&types.Analysis{}), Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { @@ -37,51 +39,6 @@ func Analyses() *schema.Table { PrimaryKey: true, }, }, - { - Name: "analysis_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AnalysisId"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_set_arns", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DataSetArns"), - }, - { - Name: "errors", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Errors"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "sheets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Sheets"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "theme_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ThemeArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/dashboards.go b/plugins/source/aws/resources/services/quicksight/dashboards.go index 5966a160a046fb..084e0ac6fd2fd5 100644 --- a/plugins/source/aws/resources/services/quicksight/dashboards.go +++ b/plugins/source/aws/resources/services/quicksight/dashboards.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Dashboards() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_dashboards", - Resolver: fetchQuicksightDashboards, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_dashboards", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DashboardSummary.html", + Resolver: fetchQuicksightDashboards, + Transform: transformers.TransformWithStruct(&types.DashboardSummary{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -36,36 +38,6 @@ func Dashboards() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "dashboard_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DashboardId"), - }, - { - Name: "last_published_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastPublishedTime"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "published_version_number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PublishedVersionNumber"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/data_sets.go b/plugins/source/aws/resources/services/quicksight/data_sets.go index b3d89410e154c3..fbb202854149ac 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sets.go +++ b/plugins/source/aws/resources/services/quicksight/data_sets.go @@ -1,16 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataSets() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_data_sets", - Resolver: fetchQuicksightDataSets, + Name: "aws_quicksight_data_sets", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSetSummary.html", + Resolver: fetchQuicksightDataSets, + Transform: transformers.TransformWithStruct(&types.DataSetSummary{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { @@ -36,46 +39,6 @@ func DataSets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "column_level_permission_rules_applied", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ColumnLevelPermissionRulesApplied"), - }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_set_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataSetId"), - }, - { - Name: "import_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("ImportMode"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "row_level_permission_data_set", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RowLevelPermissionDataSet"), - }, - { - Name: "row_level_permission_tag_configuration_applied", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RowLevelPermissionTagConfigurationApplied"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/quicksight/data_sources.go b/plugins/source/aws/resources/services/quicksight/data_sources.go index 367e2b12a890d4..d4403f5ff6d6b7 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sources.go +++ b/plugins/source/aws/resources/services/quicksight/data_sources.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DataSources() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_data_sources", - Resolver: fetchQuicksightDataSources, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_data_sources", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSource.html", + Resolver: fetchQuicksightDataSources, + Transform: transformers.TransformWithStruct(&types.DataSource{}, transformers.WithSkipFields("AlternateDataSourceParameters")), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -36,56 +38,6 @@ func DataSources() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "data_source_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataSourceId"), - }, - { - Name: "error_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ErrorInfo"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "secret_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecretArn"), - }, - { - Name: "ssl_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SslProperties"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "vpc_connection_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConnectionProperties"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/folders.go b/plugins/source/aws/resources/services/quicksight/folders.go index bb57308e1daf50..0afe3c56f63f4f 100644 --- a/plugins/source/aws/resources/services/quicksight/folders.go +++ b/plugins/source/aws/resources/services/quicksight/folders.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Folders() *schema.Table { return &schema.Table{ Name: "aws_quicksight_folders", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Folder.html", Resolver: fetchQuicksightFolders, PreResourceResolver: getFolder, + Transform: transformers.TransformWithStruct(&types.Folder{}), Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { @@ -37,36 +39,6 @@ func Folders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "folder_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("FolderId"), - }, - { - Name: "folder_path", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("FolderPath"), - }, - { - Name: "folder_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("FolderType"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/group_members.go b/plugins/source/aws/resources/services/quicksight/group_members.go index ef556021451cd9..53403413e151d1 100644 --- a/plugins/source/aws/resources/services/quicksight/group_members.go +++ b/plugins/source/aws/resources/services/quicksight/group_members.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func GroupMembers() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_group_members", - Resolver: fetchQuicksightGroupMembers, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_group_members", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GroupMember.html", + Resolver: fetchQuicksightGroupMembers, + Transform: transformers.TransformWithStruct(&types.GroupMember{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -39,11 +41,6 @@ func GroupMembers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "member_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MemberName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/groups.go b/plugins/source/aws/resources/services/quicksight/groups.go index 28a59126e91c76..b9786e8d34daa0 100644 --- a/plugins/source/aws/resources/services/quicksight/groups.go +++ b/plugins/source/aws/resources/services/quicksight/groups.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Groups() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_groups", - Resolver: fetchQuicksightGroups, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_groups", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Group.html", + Resolver: fetchQuicksightGroups, + Transform: transformers.TransformWithStruct(&types.Group{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -36,21 +38,6 @@ func Groups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "principal_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrincipalId"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/quicksight/ingestions.go b/plugins/source/aws/resources/services/quicksight/ingestions.go index cdcf271cfb5138..fe422abd3a8ce6 100644 --- a/plugins/source/aws/resources/services/quicksight/ingestions.go +++ b/plugins/source/aws/resources/services/quicksight/ingestions.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Ingestions() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_ingestions", - Resolver: fetchQuicksightIngestions, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_ingestions", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Ingestion.html", + Resolver: fetchQuicksightIngestions, + Transform: transformers.TransformWithStruct(&types.Ingestion{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -44,56 +46,6 @@ func Ingestions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "ingestion_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("IngestionStatus"), - }, - { - Name: "error_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ErrorInfo"), - }, - { - Name: "ingestion_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IngestionId"), - }, - { - Name: "ingestion_size_in_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IngestionSizeInBytes"), - }, - { - Name: "ingestion_time_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IngestionTimeInSeconds"), - }, - { - Name: "queue_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("QueueInfo"), - }, - { - Name: "request_source", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequestSource"), - }, - { - Name: "request_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("RequestType"), - }, - { - Name: "row_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RowInfo"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/templates.go b/plugins/source/aws/resources/services/quicksight/templates.go index 27f4ef579dacb8..fb7bfae8852702 100644 --- a/plugins/source/aws/resources/services/quicksight/templates.go +++ b/plugins/source/aws/resources/services/quicksight/templates.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Templates() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_templates", - Resolver: fetchQuicksightTemplates, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_templates", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_TemplateSummary.html", + Resolver: fetchQuicksightTemplates, + Transform: transformers.TransformWithStruct(&types.TemplateSummary{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -36,31 +38,6 @@ func Templates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "latest_version_number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LatestVersionNumber"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "template_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/quicksight/users.go b/plugins/source/aws/resources/services/quicksight/users.go index 48f141935d7828..bfa7d21a9046e9 100644 --- a/plugins/source/aws/resources/services/quicksight/users.go +++ b/plugins/source/aws/resources/services/quicksight/users.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package quicksight import ( + "github.com/aws/aws-sdk-go-v2/service/quicksight/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Users() *schema.Table { return &schema.Table{ - Name: "aws_quicksight_users", - Resolver: fetchQuicksightUsers, - Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), + Name: "aws_quicksight_users", + Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_User.html", + Resolver: fetchQuicksightUsers, + Transform: transformers.TransformWithStruct(&types.User{}), + Multiplex: client.ServiceAccountRegionMultiplexer("quicksight"), Columns: []schema.Column{ { Name: "account_id", @@ -36,56 +38,6 @@ func Users() *schema.Table { PrimaryKey: true, }, }, - { - Name: "active", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Active"), - }, - { - Name: "custom_permissions_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomPermissionsName"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "external_login_federation_provider_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExternalLoginFederationProviderType"), - }, - { - Name: "external_login_federation_provider_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExternalLoginFederationProviderUrl"), - }, - { - Name: "external_login_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExternalLoginId"), - }, - { - Name: "identity_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityType"), - }, - { - Name: "principal_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrincipalId"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ram/principals.go b/plugins/source/aws/resources/services/ram/principals.go index 16045f52253488..f5c74c4efe8b81 100644 --- a/plugins/source/aws/resources/services/ram/principals.go +++ b/plugins/source/aws/resources/services/ram/principals.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Principals() *schema.Table { @@ -12,6 +12,7 @@ func Principals() *schema.Table { Name: "aws_ram_principals", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_Principal.html`, Resolver: fetchRamPrincipals, + Transform: transformers.TransformWithStruct(&types.Principal{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -27,16 +28,6 @@ func Principals() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "external", - Type: schema.TypeBool, - Resolver: schema.PathResolver("External"), - }, { Name: "id", Type: schema.TypeString, @@ -45,16 +36,6 @@ func Principals() *schema.Table { PrimaryKey: true, }, }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "resource_share_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceShareArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ram/resource_share_associations.go b/plugins/source/aws/resources/services/ram/resource_share_associations.go index 965ee0a574d812..a3c87a199be1af 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_associations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceShareAssociations() *schema.Table { @@ -12,6 +12,7 @@ func ResourceShareAssociations() *schema.Table { Name: "aws_ram_resource_share_associations", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShareAssociation.html`, Resolver: fetchRamResourceShareAssociations, + Transform: transformers.TransformWithStruct(&types.ResourceShareAssociation{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -32,26 +33,6 @@ func ResourceShareAssociations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "association_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationType"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "external", - Type: schema.TypeBool, - Resolver: schema.PathResolver("External"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, { Name: "resource_share_arn", Type: schema.TypeString, @@ -60,21 +41,6 @@ func ResourceShareAssociations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "resource_share_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceShareName"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ram/resource_share_invitations.go b/plugins/source/aws/resources/services/ram/resource_share_invitations.go index b26a63a045dd20..1f32846c10bd9d 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_invitations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_invitations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceShareInvitations() *schema.Table { @@ -12,6 +12,7 @@ func ResourceShareInvitations() *schema.Table { Name: "aws_ram_resource_share_invitations", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShareInvitation.html`, Resolver: fetchRamResourceShareInvitations, + Transform: transformers.TransformWithStruct(&types.ResourceShareInvitation{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -24,31 +25,6 @@ func ResourceShareInvitations() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "invitation_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InvitationTimestamp"), - }, - { - Name: "receiver_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReceiverAccountId"), - }, - { - Name: "receiver_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReceiverArn"), - }, - { - Name: "resource_share_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceShareArn"), - }, - { - Name: "resource_share_associations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceShareAssociations"), - }, { Name: "arn", Type: schema.TypeString, @@ -57,21 +33,6 @@ func ResourceShareInvitations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "resource_share_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceShareName"), - }, - { - Name: "sender_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SenderAccountId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ram/resource_share_permissions.go b/plugins/source/aws/resources/services/ram/resource_share_permissions.go index 340d56cc4d025d..1ed2f4b16cbbad 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_permissions.go +++ b/plugins/source/aws/resources/services/ram/resource_share_permissions.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceSharePermissions() *schema.Table { return &schema.Table{ Name: "aws_ram_resource_share_permissions", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceSharePermissionSummary.html`, + Transform: transformers.TransformWithStruct(&types.ResourceSharePermissionSummary{}), Resolver: fetchRamResourceSharePermissions, Columns: []schema.Column{ { @@ -36,46 +37,6 @@ func ResourceSharePermissions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "default_version", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultVersion"), - }, - { - Name: "is_resource_type_default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsResourceTypeDefault"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "version", - Type: schema.TypeString, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ram/resource_shares.go b/plugins/source/aws/resources/services/ram/resource_shares.go index 9cbe7d86f5d048..3ef340b10a3a82 100644 --- a/plugins/source/aws/resources/services/ram/resource_shares.go +++ b/plugins/source/aws/resources/services/ram/resource_shares.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceShares() *schema.Table { @@ -12,6 +12,7 @@ func ResourceShares() *schema.Table { Name: "aws_ram_resource_shares", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShare.html`, Resolver: fetchRamResourceShares, + Transform: transformers.TransformWithStruct(&types.ResourceShare{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -24,36 +25,6 @@ func ResourceShares() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "allow_external_principals", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowExternalPrincipals"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "feature_set", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeatureSet"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "owning_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwningAccountId"), - }, { Name: "arn", Type: schema.TypeString, @@ -62,16 +33,6 @@ func ResourceShares() *schema.Table { PrimaryKey: true, }, }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/ram/resource_types.go b/plugins/source/aws/resources/services/ram/resource_types.go index ffc0edfccb6f65..2f1df111c0d747 100644 --- a/plugins/source/aws/resources/services/ram/resource_types.go +++ b/plugins/source/aws/resources/services/ram/resource_types.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceTypes() *schema.Table { @@ -12,6 +12,7 @@ func ResourceTypes() *schema.Table { Name: "aws_ram_resource_types", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ServiceNameAndResourceType.html`, Resolver: fetchRamResourceTypes, + Transform: transformers.TransformWithStruct(&types.ServiceNameAndResourceType{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -27,11 +28,6 @@ func ResourceTypes() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "resource_region_scope", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceRegionScope"), - }, { Name: "resource_type", Type: schema.TypeString, diff --git a/plugins/source/aws/resources/services/ram/resources.go b/plugins/source/aws/resources/services/ram/resources.go index 0f465ac35f5cc1..508ea7e7392afa 100644 --- a/plugins/source/aws/resources/services/ram/resources.go +++ b/plugins/source/aws/resources/services/ram/resources.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ram import ( + "github.com/aws/aws-sdk-go-v2/service/ram/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Resources() *schema.Table { @@ -12,6 +12,7 @@ func Resources() *schema.Table { Name: "aws_ram_resources", Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_Resource.html`, Resolver: fetchRamResources, + Transform: transformers.TransformWithStruct(&types.Resource{}), Multiplex: client.ServiceAccountRegionMultiplexer("ram"), Columns: []schema.Column{ { @@ -32,46 +33,6 @@ func Resources() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "resource_group_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceGroupArn"), - }, - { - Name: "resource_region_scope", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceRegionScope"), - }, - { - Name: "resource_share_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceShareArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/certificates.go b/plugins/source/aws/resources/services/rds/certificates.go index d0f915387eddce..267bf8d5f1b0f6 100644 --- a/plugins/source/aws/resources/services/rds/certificates.go +++ b/plugins/source/aws/resources/services/rds/certificates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Certificates() *schema.Table { @@ -12,6 +12,7 @@ func Certificates() *schema.Table { Name: "aws_rds_certificates", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Certificate.html`, Resolver: fetchRdsCertificates, + Transform: transformers.TransformWithStruct(&types.Certificate{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -32,41 +33,6 @@ func Certificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateIdentifier"), - }, - { - Name: "certificate_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateType"), - }, - { - Name: "customer_override", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CustomerOverride"), - }, - { - Name: "customer_override_valid_till", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CustomerOverrideValidTill"), - }, - { - Name: "thumbprint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Thumbprint"), - }, - { - Name: "valid_from", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidFrom"), - }, - { - Name: "valid_till", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ValidTill"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go b/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go index 295e71d794342b..9d76c474d08608 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroupParameters() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameterGroupParameters() *schema.Table { Name: "aws_rds_cluster_parameter_group_parameters", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html`, Resolver: fetchRdsClusterParameterGroupParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -29,61 +30,6 @@ func ClusterParameterGroupParameters() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, - { - Name: "supported_engine_modes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedEngineModes"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go b/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go index f5d1f39e253f91..cefb777209bfc4 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroups() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameterGroups() *schema.Table { Name: "aws_rds_cluster_parameter_groups", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterParameterGroup.html`, Resolver: fetchRdsClusterParameterGroups, + Transform: transformers.TransformWithStruct(&types.DBClusterParameterGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func ClusterParameterGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRdsClusterParameterGroupTags, }, - { - Name: "db_cluster_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterParameterGroupName"), - }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/rds/cluster_parameters.go b/plugins/source/aws/resources/services/rds/cluster_parameters.go index 4e8b73707054dc..016caf8e476466 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameters.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameters.go @@ -1,17 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameters() *schema.Table { return &schema.Table{ - Name: "aws_rds_cluster_parameters", - Resolver: fetchRdsClusterParameters, - Multiplex: client.ServiceAccountRegionMultiplexer("rds"), + Name: "aws_rds_cluster_parameters", + Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html", + Resolver: fetchRdsClusterParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), + Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { Name: "account_id", diff --git a/plugins/source/aws/resources/services/rds/cluster_snapshots.go b/plugins/source/aws/resources/services/rds/cluster_snapshots.go index c7ba088828c2d4..04c2e84fefbf50 100644 --- a/plugins/source/aws/resources/services/rds/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/rds/cluster_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func ClusterSnapshots() *schema.Table { Name: "aws_rds_cluster_snapshots", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterSnapshot.html`, Resolver: fetchRdsClusterSnapshots, + Transform: transformers.TransformWithStruct(&types.DBClusterSnapshot{}, transformers.WithSkipFields("TagList")), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -42,111 +43,6 @@ func ClusterSnapshots() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRDSClusterSnapshotAttributes, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_cluster_snapshot_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterSnapshotIdentifier"), - }, - { - Name: "db_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSystemId"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineMode"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "percent_progress", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotCreateTime"), - }, - { - Name: "snapshot_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotType"), - }, - { - Name: "source_db_cluster_snapshot_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceDBClusterSnapshotArn"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/clusters.go b/plugins/source/aws/resources/services/rds/clusters.go index ed84fd3599a74c..4c239bb99507ee 100644 --- a/plugins/source/aws/resources/services/rds/clusters.go +++ b/plugins/source/aws/resources/services/rds/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -12,6 +12,7 @@ func Clusters() *schema.Table { Name: "aws_rds_clusters", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBCluster.html`, Resolver: fetchRdsClusters, + Transform: transformers.TransformWithStruct(&types.DBCluster{}, transformers.WithSkipFields("TagList")), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -37,351 +38,6 @@ func Clusters() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRdsClusterTags, }, - { - Name: "activity_stream_kinesis_stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamKinesisStreamName"), - }, - { - Name: "activity_stream_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamKmsKeyId"), - }, - { - Name: "activity_stream_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamMode"), - }, - { - Name: "activity_stream_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamStatus"), - }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "associated_roles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociatedRoles"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "automatic_restart_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AutomaticRestartTime"), - }, - { - Name: "availability_zones", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AvailabilityZones"), - }, - { - Name: "backtrack_consumed_change_records", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BacktrackConsumedChangeRecords"), - }, - { - Name: "backtrack_window", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BacktrackWindow"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Capacity"), - }, - { - Name: "character_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CharacterSetName"), - }, - { - Name: "clone_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloneGroupId"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "copy_tags_to_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CopyTagsToSnapshot"), - }, - { - Name: "cross_account_clone", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CrossAccountClone"), - }, - { - Name: "custom_endpoints", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CustomEndpoints"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_cluster_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterInstanceClass"), - }, - { - Name: "db_cluster_members", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBClusterMembers"), - }, - { - Name: "db_cluster_option_group_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBClusterOptionGroupMemberships"), - }, - { - Name: "db_cluster_parameter_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterParameterGroup"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "db_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSystemId"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "db_cluster_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbClusterResourceId"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "domain_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainMemberships"), - }, - { - Name: "earliest_backtrack_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EarliestBacktrackTime"), - }, - { - Name: "earliest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EarliestRestorableTime"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineMode"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "global_write_forwarding_requested", - Type: schema.TypeBool, - Resolver: schema.PathResolver("GlobalWriteForwardingRequested"), - }, - { - Name: "global_write_forwarding_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("GlobalWriteForwardingStatus"), - }, - { - Name: "hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostedZoneId"), - }, - { - Name: "http_endpoint_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("HttpEndpointEnabled"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "master_user_secret", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MasterUserSecret"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "monitoring_interval", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MonitoringInterval"), - }, - { - Name: "monitoring_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("MonitoringRoleArn"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "network_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkType"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "percent_progress", - Type: schema.TypeString, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "performance_insights_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PerformanceInsightsEnabled"), - }, - { - Name: "performance_insights_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PerformanceInsightsKMSKeyId"), - }, - { - Name: "performance_insights_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PerformanceInsightsRetentionPeriod"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "read_replica_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaIdentifiers"), - }, - { - Name: "reader_endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReaderEndpoint"), - }, - { - Name: "replication_source_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationSourceIdentifier"), - }, - { - Name: "scaling_configuration_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ScalingConfigurationInfo"), - }, - { - Name: "serverless_v2_scaling_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ServerlessV2ScalingConfiguration"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/db_parameter_group_db_parameters.go b/plugins/source/aws/resources/services/rds/db_parameter_group_db_parameters.go index 10eb40ac9789af..adc21e29612cc3 100644 --- a/plugins/source/aws/resources/services/rds/db_parameter_group_db_parameters.go +++ b/plugins/source/aws/resources/services/rds/db_parameter_group_db_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbParameterGroupDbParameters() *schema.Table { @@ -12,6 +12,7 @@ func DbParameterGroupDbParameters() *schema.Table { Name: "aws_rds_db_parameter_group_db_parameters", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html`, Resolver: fetchRdsDbParameterGroupDbParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -29,61 +30,6 @@ func DbParameterGroupDbParameters() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyMethod"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterName"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, - { - Name: "supported_engine_modes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedEngineModes"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/db_parameter_groups.go b/plugins/source/aws/resources/services/rds/db_parameter_groups.go index 6b78323cb34196..40be737e92fe43 100644 --- a/plugins/source/aws/resources/services/rds/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/db_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbParameterGroups() *schema.Table { @@ -12,6 +12,7 @@ func DbParameterGroups() *schema.Table { Name: "aws_rds_db_parameter_groups", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBParameterGroup.html`, Resolver: fetchRdsDbParameterGroups, + Transform: transformers.TransformWithStruct(&types.DBParameterGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func DbParameterGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRdsDbParameterGroupTags, }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "db_parameter_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/rds/db_security_groups.go b/plugins/source/aws/resources/services/rds/db_security_groups.go index c3c6b61e16cc98..5edbaff8769445 100644 --- a/plugins/source/aws/resources/services/rds/db_security_groups.go +++ b/plugins/source/aws/resources/services/rds/db_security_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbSecurityGroups() *schema.Table { @@ -12,7 +12,11 @@ func DbSecurityGroups() *schema.Table { Name: "aws_rds_db_security_groups", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSecurityGroup.html`, Resolver: fetchRdsDbSecurityGroups, - Multiplex: client.ServiceAccountRegionMultiplexer("rds"), + Transform: transformers.TransformWithStruct( + &types.DBSecurityGroup{}, + transformers.WithNameTransformer(client.CreateReplaceTransformer(map[string]string{"e_c2": "ec2"})), + ), + Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { Name: "account_id", @@ -37,36 +41,6 @@ func DbSecurityGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRdsDbSecurityGroupTags, }, - { - Name: "db_security_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSecurityGroupDescription"), - }, - { - Name: "db_security_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSecurityGroupName"), - }, - { - Name: "ec2_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EC2SecurityGroups"), - }, - { - Name: "ip_ranges", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IPRanges"), - }, - { - Name: "owner_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerId"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/db_snapshots.go b/plugins/source/aws/resources/services/rds/db_snapshots.go index 0c86463b00d05b..277a944bda2515 100644 --- a/plugins/source/aws/resources/services/rds/db_snapshots.go +++ b/plugins/source/aws/resources/services/rds/db_snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DbSnapshots() *schema.Table { @@ -12,6 +12,7 @@ func DbSnapshots() *schema.Table { Name: "aws_rds_db_snapshots", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSnapshot.html`, Resolver: fetchRdsDbSnapshots, + Transform: transformers.TransformWithStruct(&types.DBSnapshot{}, transformers.WithSkipFields("TagList")), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -42,161 +43,6 @@ func DbSnapshots() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRDSDBSnapshotAttributes, }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceIdentifier"), - }, - { - Name: "db_snapshot_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSnapshotIdentifier"), - }, - { - Name: "dbi_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbiResourceId"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "instance_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstanceCreateTime"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "option_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("OptionGroupName"), - }, - { - Name: "original_snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("OriginalSnapshotCreateTime"), - }, - { - Name: "percent_progress", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PercentProgress"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "processor_features", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProcessorFeatures"), - }, - { - Name: "snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotCreateTime"), - }, - { - Name: "snapshot_database_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotDatabaseTime"), - }, - { - Name: "snapshot_target", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotTarget"), - }, - { - Name: "snapshot_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotType"), - }, - { - Name: "source_db_snapshot_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceDBSnapshotIdentifier"), - }, - { - Name: "source_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceRegion"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "storage_throughput", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StorageThroughput"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "tde_credential_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TdeCredentialArn"), - }, - { - Name: "timezone", - Type: schema.TypeString, - Resolver: schema.PathResolver("Timezone"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/engine_versions.go b/plugins/source/aws/resources/services/rds/engine_versions.go index 0c4698d6170634..aa29c2586ee06a 100644 --- a/plugins/source/aws/resources/services/rds/engine_versions.go +++ b/plugins/source/aws/resources/services/rds/engine_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EngineVersions() *schema.Table { @@ -12,6 +12,7 @@ func EngineVersions() *schema.Table { Name: "aws_rds_engine_versions", Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html`, Resolver: fetchRdsEngineVersions, + Transform: transformers.TransformWithStruct(&types.DBEngineVersion{}, transformers.WithSkipFields("TagList")), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -46,151 +47,11 @@ func EngineVersions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreateTime"), - }, - { - Name: "custom_db_engine_version_manifest", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomDBEngineVersionManifest"), - }, - { - Name: "db_engine_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineDescription"), - }, - { - Name: "db_engine_media_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineMediaType"), - }, - { - Name: "db_engine_version_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineVersionArn"), - }, - { - Name: "db_engine_version_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBEngineVersionDescription"), - }, - { - Name: "db_parameter_group_family", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBParameterGroupFamily"), - }, - { - Name: "database_installation_files_s3_bucket_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseInstallationFilesS3BucketName"), - }, - { - Name: "database_installation_files_s3_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseInstallationFilesS3Prefix"), - }, - { - Name: "default_character_set", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultCharacterSet"), - }, - { - Name: "exportable_log_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ExportableLogTypes"), - }, - { - Name: "image", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Image"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KMSKeyId"), - }, - { - Name: "major_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MajorEngineVersion"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "supported_ca_certificate_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedCACertificateIdentifiers"), - }, - { - Name: "supported_character_sets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SupportedCharacterSets"), - }, - { - Name: "supported_engine_modes", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedEngineModes"), - }, - { - Name: "supported_feature_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedFeatureNames"), - }, - { - Name: "supported_nchar_character_sets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SupportedNcharCharacterSets"), - }, - { - Name: "supported_timezones", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SupportedTimezones"), - }, - { - Name: "supports_babelfish", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsBabelfish"), - }, - { - Name: "supports_certificate_rotation_without_restart", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsCertificateRotationWithoutRestart"), - }, - { - Name: "supports_global_databases", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsGlobalDatabases"), - }, - { - Name: "supports_log_exports_to_cloudwatch_logs", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsLogExportsToCloudwatchLogs"), - }, - { - Name: "supports_parallel_query", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsParallelQuery"), - }, - { - Name: "supports_read_replica", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsReadReplica"), - }, { Name: "tag_list", Type: schema.TypeJSON, Resolver: client.ResolveTagField("TagList"), }, - { - Name: "valid_upgrade_target", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ValidUpgradeTarget"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/rds/event_subscriptions.go b/plugins/source/aws/resources/services/rds/event_subscriptions.go index bd53eab9de512e..c5d1a2c7bffbb5 100644 --- a/plugins/source/aws/resources/services/rds/event_subscriptions.go +++ b/plugins/source/aws/resources/services/rds/event_subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventSubscriptions() *schema.Table { @@ -12,6 +12,7 @@ func EventSubscriptions() *schema.Table { Name: "aws_rds_event_subscriptions", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_EventSubscription.html`, Resolver: fetchRdsEventSubscriptions, + Transform: transformers.TransformWithStruct(&types.EventSubscription{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -37,51 +38,6 @@ func EventSubscriptions() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRDSEventSubscriptionTags, }, - { - Name: "cust_subscription_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustSubscriptionId"), - }, - { - Name: "customer_aws_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerAwsId"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "event_categories_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategoriesList"), - }, - { - Name: "sns_topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicArn"), - }, - { - Name: "source_ids_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SourceIdsList"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subscription_creation_time", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubscriptionCreationTime"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/instances.go b/plugins/source/aws/resources/services/rds/instances.go index 42dd61c5d8d807..a59e428ed1cc25 100644 --- a/plugins/source/aws/resources/services/rds/instances.go +++ b/plugins/source/aws/resources/services/rds/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -12,6 +12,7 @@ func Instances() *schema.Table { Name: "aws_rds_instances", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBInstance.html`, Resolver: fetchRdsInstances, + Transform: transformers.TransformWithStruct(&types.DBInstance{}, transformers.WithSkipFields("TagList")), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -42,391 +43,6 @@ func Instances() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRdsInstanceTags, }, - { - Name: "activity_stream_engine_native_audit_fields_included", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ActivityStreamEngineNativeAuditFieldsIncluded"), - }, - { - Name: "activity_stream_kinesis_stream_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamKinesisStreamName"), - }, - { - Name: "activity_stream_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamKmsKeyId"), - }, - { - Name: "activity_stream_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamMode"), - }, - { - Name: "activity_stream_policy_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamPolicyStatus"), - }, - { - Name: "activity_stream_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivityStreamStatus"), - }, - { - Name: "allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AllocatedStorage"), - }, - { - Name: "associated_roles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociatedRoles"), - }, - { - Name: "auto_minor_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoMinorVersionUpgrade"), - }, - { - Name: "automatic_restart_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AutomaticRestartTime"), - }, - { - Name: "automation_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutomationMode"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "aws_backup_recovery_point_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsBackupRecoveryPointArn"), - }, - { - Name: "backup_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BackupRetentionPeriod"), - }, - { - Name: "backup_target", - Type: schema.TypeString, - Resolver: schema.PathResolver("BackupTarget"), - }, - { - Name: "ca_certificate_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("CACertificateIdentifier"), - }, - { - Name: "certificate_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CertificateDetails"), - }, - { - Name: "character_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CharacterSetName"), - }, - { - Name: "copy_tags_to_snapshot", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CopyTagsToSnapshot"), - }, - { - Name: "custom_iam_instance_profile", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomIamInstanceProfile"), - }, - { - Name: "customer_owned_ip_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CustomerOwnedIpEnabled"), - }, - { - Name: "db_cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterIdentifier"), - }, - { - Name: "db_instance_automated_backups_replications", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBInstanceAutomatedBackupsReplications"), - }, - { - Name: "db_instance_class", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceClass"), - }, - { - Name: "db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceIdentifier"), - }, - { - Name: "db_instance_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBInstanceStatus"), - }, - { - Name: "db_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBName"), - }, - { - Name: "db_parameter_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBParameterGroups"), - }, - { - Name: "db_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBSecurityGroups"), - }, - { - Name: "db_subnet_group", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DBSubnetGroup"), - }, - { - Name: "db_system_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSystemId"), - }, - { - Name: "db_instance_port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DbInstancePort"), - }, - { - Name: "dbi_resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DbiResourceId"), - }, - { - Name: "deletion_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DeletionProtection"), - }, - { - Name: "domain_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DomainMemberships"), - }, - { - Name: "enabled_cloudwatch_logs_exports", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EnabledCloudwatchLogsExports"), - }, - { - Name: "endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "engine", - Type: schema.TypeString, - Resolver: schema.PathResolver("Engine"), - }, - { - Name: "engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineVersion"), - }, - { - Name: "enhanced_monitoring_resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("EnhancedMonitoringResourceArn"), - }, - { - Name: "iam_database_authentication_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IAMDatabaseAuthenticationEnabled"), - }, - { - Name: "instance_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstanceCreateTime"), - }, - { - Name: "iops", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Iops"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "latest_restorable_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LatestRestorableTime"), - }, - { - Name: "license_model", - Type: schema.TypeString, - Resolver: schema.PathResolver("LicenseModel"), - }, - { - Name: "listener_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ListenerEndpoint"), - }, - { - Name: "master_user_secret", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MasterUserSecret"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "max_allocated_storage", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxAllocatedStorage"), - }, - { - Name: "monitoring_interval", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MonitoringInterval"), - }, - { - Name: "monitoring_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("MonitoringRoleArn"), - }, - { - Name: "multi_az", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiAZ"), - }, - { - Name: "nchar_character_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("NcharCharacterSetName"), - }, - { - Name: "network_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkType"), - }, - { - Name: "option_group_memberships", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OptionGroupMemberships"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "performance_insights_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PerformanceInsightsEnabled"), - }, - { - Name: "performance_insights_kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PerformanceInsightsKMSKeyId"), - }, - { - Name: "performance_insights_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PerformanceInsightsRetentionPeriod"), - }, - { - Name: "preferred_backup_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredBackupWindow"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "promotion_tier", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PromotionTier"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "read_replica_db_cluster_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaDBClusterIdentifiers"), - }, - { - Name: "read_replica_db_instance_identifiers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ReadReplicaDBInstanceIdentifiers"), - }, - { - Name: "read_replica_source_db_instance_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReadReplicaSourceDBInstanceIdentifier"), - }, - { - Name: "replica_mode", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicaMode"), - }, - { - Name: "resume_full_automation_mode_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ResumeFullAutomationModeTime"), - }, - { - Name: "secondary_availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecondaryAvailabilityZone"), - }, - { - Name: "status_infos", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StatusInfos"), - }, - { - Name: "storage_encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("StorageEncrypted"), - }, - { - Name: "storage_throughput", - Type: schema.TypeInt, - Resolver: schema.PathResolver("StorageThroughput"), - }, - { - Name: "storage_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("StorageType"), - }, - { - Name: "tde_credential_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TdeCredentialArn"), - }, - { - Name: "timezone", - Type: schema.TypeString, - Resolver: schema.PathResolver("Timezone"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, } } diff --git a/plugins/source/aws/resources/services/rds/subnet_groups.go b/plugins/source/aws/resources/services/rds/subnet_groups.go index 1c47537c8dd5f0..66d38c18301049 100644 --- a/plugins/source/aws/resources/services/rds/subnet_groups.go +++ b/plugins/source/aws/resources/services/rds/subnet_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package rds import ( + "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubnetGroups() *schema.Table { @@ -12,6 +12,7 @@ func SubnetGroups() *schema.Table { Name: "aws_rds_subnet_groups", Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSubnetGroup.html`, Resolver: fetchRdsSubnetGroups, + Transform: transformers.TransformWithStruct(&types.DBSubnetGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("rds"), Columns: []schema.Column{ { @@ -32,36 +33,6 @@ func SubnetGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "db_subnet_group_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroupDescription"), - }, - { - Name: "db_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBSubnetGroupName"), - }, - { - Name: "subnet_group_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetGroupStatus"), - }, - { - Name: "subnets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Subnets"), - }, - { - Name: "supported_network_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SupportedNetworkTypes"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go b/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go index d34432bb58293e..432d6fa3a99c57 100644 --- a/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameterGroups() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameterGroups() *schema.Table { Name: "aws_redshift_cluster_parameter_groups", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterParameterGroupStatus.html`, Resolver: fetchRedshiftClusterParameterGroups, + Transform: transformers.TransformWithStruct(&types.ClusterParameterGroupStatus{}), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -41,16 +42,6 @@ func ClusterParameterGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cluster_parameter_status_list", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ClusterParameterStatusList"), - }, - { - Name: "parameter_apply_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterApplyStatus"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/redshift/cluster_parameters.go b/plugins/source/aws/resources/services/redshift/cluster_parameters.go index d2496d1c3a9e10..9fb42eff2f2e45 100644 --- a/plugins/source/aws/resources/services/redshift/cluster_parameters.go +++ b/plugins/source/aws/resources/services/redshift/cluster_parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ClusterParameters() *schema.Table { @@ -12,6 +12,7 @@ func ClusterParameters() *schema.Table { Name: "aws_redshift_cluster_parameters", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_Parameter.html`, Resolver: fetchRedshiftClusterParameters, + Transform: transformers.TransformWithStruct(&types.Parameter{}), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -41,46 +42,6 @@ func ClusterParameters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allowed_values", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedValues"), - }, - { - Name: "apply_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApplyType"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "is_modifiable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsModifiable"), - }, - { - Name: "minimum_engine_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("MinimumEngineVersion"), - }, - { - Name: "parameter_value", - Type: schema.TypeString, - Resolver: schema.PathResolver("ParameterValue"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, }, } } diff --git a/plugins/source/aws/resources/services/redshift/clusters.go b/plugins/source/aws/resources/services/redshift/clusters.go index 022be4d64b14c1..2c572621e1243e 100644 --- a/plugins/source/aws/resources/services/redshift/clusters.go +++ b/plugins/source/aws/resources/services/redshift/clusters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Clusters() *schema.Table { @@ -12,6 +12,7 @@ func Clusters() *schema.Table { Name: "aws_redshift_clusters", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_Cluster.html`, Resolver: fetchRedshiftClusters, + Transform: transformers.TransformWithStruct(&types.Cluster{}, transformers.WithSkipFields("ClusterParameterGroups")), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -39,261 +40,6 @@ func Clusters() *schema.Table { Resolver: resolveRedshiftClusterLoggingStatus, Description: `Describes the status of logging for a cluster.`, }, - { - Name: "allow_version_upgrade", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AllowVersionUpgrade"), - }, - { - Name: "aqua_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AquaConfiguration"), - }, - { - Name: "automated_snapshot_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AutomatedSnapshotRetentionPeriod"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "availability_zone_relocation_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZoneRelocationStatus"), - }, - { - Name: "cluster_availability_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterAvailabilityStatus"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterIdentifier"), - }, - { - Name: "cluster_namespace_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterNamespaceArn"), - }, - { - Name: "cluster_nodes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ClusterNodes"), - }, - { - Name: "cluster_public_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterPublicKey"), - }, - { - Name: "cluster_revision_number", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterRevisionNumber"), - }, - { - Name: "cluster_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ClusterSecurityGroups"), - }, - { - Name: "cluster_snapshot_copy_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ClusterSnapshotCopyStatus"), - }, - { - Name: "cluster_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterStatus"), - }, - { - Name: "cluster_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterSubnetGroupName"), - }, - { - Name: "cluster_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterVersion"), - }, - { - Name: "db_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBName"), - }, - { - Name: "data_transfer_progress", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DataTransferProgress"), - }, - { - Name: "default_iam_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultIamRoleArn"), - }, - { - Name: "deferred_maintenance_windows", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeferredMaintenanceWindows"), - }, - { - Name: "elastic_ip_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ElasticIpStatus"), - }, - { - Name: "elastic_resize_number_of_node_options", - Type: schema.TypeString, - Resolver: schema.PathResolver("ElasticResizeNumberOfNodeOptions"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "enhanced_vpc_routing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnhancedVpcRouting"), - }, - { - Name: "expected_next_snapshot_schedule_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpectedNextSnapshotScheduleTime"), - }, - { - Name: "expected_next_snapshot_schedule_time_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExpectedNextSnapshotScheduleTimeStatus"), - }, - { - Name: "hsm_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HsmStatus"), - }, - { - Name: "iam_roles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IamRoles"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "maintenance_track_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MaintenanceTrackName"), - }, - { - Name: "manual_snapshot_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ManualSnapshotRetentionPeriod"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "modify_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModifyStatus"), - }, - { - Name: "next_maintenance_window_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NextMaintenanceWindowStartTime"), - }, - { - Name: "node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NodeType"), - }, - { - Name: "number_of_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfNodes"), - }, - { - Name: "pending_actions", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("PendingActions"), - }, - { - Name: "pending_modified_values", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PendingModifiedValues"), - }, - { - Name: "preferred_maintenance_window", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreferredMaintenanceWindow"), - }, - { - Name: "publicly_accessible", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PubliclyAccessible"), - }, - { - Name: "reserved_node_exchange_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReservedNodeExchangeStatus"), - }, - { - Name: "resize_info", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResizeInfo"), - }, - { - Name: "restore_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RestoreStatus"), - }, - { - Name: "snapshot_schedule_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotScheduleIdentifier"), - }, - { - Name: "snapshot_schedule_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotScheduleState"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: client.ResolveTags, - }, - { - Name: "total_storage_capacity_in_mega_bytes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalStorageCapacityInMegaBytes"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, - { - Name: "vpc_security_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcSecurityGroups"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/redshift/event_subscriptions.go b/plugins/source/aws/resources/services/redshift/event_subscriptions.go index 16baea279657bc..d606d0b52d940b 100644 --- a/plugins/source/aws/resources/services/redshift/event_subscriptions.go +++ b/plugins/source/aws/resources/services/redshift/event_subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EventSubscriptions() *schema.Table { @@ -12,6 +12,7 @@ func EventSubscriptions() *schema.Table { Name: "aws_redshift_event_subscriptions", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_EventSubscription.html`, Resolver: fetchRedshiftEventSubscriptions, + Transform: transformers.TransformWithStruct(&types.EventSubscription{}), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -33,56 +34,6 @@ func EventSubscriptions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cust_subscription_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustSubscriptionId"), - }, - { - Name: "customer_aws_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerAwsId"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "event_categories_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("EventCategoriesList"), - }, - { - Name: "severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Severity"), - }, - { - Name: "sns_topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnsTopicArn"), - }, - { - Name: "source_ids_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SourceIdsList"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "subscription_creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SubscriptionCreationTime"), - }, { Name: "tags", Type: schema.TypeJSON, diff --git a/plugins/source/aws/resources/services/redshift/snapshots.go b/plugins/source/aws/resources/services/redshift/snapshots.go index e585d225142ed3..9484382d9b527a 100644 --- a/plugins/source/aws/resources/services/redshift/snapshots.go +++ b/plugins/source/aws/resources/services/redshift/snapshots.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Snapshots() *schema.Table { @@ -12,6 +12,7 @@ func Snapshots() *schema.Table { Name: "aws_redshift_snapshots", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_Snapshot.html`, Resolver: fetchRedshiftSnapshots, + Transform: transformers.TransformWithStruct(&types.Snapshot{}), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -39,171 +40,6 @@ func Snapshots() *schema.Table { Resolver: client.ResolveTags, Description: `Tags consisting of a name/value pair for a resource.`, }, - { - Name: "accounts_with_restore_access", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccountsWithRestoreAccess"), - }, - { - Name: "actual_incremental_backup_size_in_mega_bytes", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("ActualIncrementalBackupSizeInMegaBytes"), - }, - { - Name: "availability_zone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AvailabilityZone"), - }, - { - Name: "backup_progress_in_mega_bytes", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("BackupProgressInMegaBytes"), - }, - { - Name: "cluster_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClusterCreateTime"), - }, - { - Name: "cluster_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterIdentifier"), - }, - { - Name: "cluster_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterVersion"), - }, - { - Name: "current_backup_rate_in_mega_bytes_per_second", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("CurrentBackupRateInMegaBytesPerSecond"), - }, - { - Name: "db_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBName"), - }, - { - Name: "elapsed_time_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ElapsedTimeInSeconds"), - }, - { - Name: "encrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Encrypted"), - }, - { - Name: "encrypted_with_hsm", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EncryptedWithHSM"), - }, - { - Name: "engine_full_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("EngineFullVersion"), - }, - { - Name: "enhanced_vpc_routing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnhancedVpcRouting"), - }, - { - Name: "estimated_seconds_to_completion", - Type: schema.TypeInt, - Resolver: schema.PathResolver("EstimatedSecondsToCompletion"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "maintenance_track_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MaintenanceTrackName"), - }, - { - Name: "manual_snapshot_remaining_days", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ManualSnapshotRemainingDays"), - }, - { - Name: "manual_snapshot_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ManualSnapshotRetentionPeriod"), - }, - { - Name: "master_username", - Type: schema.TypeString, - Resolver: schema.PathResolver("MasterUsername"), - }, - { - Name: "node_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("NodeType"), - }, - { - Name: "number_of_nodes", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumberOfNodes"), - }, - { - Name: "owner_account", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwnerAccount"), - }, - { - Name: "port", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Port"), - }, - { - Name: "restorable_node_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("RestorableNodeTypes"), - }, - { - Name: "snapshot_create_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotCreateTime"), - }, - { - Name: "snapshot_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotIdentifier"), - }, - { - Name: "snapshot_retention_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("SnapshotRetentionStartTime"), - }, - { - Name: "snapshot_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SnapshotType"), - }, - { - Name: "source_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceRegion"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "total_backup_size_in_mega_bytes", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("TotalBackupSizeInMegaBytes"), - }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/redshift/subnet_groups.go b/plugins/source/aws/resources/services/redshift/subnet_groups.go index 1cece06cfe50e8..9754fdc169eb65 100644 --- a/plugins/source/aws/resources/services/redshift/subnet_groups.go +++ b/plugins/source/aws/resources/services/redshift/subnet_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package redshift import ( + "github.com/aws/aws-sdk-go-v2/service/redshift/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubnetGroups() *schema.Table { @@ -12,6 +12,7 @@ func SubnetGroups() *schema.Table { Name: "aws_redshift_subnet_groups", Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterSubnetGroup.html`, Resolver: fetchRedshiftSubnetGroups, + Transform: transformers.TransformWithStruct(&types.ClusterSubnetGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("redshift"), Columns: []schema.Column{ { @@ -33,36 +34,11 @@ func SubnetGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cluster_subnet_group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ClusterSubnetGroupName"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "subnet_group_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetGroupStatus"), - }, - { - Name: "subnets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Subnets"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("VpcId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go index 714165c10a2de4..5f680d591f4f8a 100644 --- a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go +++ b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package resourcegroups import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/resourcegroups/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ResourceGroups() *schema.Table { @@ -12,6 +12,7 @@ func ResourceGroups() *schema.Table { Name: "aws_resourcegroups_resource_groups", Resolver: fetchResourcegroupsResourceGroups, PreResourceResolver: getResourceGroup, + Transform: transformers.TransformWithStruct(&models.ResourceGroupWrapper{}, transformers.WithUnwrapAllEmbeddedStructs()), Multiplex: client.ServiceAccountRegionMultiplexer("resource-groups"), Columns: []schema.Column{ { @@ -37,31 +38,6 @@ func ResourceGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveResourcegroupsResourceGroupTags, }, - { - Name: "group_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupArn"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "query", - Type: schema.TypeString, - Resolver: schema.PathResolver("Query"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/delegation_sets.go b/plugins/source/aws/resources/services/route53/delegation_sets.go index 72409ca7ccda29..3544b81ab7eed3 100644 --- a/plugins/source/aws/resources/services/route53/delegation_sets.go +++ b/plugins/source/aws/resources/services/route53/delegation_sets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DelegationSets() *schema.Table { @@ -12,6 +12,7 @@ func DelegationSets() *schema.Table { Name: "aws_route53_delegation_sets", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_DelegationSet.html`, Resolver: fetchRoute53DelegationSets, + Transform: transformers.TransformWithStruct(&types.DelegationSet{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -28,21 +29,6 @@ func DelegationSets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name_servers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("NameServers"), - }, - { - Name: "caller_reference", - Type: schema.TypeString, - Resolver: schema.PathResolver("CallerReference"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/domains.go b/plugins/source/aws/resources/services/route53/domains.go index cae2532e8d9bef..39823ea8ee334e 100644 --- a/plugins/source/aws/resources/services/route53/domains.go +++ b/plugins/source/aws/resources/services/route53/domains.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53domains" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Domains() *schema.Table { @@ -12,6 +12,7 @@ func Domains() *schema.Table { Name: "aws_route53_domains", Resolver: fetchRoute53Domains, PreResourceResolver: getDomain, + Transform: transformers.TransformWithStruct(&route53domains.GetDomainDetailOutput{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -39,116 +40,6 @@ func Domains() *schema.Table { Name: "transfer_lock", Type: schema.TypeBool, }, - { - Name: "abuse_contact_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("AbuseContactEmail"), - }, - { - Name: "abuse_contact_phone", - Type: schema.TypeString, - Resolver: schema.PathResolver("AbuseContactPhone"), - }, - { - Name: "admin_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdminContact"), - }, - { - Name: "admin_privacy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AdminPrivacy"), - }, - { - Name: "auto_renew", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoRenew"), - }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "dns_sec", - Type: schema.TypeString, - Resolver: schema.PathResolver("DnsSec"), - }, - { - Name: "dnssec_keys", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DnssecKeys"), - }, - { - Name: "expiration_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpirationDate"), - }, - { - Name: "nameservers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Nameservers"), - }, - { - Name: "registrant_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RegistrantContact"), - }, - { - Name: "registrant_privacy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RegistrantPrivacy"), - }, - { - Name: "registrar_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistrarName"), - }, - { - Name: "registrar_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistrarUrl"), - }, - { - Name: "registry_domain_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistryDomainId"), - }, - { - Name: "reseller", - Type: schema.TypeString, - Resolver: schema.PathResolver("Reseller"), - }, - { - Name: "status_list", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("StatusList"), - }, - { - Name: "tech_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TechContact"), - }, - { - Name: "tech_privacy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TechPrivacy"), - }, - { - Name: "updated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedDate"), - }, - { - Name: "who_is_server", - Type: schema.TypeString, - Resolver: schema.PathResolver("WhoIsServer"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/health_checks.go b/plugins/source/aws/resources/services/route53/health_checks.go index fe7bf01c684d00..de7c0c4d0c7536 100644 --- a/plugins/source/aws/resources/services/route53/health_checks.go +++ b/plugins/source/aws/resources/services/route53/health_checks.go @@ -1,10 +1,9 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func HealthChecks() *schema.Table { @@ -12,6 +11,7 @@ func HealthChecks() *schema.Table { Name: "aws_route53_health_checks", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheck.html`, Resolver: fetchRoute53HealthChecks, + Transform: transformers.TransformWithStruct(&Route53HealthCheckWrapper{}, transformers.WithUnwrapStructFields("HealthCheck")), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -37,36 +37,6 @@ func HealthChecks() *schema.Table { Type: schema.TypeJSON, Resolver: resolveRoute53healthCheckCloudWatchAlarmConfigurationDimensions, }, - { - Name: "caller_reference", - Type: schema.TypeString, - Resolver: schema.PathResolver("CallerReference"), - }, - { - Name: "health_check_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HealthCheckConfig"), - }, - { - Name: "health_check_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("HealthCheckVersion"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "cloud_watch_alarm_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CloudWatchAlarmConfiguration"), - }, - { - Name: "linked_service", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LinkedService"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go b/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go index 0e69f7cf0bdd71..2dcedddd707aa0 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func HostedZoneQueryLoggingConfigs() *schema.Table { @@ -12,6 +12,7 @@ func HostedZoneQueryLoggingConfigs() *schema.Table { Name: "aws_route53_hosted_zone_query_logging_configs", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_QueryLoggingConfig.html`, Resolver: fetchRoute53HostedZoneQueryLoggingConfigs, + Transform: transformers.TransformWithStruct(&types.QueryLoggingConfig{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,21 +33,6 @@ func HostedZoneQueryLoggingConfigs() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "cloud_watch_logs_log_group_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CloudWatchLogsLogGroupArn"), - }, - { - Name: "hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostedZoneId"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go b/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go index 6021a314be6dd0..ab95bc777d5a41 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func HostedZoneResourceRecordSets() *schema.Table { @@ -12,6 +12,7 @@ func HostedZoneResourceRecordSets() *schema.Table { Name: "aws_route53_hosted_zone_resource_record_sets", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html`, Resolver: fetchRoute53HostedZoneResourceRecordSets, + Transform: transformers.TransformWithStruct(&types.ResourceRecordSet{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -24,76 +25,6 @@ func HostedZoneResourceRecordSets() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "alias_target", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AliasTarget"), - }, - { - Name: "cidr_routing_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CidrRoutingConfig"), - }, - { - Name: "failover", - Type: schema.TypeString, - Resolver: schema.PathResolver("Failover"), - }, - { - Name: "geo_location", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("GeoLocation"), - }, - { - Name: "health_check_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HealthCheckId"), - }, - { - Name: "multi_value_answer", - Type: schema.TypeBool, - Resolver: schema.PathResolver("MultiValueAnswer"), - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "resource_records", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceRecords"), - }, - { - Name: "set_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("SetIdentifier"), - }, - { - Name: "ttl", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TTL"), - }, - { - Name: "traffic_policy_instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrafficPolicyInstanceId"), - }, - { - Name: "weight", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Weight"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go b/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go index be341c76abc170..511eeca9db6cc4 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func HostedZoneTrafficPolicyInstances() *schema.Table { @@ -12,6 +12,7 @@ func HostedZoneTrafficPolicyInstances() *schema.Table { Name: "aws_route53_hosted_zone_traffic_policy_instances", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicyInstance.html`, Resolver: fetchRoute53HostedZoneTrafficPolicyInstances, + Transform: transformers.TransformWithStruct(&types.TrafficPolicyInstance{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -30,51 +31,6 @@ func HostedZoneTrafficPolicyInstances() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "hosted_zone_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostedZoneId"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "message", - Type: schema.TypeString, - Resolver: schema.PathResolver("Message"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "ttl", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TTL"), - }, - { - Name: "traffic_policy_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrafficPolicyId"), - }, - { - Name: "traffic_policy_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrafficPolicyType"), - }, - { - Name: "traffic_policy_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TrafficPolicyVersion"), - }, }, } } diff --git a/plugins/source/aws/resources/services/route53/hosted_zones.go b/plugins/source/aws/resources/services/route53/hosted_zones.go index 0d773544013e79..6cf684b2bfa49f 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zones.go +++ b/plugins/source/aws/resources/services/route53/hosted_zones.go @@ -1,16 +1,21 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/route53/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func HostedZones() *schema.Table { return &schema.Table{ - Name: "aws_route53_hosted_zones", - Resolver: fetchRoute53HostedZones, + Name: "aws_route53_hosted_zones", + Resolver: fetchRoute53HostedZones, + Transform: transformers.TransformWithStruct( + &models.Route53HostedZoneWrapper{}, + transformers.WithUnwrapStructFields("HostedZone"), + transformers.WithNameTransformer(client.CreateReplaceTransformer(map[string]string{"vp_cs": "vpcs"})), + ), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -26,51 +31,6 @@ func HostedZones() *schema.Table { PrimaryKey: true, }, }, - { - Name: "caller_reference", - Type: schema.TypeString, - Resolver: schema.PathResolver("CallerReference"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Config"), - }, - { - Name: "linked_service", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LinkedService"), - }, - { - Name: "resource_record_set_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ResourceRecordSetCount"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "delegation_set_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DelegationSetId"), - }, - { - Name: "vpcs", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VPCs"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/route53/traffic_policies.go b/plugins/source/aws/resources/services/route53/traffic_policies.go index 5d71157431af40..b00fa4e6eb2c06 100644 --- a/plugins/source/aws/resources/services/route53/traffic_policies.go +++ b/plugins/source/aws/resources/services/route53/traffic_policies.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TrafficPolicies() *schema.Table { @@ -12,6 +12,7 @@ func TrafficPolicies() *schema.Table { Name: "aws_route53_traffic_policies", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicySummary.html`, Resolver: fetchRoute53TrafficPolicies, + Transform: transformers.TransformWithStruct(&types.TrafficPolicySummary{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -27,31 +28,6 @@ func TrafficPolicies() *schema.Table { PrimaryKey: true, }, }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "latest_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LatestVersion"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "traffic_policy_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TrafficPolicyCount"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/route53/traffic_policy_versions.go b/plugins/source/aws/resources/services/route53/traffic_policy_versions.go index e635202b551984..eca41d9f8e7e81 100644 --- a/plugins/source/aws/resources/services/route53/traffic_policy_versions.go +++ b/plugins/source/aws/resources/services/route53/traffic_policy_versions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package route53 import ( + "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TrafficPolicyVersions() *schema.Table { @@ -12,6 +12,7 @@ func TrafficPolicyVersions() *schema.Table { Name: "aws_route53_traffic_policy_versions", Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicy.html`, Resolver: fetchRoute53TrafficPolicyVersions, + Transform: transformers.TransformWithStruct(&types.TrafficPolicy{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -48,21 +49,6 @@ func TrafficPolicyVersions() *schema.Table { Type: schema.TypeJSON, Resolver: schema.PathResolver("Document"), }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "comment", - Type: schema.TypeString, - Resolver: schema.PathResolver("Comment"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/accounts.go b/plugins/source/aws/resources/services/s3/accounts.go index 0d2d9045fc6f9a..463be478f2e932 100644 --- a/plugins/source/aws/resources/services/s3/accounts.go +++ b/plugins/source/aws/resources/services/s3/accounts.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/s3/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Accounts() *schema.Table { return &schema.Table{ Name: "aws_s3_accounts", Resolver: fetchS3Accounts, + Transform: transformers.TransformWithStruct(&models.PublicAccessBlockConfigurationWrapper{}, transformers.WithUnwrapStructFields("PublicAccessBlockConfiguration")), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -21,31 +22,6 @@ func Accounts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "block_public_acls", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BlockPublicAcls"), - }, - { - Name: "block_public_policy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BlockPublicPolicy"), - }, - { - Name: "ignore_public_acls", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IgnorePublicAcls"), - }, - { - Name: "restrict_public_buckets", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RestrictPublicBuckets"), - }, - { - Name: "config_exists", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ConfigExists"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/bucket_cors_rules.go b/plugins/source/aws/resources/services/s3/bucket_cors_rules.go index 26ee7059c3bc4a..83151672910429 100644 --- a/plugins/source/aws/resources/services/s3/bucket_cors_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_cors_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( + "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BucketCorsRules() *schema.Table { @@ -12,6 +12,7 @@ func BucketCorsRules() *schema.Table { Name: "aws_s3_bucket_cors_rules", Description: `https://docs.aws.amazon.com/AmazonS3/latest/API/API_CORSRule.html`, Resolver: fetchS3BucketCorsRules, + Transform: transformers.TransformWithStruct(&types.CORSRule{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -24,36 +25,6 @@ func BucketCorsRules() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "allowed_methods", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AllowedMethods"), - }, - { - Name: "allowed_origins", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AllowedOrigins"), - }, - { - Name: "allowed_headers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AllowedHeaders"), - }, - { - Name: "expose_headers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ExposeHeaders"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ID"), - }, - { - Name: "max_age_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxAgeSeconds"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go b/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go index eda6f649f217a9..ac5856956fd573 100644 --- a/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( + "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BucketEncryptionRules() *schema.Table { @@ -12,6 +12,7 @@ func BucketEncryptionRules() *schema.Table { Name: "aws_s3_bucket_encryption_rules", Description: `https://docs.aws.amazon.com/AmazonS3/latest/API/API_ServerSideEncryptionRule.html`, Resolver: fetchS3BucketEncryptionRules, + Transform: transformers.TransformWithStruct(&types.ServerSideEncryptionRule{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -24,16 +25,6 @@ func BucketEncryptionRules() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "apply_server_side_encryption_by_default", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ApplyServerSideEncryptionByDefault"), - }, - { - Name: "bucket_key_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BucketKeyEnabled"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/bucket_grants.go b/plugins/source/aws/resources/services/s3/bucket_grants.go index cde7034ec73af3..24e3cb87dadf15 100644 --- a/plugins/source/aws/resources/services/s3/bucket_grants.go +++ b/plugins/source/aws/resources/services/s3/bucket_grants.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( + "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BucketGrants() *schema.Table { @@ -12,6 +12,7 @@ func BucketGrants() *schema.Table { Name: "aws_s3_bucket_grants", Description: `https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grant.html`, Resolver: fetchS3BucketGrants, + Transform: transformers.TransformWithStruct(&types.Grant{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -24,16 +25,6 @@ func BucketGrants() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "grantee", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Grantee"), - }, - { - Name: "permission", - Type: schema.TypeString, - Resolver: schema.PathResolver("Permission"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go index c29cbe213c4bf6..813af4e5f63c9d 100644 --- a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go +++ b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( + "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func BucketLifecycles() *schema.Table { @@ -12,6 +12,7 @@ func BucketLifecycles() *schema.Table { Name: "aws_s3_bucket_lifecycles", Description: `https://docs.aws.amazon.com/AmazonS3/latest/API/API_LifecycleRule.html`, Resolver: fetchS3BucketLifecycles, + Transform: transformers.TransformWithStruct(&types.LifecycleRule{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -24,46 +25,6 @@ func BucketLifecycles() *schema.Table { Type: schema.TypeString, Resolver: schema.ParentColumnResolver("arn"), }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "abort_incomplete_multipart_upload", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AbortIncompleteMultipartUpload"), - }, - { - Name: "expiration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Expiration"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ID"), - }, - { - Name: "noncurrent_version_expiration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NoncurrentVersionExpiration"), - }, - { - Name: "noncurrent_version_transitions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NoncurrentVersionTransitions"), - }, - { - Name: "prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("Prefix"), - }, - { - Name: "transitions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Transitions"), - }, }, } } diff --git a/plugins/source/aws/resources/services/s3/buckets.go b/plugins/source/aws/resources/services/s3/buckets.go index 514cb4f2281796..e9ff20b5efe41f 100644 --- a/plugins/source/aws/resources/services/s3/buckets.go +++ b/plugins/source/aws/resources/services/s3/buckets.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package s3 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/s3/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Buckets() *schema.Table { return &schema.Table{ Name: "aws_s3_buckets", Resolver: fetchS3Buckets, + Transform: transformers.TransformWithStruct(&models.WrappedBucket{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -26,86 +27,6 @@ func Buckets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "replication_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReplicationRole"), - }, - { - Name: "replication_rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicationRules"), - }, - { - Name: "region", - Type: schema.TypeString, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "logging_target_bucket", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoggingTargetBucket"), - }, - { - Name: "logging_target_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoggingTargetPrefix"), - }, - { - Name: "policy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Policy"), - }, - { - Name: "versioning_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersioningStatus"), - }, - { - Name: "versioning_mfa_delete", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersioningMfaDelete"), - }, - { - Name: "block_public_acls", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BlockPublicAcls"), - }, - { - Name: "block_public_policy", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BlockPublicPolicy"), - }, - { - Name: "ignore_public_acls", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IgnorePublicAcls"), - }, - { - Name: "restrict_public_buckets", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RestrictPublicBuckets"), - }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "ownership_controls", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("OwnershipControls"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go index 4e1563a6830aa2..e12c97afa2d21c 100644 --- a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go +++ b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package sagemaker import ( + "github.com/aws/aws-sdk-go-v2/service/sagemaker" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EndpointConfigurations() *schema.Table { @@ -12,6 +12,7 @@ func EndpointConfigurations() *schema.Table { Name: "aws_sagemaker_endpoint_configurations", Resolver: fetchSagemakerEndpointConfigurations, PreResourceResolver: getEndpointConfiguration, + Transform: transformers.TransformWithStruct(&sagemaker.DescribeEndpointConfigOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("api.sagemaker"), Columns: []schema.Column{ { @@ -38,51 +39,6 @@ func EndpointConfigurations() *schema.Table { Resolver: resolveSagemakerEndpointConfigurationTags, Description: `The tags associated with the model.`, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "endpoint_config_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointConfigName"), - }, - { - Name: "production_variants", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProductionVariants"), - }, - { - Name: "async_inference_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AsyncInferenceConfig"), - }, - { - Name: "data_capture_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DataCaptureConfig"), - }, - { - Name: "explainer_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExplainerConfig"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "shadow_production_variants", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ShadowProductionVariants"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sagemaker/models.go b/plugins/source/aws/resources/services/sagemaker/models.go index dca9b8a454744a..64ba1fa49dfddf 100644 --- a/plugins/source/aws/resources/services/sagemaker/models.go +++ b/plugins/source/aws/resources/services/sagemaker/models.go @@ -1,10 +1,9 @@ -// Code generated by codegen; DO NOT EDIT. - package sagemaker import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Models() *schema.Table { @@ -12,6 +11,7 @@ func Models() *schema.Table { Name: "aws_sagemaker_models", Resolver: fetchSagemakerModels, PreResourceResolver: getModel, + Transform: transformers.TransformWithStruct(&WrappedSageMakerModel{}, transformers.WithUnwrapStructFields("DescribeModelOutput")), Multiplex: client.ServiceAccountRegionMultiplexer("api.sagemaker"), Columns: []schema.Column{ { @@ -38,51 +38,6 @@ func Models() *schema.Table { Resolver: resolveSagemakerModelTags, Description: `The tags associated with the model.`, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "execution_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ExecutionRoleArn"), - }, - { - Name: "model_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ModelName"), - }, - { - Name: "containers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Containers"), - }, - { - Name: "enable_network_isolation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableNetworkIsolation"), - }, - { - Name: "inference_execution_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InferenceExecutionConfig"), - }, - { - Name: "primary_container", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrimaryContainer"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go index 4e23ad5893b398..4623257b61b763 100644 --- a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go +++ b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go @@ -1,10 +1,9 @@ -// Code generated by codegen; DO NOT EDIT. - package sagemaker import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func NotebookInstances() *schema.Table { @@ -12,6 +11,7 @@ func NotebookInstances() *schema.Table { Name: "aws_sagemaker_notebook_instances", Resolver: fetchSagemakerNotebookInstances, PreResourceResolver: getNotebookInstance, + Transform: transformers.TransformWithStruct(&WrappedSageMakerNotebookInstance{}, transformers.WithUnwrapStructFields("DescribeNotebookInstanceOutput")), Multiplex: client.ServiceAccountRegionMultiplexer("api.sagemaker"), Columns: []schema.Column{ { @@ -38,116 +38,6 @@ func NotebookInstances() *schema.Table { Resolver: resolveSagemakerNotebookInstanceTags, Description: `The tags associated with the notebook instance.`, }, - { - Name: "accelerator_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AcceleratorTypes"), - }, - { - Name: "additional_code_repositories", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AdditionalCodeRepositories"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "default_code_repository", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultCodeRepository"), - }, - { - Name: "direct_internet_access", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectInternetAccess"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "instance_metadata_service_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InstanceMetadataServiceConfiguration"), - }, - { - Name: "instance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceType"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "network_interface_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("NetworkInterfaceId"), - }, - { - Name: "notebook_instance_lifecycle_config_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("NotebookInstanceLifecycleConfigName"), - }, - { - Name: "notebook_instance_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("NotebookInstanceName"), - }, - { - Name: "notebook_instance_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("NotebookInstanceStatus"), - }, - { - Name: "platform_identifier", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformIdentifier"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "root_access", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootAccess"), - }, - { - Name: "security_groups", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SecurityGroups"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, - { - Name: "volume_size_in_gb", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VolumeSizeInGB"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sagemaker/training_jobs.go b/plugins/source/aws/resources/services/sagemaker/training_jobs.go index 96c5a8305b7e6c..96560a6b83ca20 100644 --- a/plugins/source/aws/resources/services/sagemaker/training_jobs.go +++ b/plugins/source/aws/resources/services/sagemaker/training_jobs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package sagemaker import ( + "github.com/aws/aws-sdk-go-v2/service/sagemaker" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TrainingJobs() *schema.Table { @@ -12,6 +12,7 @@ func TrainingJobs() *schema.Table { Name: "aws_sagemaker_training_jobs", Resolver: fetchSagemakerTrainingJobs, PreResourceResolver: getTrainingJob, + Transform: transformers.TransformWithStruct(&sagemaker.DescribeTrainingJobOutput{}), Multiplex: client.ServiceAccountRegionMultiplexer("api.sagemaker"), Columns: []schema.Column{ { @@ -38,211 +39,6 @@ func TrainingJobs() *schema.Table { Resolver: resolveSagemakerTrainingJobTags, Description: `The tags associated with the model.`, }, - { - Name: "algorithm_specification", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AlgorithmSpecification"), - }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "model_artifacts", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ModelArtifacts"), - }, - { - Name: "resource_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResourceConfig"), - }, - { - Name: "secondary_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecondaryStatus"), - }, - { - Name: "stopping_condition", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("StoppingCondition"), - }, - { - Name: "training_job_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrainingJobName"), - }, - { - Name: "training_job_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("TrainingJobStatus"), - }, - { - Name: "auto_ml_job_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoMLJobArn"), - }, - { - Name: "billable_time_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("BillableTimeInSeconds"), - }, - { - Name: "checkpoint_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CheckpointConfig"), - }, - { - Name: "debug_hook_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DebugHookConfig"), - }, - { - Name: "debug_rule_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DebugRuleConfigurations"), - }, - { - Name: "debug_rule_evaluation_statuses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DebugRuleEvaluationStatuses"), - }, - { - Name: "enable_inter_container_traffic_encryption", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableInterContainerTrafficEncryption"), - }, - { - Name: "enable_managed_spot_training", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableManagedSpotTraining"), - }, - { - Name: "enable_network_isolation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EnableNetworkIsolation"), - }, - { - Name: "environment", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Environment"), - }, - { - Name: "experiment_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExperimentConfig"), - }, - { - Name: "failure_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureReason"), - }, - { - Name: "final_metric_data_list", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FinalMetricDataList"), - }, - { - Name: "hyper_parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("HyperParameters"), - }, - { - Name: "input_data_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InputDataConfig"), - }, - { - Name: "labeling_job_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("LabelingJobArn"), - }, - { - Name: "last_modified_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedTime"), - }, - { - Name: "output_data_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("OutputDataConfig"), - }, - { - Name: "profiler_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProfilerConfig"), - }, - { - Name: "profiler_rule_configurations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProfilerRuleConfigurations"), - }, - { - Name: "profiler_rule_evaluation_statuses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProfilerRuleEvaluationStatuses"), - }, - { - Name: "profiling_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProfilingStatus"), - }, - { - Name: "retry_strategy", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RetryStrategy"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "secondary_status_transitions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SecondaryStatusTransitions"), - }, - { - Name: "tensor_board_output_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TensorBoardOutputConfig"), - }, - { - Name: "training_end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TrainingEndTime"), - }, - { - Name: "training_start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TrainingStartTime"), - }, - { - Name: "training_time_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TrainingTimeInSeconds"), - }, - { - Name: "tuning_job_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TuningJobArn"), - }, - { - Name: "vpc_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VpcConfig"), - }, - { - Name: "warm_pool_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WarmPoolStatus"), - }, - { - Name: "result_metadata", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ResultMetadata"), - }, }, } } diff --git a/plugins/source/aws/resources/services/scheduler/schedule_groups.go b/plugins/source/aws/resources/services/scheduler/schedule_groups.go index fafc49abb25312..02193ce325b162 100644 --- a/plugins/source/aws/resources/services/scheduler/schedule_groups.go +++ b/plugins/source/aws/resources/services/scheduler/schedule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package scheduler import ( + "github.com/aws/aws-sdk-go-v2/service/scheduler/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ScheduleGroups() *schema.Table { @@ -12,6 +12,7 @@ func ScheduleGroups() *schema.Table { Name: "aws_scheduler_schedule_groups", Description: `https://docs.aws.amazon.com/scheduler/latest/APIReference/API_ScheduleGroupSummary.html`, Resolver: fetchSchedulerScheduleGroups, + Transform: transformers.TransformWithStruct(&types.ScheduleGroupSummary{}), Multiplex: client.ServiceAccountRegionMultiplexer("scheduler"), Columns: []schema.Column{ { @@ -37,26 +38,6 @@ func ScheduleGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "last_modification_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModificationDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, }, } } diff --git a/plugins/source/aws/resources/services/scheduler/schedules.go b/plugins/source/aws/resources/services/scheduler/schedules.go index 6d58c12c54bf90..8b52cad9d034d4 100644 --- a/plugins/source/aws/resources/services/scheduler/schedules.go +++ b/plugins/source/aws/resources/services/scheduler/schedules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package scheduler import ( + "github.com/aws/aws-sdk-go-v2/service/scheduler" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Schedules() *schema.Table { @@ -13,6 +13,7 @@ func Schedules() *schema.Table { Description: `https://docs.aws.amazon.com/scheduler/latest/APIReference/API_GetScheduleOutput.html`, Resolver: fetchSchedulerSchedules, PreResourceResolver: getSchedule, + Transform: transformers.TransformWithStruct(&scheduler.GetScheduleOutput{}, transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("scheduler"), Columns: []schema.Column{ { @@ -38,71 +39,6 @@ func Schedules() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "end_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndDate"), - }, - { - Name: "flexible_time_window", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("FlexibleTimeWindow"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "kms_key_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyArn"), - }, - { - Name: "last_modification_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModificationDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "schedule_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScheduleExpression"), - }, - { - Name: "schedule_expression_timezone", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScheduleExpressionTimezone"), - }, - { - Name: "start_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartDate"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "target", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Target"), - }, }, } } diff --git a/plugins/source/aws/resources/services/secretsmanager/secrets.go b/plugins/source/aws/resources/services/secretsmanager/secrets.go index db90b3b522f963..eb25206f66846c 100644 --- a/plugins/source/aws/resources/services/secretsmanager/secrets.go +++ b/plugins/source/aws/resources/services/secretsmanager/secrets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package secretsmanager import ( + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Secrets() *schema.Table { @@ -12,6 +12,7 @@ func Secrets() *schema.Table { Name: "aws_secretsmanager_secrets", Description: `https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecrets.html`, Resolver: fetchSecretsmanagerSecrets, + Transform: transformers.TransformWithStruct(&secretsmanager.DescribeSecretOutput{}, transformers.WithSkipFields("ResultMetadata")), PreResourceResolver: getSecret, Multiplex: client.ServiceAccountRegionMultiplexer("secretsmanager"), Columns: []schema.Column{ @@ -39,91 +40,11 @@ func Secrets() *schema.Table { Resolver: fetchSecretsmanagerSecretPolicy, Description: `A JSON-formatted string that describes the permissions that are associated with the attached secret.`, }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "deleted_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("DeletedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "last_accessed_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAccessedDate"), - }, - { - Name: "last_changed_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastChangedDate"), - }, - { - Name: "last_rotated_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastRotatedDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "next_rotation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NextRotationDate"), - }, - { - Name: "owning_service", - Type: schema.TypeString, - Resolver: schema.PathResolver("OwningService"), - }, - { - Name: "primary_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrimaryRegion"), - }, - { - Name: "replication_status", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReplicationStatus"), - }, - { - Name: "rotation_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RotationEnabled"), - }, - { - Name: "rotation_lambda_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RotationLambdaARN"), - }, - { - Name: "rotation_rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RotationRules"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "version_ids_to_stages", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VersionIdsToStages"), - }, }, } } diff --git a/plugins/source/aws/resources/services/servicecatalog/portfolios.go b/plugins/source/aws/resources/services/servicecatalog/portfolios.go index 684cd2d5bd73da..ca3af565878a9d 100644 --- a/plugins/source/aws/resources/services/servicecatalog/portfolios.go +++ b/plugins/source/aws/resources/services/servicecatalog/portfolios.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package servicecatalog import ( + "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Portfolios() *schema.Table { @@ -12,6 +12,7 @@ func Portfolios() *schema.Table { Name: "aws_servicecatalog_portfolios", Description: `https://docs.aws.amazon.com/servicecatalog/latest/dg/API_PortfolioDetail.html`, Resolver: fetchServicecatalogPortfolios, + Transform: transformers.TransformWithStruct(&types.PortfolioDetail{}), Multiplex: client.ServiceAccountRegionMultiplexer("servicecatalog"), Columns: []schema.Column{ { @@ -32,31 +33,6 @@ func Portfolios() *schema.Table { Type: schema.TypeJSON, Resolver: resolvePortfolioTags, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "provider_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/servicecatalog/products.go b/plugins/source/aws/resources/services/servicecatalog/products.go index 90166528db850b..d18b671f9201ac 100644 --- a/plugins/source/aws/resources/services/servicecatalog/products.go +++ b/plugins/source/aws/resources/services/servicecatalog/products.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package servicecatalog import ( + "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Products() *schema.Table { @@ -12,6 +12,7 @@ func Products() *schema.Table { Name: "aws_servicecatalog_products", Description: `https://docs.aws.amazon.com/servicecatalog/latest/dg/API_ProductViewDetail.html`, Resolver: fetchServicecatalogProducts, + Transform: transformers.TransformWithStruct(&types.ProductViewDetail{}), Multiplex: client.ServiceAccountRegionMultiplexer("servicecatalog"), Columns: []schema.Column{ { @@ -32,26 +33,6 @@ func Products() *schema.Table { Type: schema.TypeJSON, Resolver: resolveProductTags, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "product_view_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProductViewSummary"), - }, - { - Name: "source_connection", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceConnection"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go index ff1887f1f3d983..2d8ad0f58a3c1f 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package servicecatalog import ( + "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ProvisionedProducts() *schema.Table { @@ -12,6 +12,7 @@ func ProvisionedProducts() *schema.Table { Name: "aws_servicecatalog_provisioned_products", Description: `https://docs.aws.amazon.com/servicecatalog/latest/dg/API_ProvisionedProductAttribute.html`, Resolver: fetchServicecatalogProvisionedProducts, + Transform: transformers.TransformWithStruct(&types.ProvisionedProductAttribute{}), Multiplex: client.ServiceAccountRegionMultiplexer("servicecatalog"), Columns: []schema.Column{ { @@ -32,91 +33,6 @@ func ProvisionedProducts() *schema.Table { Type: schema.TypeJSON, Resolver: resolveProvisionedProductTags, }, - { - Name: "created_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTime"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "idempotency_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdempotencyToken"), - }, - { - Name: "last_provisioning_record_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastProvisioningRecordId"), - }, - { - Name: "last_record_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastRecordId"), - }, - { - Name: "last_successful_provisioning_record_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastSuccessfulProvisioningRecordId"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "physical_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PhysicalId"), - }, - { - Name: "product_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductId"), - }, - { - Name: "product_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductName"), - }, - { - Name: "provisioning_artifact_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProvisioningArtifactId"), - }, - { - Name: "provisioning_artifact_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProvisioningArtifactName"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "user_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserArn"), - }, - { - Name: "user_arn_session", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserArnSession"), - }, }, } } diff --git a/plugins/source/aws/resources/services/servicequotas/quotas.go b/plugins/source/aws/resources/services/servicequotas/quotas.go index 2a1b3435b7bd54..0c9939da4db779 100644 --- a/plugins/source/aws/resources/services/servicequotas/quotas.go +++ b/plugins/source/aws/resources/services/servicequotas/quotas.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package servicequotas import ( + "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Quotas() *schema.Table { @@ -12,6 +12,7 @@ func Quotas() *schema.Table { Name: "aws_servicequotas_quotas", Description: `https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceQuota.html`, Resolver: fetchServicequotasQuotas, + Transform: transformers.TransformWithStruct(&types.ServiceQuota{}), Columns: []schema.Column{ { Name: "account_id", @@ -31,61 +32,6 @@ func Quotas() *schema.Table { PrimaryKey: true, }, }, - { - Name: "adjustable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Adjustable"), - }, - { - Name: "error_reason", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ErrorReason"), - }, - { - Name: "global_quota", - Type: schema.TypeBool, - Resolver: schema.PathResolver("GlobalQuota"), - }, - { - Name: "period", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Period"), - }, - { - Name: "quota_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("QuotaCode"), - }, - { - Name: "quota_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("QuotaName"), - }, - { - Name: "service_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceCode"), - }, - { - Name: "service_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceName"), - }, - { - Name: "unit", - Type: schema.TypeString, - Resolver: schema.PathResolver("Unit"), - }, - { - Name: "usage_metric", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UsageMetric"), - }, - { - Name: "value", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Value"), - }, }, } } diff --git a/plugins/source/aws/resources/services/servicequotas/services.go b/plugins/source/aws/resources/services/servicequotas/services.go index c4f23e8cafb146..5ded59950aff1c 100644 --- a/plugins/source/aws/resources/services/servicequotas/services.go +++ b/plugins/source/aws/resources/services/servicequotas/services.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package servicequotas import ( + "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Services() *schema.Table { @@ -12,6 +12,7 @@ func Services() *schema.Table { Name: "aws_servicequotas_services", Description: `https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceInfo.html`, Resolver: fetchServicequotasServices, + Transform: transformers.TransformWithStruct(&types.ServiceInfo{}), Multiplex: client.ServiceAccountRegionMultiplexer("servicequotas"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go b/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go index 75d64e279d70ae..c524d1419b96d2 100644 --- a/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go +++ b/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go @@ -3,8 +3,10 @@ package ses import ( + "github.com/aws/aws-sdk-go-v2/service/ses" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ActiveReceiptRuleSets() *schema.Table { @@ -12,6 +14,7 @@ func ActiveReceiptRuleSets() *schema.Table { Name: "aws_ses_active_receipt_rule_sets", Description: `https://docs.aws.amazon.com/ses/latest/APIReference/API_DescribeActiveReceiptRuleSet.html`, Resolver: fetchSesActiveReceiptRuleSets, + Transform: transformers.TransformWithStruct(&ses.DescribeActiveReceiptRuleSetOutput{}, transformers.WithSkipFields("Metadata", "ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { diff --git a/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go b/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go index 95edc5d8e2cce3..8942c5c56c8804 100644 --- a/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go +++ b/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( + "github.com/aws/aws-sdk-go-v2/service/sesv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigurationSetEventDestinations() *schema.Table { @@ -12,6 +12,7 @@ func ConfigurationSetEventDestinations() *schema.Table { Name: "aws_ses_configuration_set_event_destinations", Description: `https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_EventDestination.html`, Resolver: fetchSesConfigurationSetEventDestinations, + Transform: transformers.TransformWithStruct(&types.EventDestination{}), Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { @@ -38,11 +39,6 @@ func ConfigurationSetEventDestinations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "matching_event_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("MatchingEventTypes"), - }, { Name: "name", Type: schema.TypeString, @@ -51,31 +47,6 @@ func ConfigurationSetEventDestinations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cloud_watch_destination", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CloudWatchDestination"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "kinesis_firehose_destination", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("KinesisFirehoseDestination"), - }, - { - Name: "pinpoint_destination", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PinpointDestination"), - }, - { - Name: "sns_destination", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SnsDestination"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ses/configuration_sets.go b/plugins/source/aws/resources/services/ses/configuration_sets.go index 457a340907d9c9..abfb351f37b67f 100644 --- a/plugins/source/aws/resources/services/ses/configuration_sets.go +++ b/plugins/source/aws/resources/services/ses/configuration_sets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( + "github.com/aws/aws-sdk-go-v2/service/sesv2" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ConfigurationSets() *schema.Table { @@ -13,7 +13,12 @@ func ConfigurationSets() *schema.Table { Description: `https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetConfigurationSet.html`, Resolver: fetchSesConfigurationSets, PreResourceResolver: getConfigurationSet, - Multiplex: client.ServiceAccountRegionMultiplexer("email"), + Transform: transformers.TransformWithStruct( + &sesv2.GetConfigurationSetOutput{}, + transformers.WithSkipFields("ResultMetadata"), + transformers.WithNameTransformer(client.CreateTrimPrefixTransformer("configuration_set_")), + ), + Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { Name: "account_id", @@ -33,46 +38,11 @@ func ConfigurationSets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigurationSetName"), - }, - { - Name: "delivery_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DeliveryOptions"), - }, - { - Name: "reputation_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReputationOptions"), - }, - { - Name: "sending_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SendingOptions"), - }, - { - Name: "suppression_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SuppressionOptions"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "tracking_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TrackingOptions"), - }, - { - Name: "vdm_options", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VdmOptions"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/ses/contact_lists.go b/plugins/source/aws/resources/services/ses/contact_lists.go index 87c12c58bd2b32..19393f29d4ed62 100644 --- a/plugins/source/aws/resources/services/ses/contact_lists.go +++ b/plugins/source/aws/resources/services/ses/contact_lists.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( + "github.com/aws/aws-sdk-go-v2/service/sesv2" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ContactLists() *schema.Table { @@ -13,6 +13,7 @@ func ContactLists() *schema.Table { Description: `https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetContactList.html`, Resolver: fetchSesContactLists, PreResourceResolver: getContactList, + Transform: transformers.TransformWithStruct(&sesv2.GetContactListOutput{}, transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { @@ -39,31 +40,11 @@ func ContactLists() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTimestamp"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "last_updated_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTimestamp"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "topics", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Topics"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go b/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go index 51803f89b0fbf0..cabacfb3563927 100644 --- a/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go +++ b/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( + "github.com/aws/aws-sdk-go-v2/service/sesv2" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func CustomVerificationEmailTemplates() *schema.Table { @@ -13,7 +13,12 @@ func CustomVerificationEmailTemplates() *schema.Table { Description: `https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetCustomVerificationEmailTemplate.html`, Resolver: fetchSesCustomVerificationEmailTemplates, PreResourceResolver: getCustomVerificationEmailTemplate, - Multiplex: client.ServiceAccountRegionMultiplexer("email"), + Transform: transformers.TransformWithStruct( + &sesv2.GetCustomVerificationEmailTemplateOutput{}, + transformers.WithSkipFields("ResultMetadata"), + transformers.WithNameTransformer(client.CreateTrimPrefixTransformer("template_")), + ), + Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { Name: "account_id", @@ -33,36 +38,6 @@ func CustomVerificationEmailTemplates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "failure_redirection_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("FailureRedirectionURL"), - }, - { - Name: "from_email_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("FromEmailAddress"), - }, - { - Name: "success_redirection_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("SuccessRedirectionURL"), - }, - { - Name: "content", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateContent"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateName"), - }, - { - Name: "subject", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateSubject"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ses/identities.go b/plugins/source/aws/resources/services/ses/identities.go index 44fa09125bba9a..ee3d012c42552a 100644 --- a/plugins/source/aws/resources/services/ses/identities.go +++ b/plugins/source/aws/resources/services/ses/identities.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ses/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Identities() *schema.Table { @@ -13,6 +13,7 @@ func Identities() *schema.Table { Description: `https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetEmailIdentity.html`, Resolver: fetchSesIdentities, PreResourceResolver: getIdentity, + Transform: transformers.TransformWithStruct(&models.EmailIdentity{}, transformers.WithUnwrapStructFields("GetEmailIdentityOutput"), transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { @@ -33,61 +34,11 @@ func Identities() *schema.Table { PrimaryKey: true, }, }, - { - Name: "identity_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityName"), - }, - { - Name: "sending_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SendingEnabled"), - }, - { - Name: "configuration_set_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigurationSetName"), - }, - { - Name: "dkim_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DkimAttributes"), - }, - { - Name: "feedback_forwarding_status", - Type: schema.TypeBool, - Resolver: schema.PathResolver("FeedbackForwardingStatus"), - }, - { - Name: "identity_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityType"), - }, - { - Name: "mail_from_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MailFromAttributes"), - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Policies"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "verification_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("VerificationStatus"), - }, - { - Name: "verified_for_sending_status", - Type: schema.TypeBool, - Resolver: schema.PathResolver("VerifiedForSendingStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ses/templates.go b/plugins/source/aws/resources/services/ses/templates.go index bcf376deb60951..e771f6a708f462 100644 --- a/plugins/source/aws/resources/services/ses/templates.go +++ b/plugins/source/aws/resources/services/ses/templates.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ses import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/ses/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Templates() *schema.Table { @@ -12,6 +12,7 @@ func Templates() *schema.Table { Name: "aws_ses_templates", Resolver: fetchSesTemplates, PreResourceResolver: getTemplate, + Transform: transformers.TransformWithStruct(&models.Template{}), Multiplex: client.ServiceAccountRegionMultiplexer("email"), Columns: []schema.Column{ { @@ -32,31 +33,6 @@ func Templates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "template_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateName"), - }, - { - Name: "html", - Type: schema.TypeString, - Resolver: schema.PathResolver("Html"), - }, - { - Name: "subject", - Type: schema.TypeString, - Resolver: schema.PathResolver("Subject"), - }, - { - Name: "text", - Type: schema.TypeString, - Resolver: schema.PathResolver("Text"), - }, - { - Name: "created_timestamp", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedTimestamp"), - }, }, } } diff --git a/plugins/source/aws/resources/services/shield/attacks.go b/plugins/source/aws/resources/services/shield/attacks.go index 9a544bdb36bc91..94fedd977d4ea9 100644 --- a/plugins/source/aws/resources/services/shield/attacks.go +++ b/plugins/source/aws/resources/services/shield/attacks.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package shield import ( + "github.com/aws/aws-sdk-go-v2/service/shield/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Attacks() *schema.Table { @@ -13,6 +13,7 @@ func Attacks() *schema.Table { Description: `https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_AttackDetail.html`, Resolver: fetchShieldAttacks, PreResourceResolver: getAttack, + Transform: transformers.TransformWithStruct(&types.AttackDetail{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -29,41 +30,6 @@ func Attacks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attack_counters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AttackCounters"), - }, - { - Name: "attack_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AttackProperties"), - }, - { - Name: "end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndTime"), - }, - { - Name: "mitigations", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Mitigations"), - }, - { - Name: "resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceArn"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "sub_resources", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SubResources"), - }, }, } } diff --git a/plugins/source/aws/resources/services/shield/protection_groups.go b/plugins/source/aws/resources/services/shield/protection_groups.go index 67e3b7d27597e7..699a5b9ae011f6 100644 --- a/plugins/source/aws/resources/services/shield/protection_groups.go +++ b/plugins/source/aws/resources/services/shield/protection_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package shield import ( + "github.com/aws/aws-sdk-go-v2/service/shield/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ProtectionGroups() *schema.Table { @@ -12,6 +12,7 @@ func ProtectionGroups() *schema.Table { Name: "aws_shield_protection_groups", Description: `https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_ProtectionGroup.html`, Resolver: fetchShieldProtectionGroups, + Transform: transformers.TransformWithStruct(&types.ProtectionGroup{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,31 +33,6 @@ func ProtectionGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveShieldProtectionGroupTags, }, - { - Name: "aggregation", - Type: schema.TypeString, - Resolver: schema.PathResolver("Aggregation"), - }, - { - Name: "members", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Members"), - }, - { - Name: "pattern", - Type: schema.TypeString, - Resolver: schema.PathResolver("Pattern"), - }, - { - Name: "protection_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProtectionGroupId"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, }, } } diff --git a/plugins/source/aws/resources/services/shield/protections.go b/plugins/source/aws/resources/services/shield/protections.go index 791ef08fe11add..2da6804a77e15d 100644 --- a/plugins/source/aws/resources/services/shield/protections.go +++ b/plugins/source/aws/resources/services/shield/protections.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package shield import ( + "github.com/aws/aws-sdk-go-v2/service/shield/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Protections() *schema.Table { @@ -12,6 +12,7 @@ func Protections() *schema.Table { Name: "aws_shield_protections", Description: `https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Protection.html`, Resolver: fetchShieldProtections, + Transform: transformers.TransformWithStruct(&types.Protection{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,31 +33,6 @@ func Protections() *schema.Table { Type: schema.TypeJSON, Resolver: resolveShieldProtectionTags, }, - { - Name: "application_layer_automatic_response_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ApplicationLayerAutomaticResponseConfiguration"), - }, - { - Name: "health_check_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("HealthCheckIds"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "resource_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceArn"), - }, }, } } diff --git a/plugins/source/aws/resources/services/shield/subscriptions.go b/plugins/source/aws/resources/services/shield/subscriptions.go index d0617be87e0b76..d78a2e72d6edd1 100644 --- a/plugins/source/aws/resources/services/shield/subscriptions.go +++ b/plugins/source/aws/resources/services/shield/subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package shield import ( + "github.com/aws/aws-sdk-go-v2/service/shield/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Subscriptions() *schema.Table { @@ -12,6 +12,7 @@ func Subscriptions() *schema.Table { Name: "aws_shield_subscriptions", Description: `https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Subscription.html`, Resolver: fetchShieldSubscriptions, + Transform: transformers.TransformWithStruct(&types.Subscription{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -27,41 +28,6 @@ func Subscriptions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "subscription_limits", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SubscriptionLimits"), - }, - { - Name: "auto_renew", - Type: schema.TypeString, - Resolver: schema.PathResolver("AutoRenew"), - }, - { - Name: "end_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndTime"), - }, - { - Name: "limits", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Limits"), - }, - { - Name: "proactive_engagement_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProactiveEngagementStatus"), - }, - { - Name: "start_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartTime"), - }, - { - Name: "time_commitment_in_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TimeCommitmentInSeconds"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sns/subscriptions.go b/plugins/source/aws/resources/services/sns/subscriptions.go index dde57d20aca86e..49f966da62d8d7 100644 --- a/plugins/source/aws/resources/services/sns/subscriptions.go +++ b/plugins/source/aws/resources/services/sns/subscriptions.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package sns import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/sns/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Subscriptions() *schema.Table { @@ -12,6 +12,7 @@ func Subscriptions() *schema.Table { Name: "aws_sns_subscriptions", Resolver: fetchSnsSubscriptions, PreResourceResolver: getSnsSubscription, + Transform: transformers.TransformWithStruct(&models.Subscription{}), Multiplex: client.ServiceAccountRegionMultiplexer("sns"), Columns: []schema.Column{ { @@ -52,51 +53,6 @@ func Subscriptions() *schema.Table { Type: schema.TypeJSON, Resolver: schema.PathResolver("RedrivePolicy"), }, - { - Name: "endpoint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Endpoint"), - }, - { - Name: "owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "topic_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("TopicArn"), - }, - { - Name: "confirmation_was_authenticated", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ConfirmationWasAuthenticated"), - }, - { - Name: "pending_confirmation", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PendingConfirmation"), - }, - { - Name: "raw_message_delivery", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RawMessageDelivery"), - }, - { - Name: "subscription_role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubscriptionRoleArn"), - }, - { - Name: "unknown_fields", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UnknownFields"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sns/topics.go b/plugins/source/aws/resources/services/sns/topics.go index bfdfba65eb1c89..415f1988ad137b 100644 --- a/plugins/source/aws/resources/services/sns/topics.go +++ b/plugins/source/aws/resources/services/sns/topics.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package sns import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/sns/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Topics() *schema.Table { @@ -12,6 +12,7 @@ func Topics() *schema.Table { Name: "aws_sns_topics", Resolver: fetchSnsTopics, PreResourceResolver: getTopic, + Transform: transformers.TransformWithStruct(&models.Topic{}), Multiplex: client.ServiceAccountRegionMultiplexer("sns"), Columns: []schema.Column{ { @@ -52,51 +53,6 @@ func Topics() *schema.Table { Type: schema.TypeJSON, Resolver: schema.PathResolver("EffectiveDeliveryPolicy"), }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "subscriptions_confirmed", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SubscriptionsConfirmed"), - }, - { - Name: "subscriptions_deleted", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SubscriptionsDeleted"), - }, - { - Name: "subscriptions_pending", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SubscriptionsPending"), - }, - { - Name: "kms_master_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsMasterKeyId"), - }, - { - Name: "fifo_topic", - Type: schema.TypeBool, - Resolver: schema.PathResolver("FifoTopic"), - }, - { - Name: "content_based_deduplication", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ContentBasedDeduplication"), - }, - { - Name: "unknown_fields", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("UnknownFields"), - }, }, } } diff --git a/plugins/source/aws/resources/services/sqs/queues.go b/plugins/source/aws/resources/services/sqs/queues.go index bba9b943fb64a2..f8a3021a02cc49 100644 --- a/plugins/source/aws/resources/services/sqs/queues.go +++ b/plugins/source/aws/resources/services/sqs/queues.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package sqs import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/sqs/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Queues() *schema.Table { @@ -12,6 +12,7 @@ func Queues() *schema.Table { Name: "aws_sqs_queues", Resolver: fetchSqsQueues, PreResourceResolver: getQueue, + Transform: transformers.TransformWithStruct(&models.Queue{}), Multiplex: client.ServiceAccountRegionMultiplexer("sqs"), Columns: []schema.Column{ { @@ -32,11 +33,6 @@ func Queues() *schema.Table { PrimaryKey: true, }, }, - { - Name: "tags", - Type: schema.TypeJSON, - Resolver: resolveSqsQueueTags, - }, { Name: "policy", Type: schema.TypeJSON, @@ -53,99 +49,9 @@ func Queues() *schema.Table { Resolver: schema.PathResolver("RedriveAllowPolicy"), }, { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, - { - Name: "approximate_number_of_messages", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ApproximateNumberOfMessages"), - }, - { - Name: "approximate_number_of_messages_delayed", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ApproximateNumberOfMessagesDelayed"), - }, - { - Name: "approximate_number_of_messages_not_visible", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ApproximateNumberOfMessagesNotVisible"), - }, - { - Name: "created_timestamp", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CreatedTimestamp"), - }, - { - Name: "delay_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DelaySeconds"), - }, - { - Name: "last_modified_timestamp", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LastModifiedTimestamp"), - }, - { - Name: "maximum_message_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaximumMessageSize"), - }, - { - Name: "message_retention_period", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MessageRetentionPeriod"), - }, - { - Name: "receive_message_wait_time_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ReceiveMessageWaitTimeSeconds"), - }, - { - Name: "visibility_timeout", - Type: schema.TypeInt, - Resolver: schema.PathResolver("VisibilityTimeout"), - }, - { - Name: "kms_master_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsMasterKeyId"), - }, - { - Name: "kms_data_key_reuse_period_seconds", - Type: schema.TypeInt, - Resolver: schema.PathResolver("KmsDataKeyReusePeriodSeconds"), - }, - { - Name: "sqs_managed_sse_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SqsManagedSseEnabled"), - }, - { - Name: "fifo_queue", - Type: schema.TypeBool, - Resolver: schema.PathResolver("FifoQueue"), - }, - { - Name: "content_based_deduplication", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ContentBasedDeduplication"), - }, - { - Name: "deduplication_scope", - Type: schema.TypeString, - Resolver: schema.PathResolver("DeduplicationScope"), - }, - { - Name: "fifo_throughput_limit", - Type: schema.TypeString, - Resolver: schema.PathResolver("FifoThroughputLimit"), - }, - { - Name: "unknown_fields", + Name: "tags", Type: schema.TypeJSON, - Resolver: schema.PathResolver("UnknownFields"), + Resolver: resolveSqsQueueTags, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/associations.go b/plugins/source/aws/resources/services/ssm/associations.go index 6a0d1bafb1107a..b2eb7299ca8556 100644 --- a/plugins/source/aws/resources/services/ssm/associations.go +++ b/plugins/source/aws/resources/services/ssm/associations.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Associations() *schema.Table { @@ -12,6 +12,7 @@ func Associations() *schema.Table { Name: "aws_ssm_associations", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_Association.html`, Resolver: fetchSsmAssociations, + Transform: transformers.TransformWithStruct(&types.Association{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,61 +39,6 @@ func Associations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "association_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationName"), - }, - { - Name: "association_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationVersion"), - }, - { - Name: "document_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocumentVersion"), - }, - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceId"), - }, - { - Name: "last_execution_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastExecutionDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "overview", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Overview"), - }, - { - Name: "schedule_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("ScheduleExpression"), - }, - { - Name: "schedule_offset", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ScheduleOffset"), - }, - { - Name: "target_maps", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TargetMaps"), - }, - { - Name: "targets", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Targets"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/compliance_summary_items.go b/plugins/source/aws/resources/services/ssm/compliance_summary_items.go index 04c8864c8bfde9..ea4b781fd32544 100644 --- a/plugins/source/aws/resources/services/ssm/compliance_summary_items.go +++ b/plugins/source/aws/resources/services/ssm/compliance_summary_items.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ComplianceSummaryItems() *schema.Table { @@ -12,6 +12,7 @@ func ComplianceSummaryItems() *schema.Table { Name: "aws_ssm_compliance_summary_items", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceSummaryItem.html`, Resolver: fetchSsmComplianceSummaryItems, + Transform: transformers.TransformWithStruct(&types.ComplianceSummaryItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -37,16 +38,6 @@ func ComplianceSummaryItems() *schema.Table { PrimaryKey: true, }, }, - { - Name: "compliant_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CompliantSummary"), - }, - { - Name: "non_compliant_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NonCompliantSummary"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/documents.go b/plugins/source/aws/resources/services/ssm/documents.go index ba3a2baf98c7c9..e8291abd6a7041 100644 --- a/plugins/source/aws/resources/services/ssm/documents.go +++ b/plugins/source/aws/resources/services/ssm/documents.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Documents() *schema.Table { @@ -13,6 +13,7 @@ func Documents() *schema.Table { Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DocumentDescription.html`, Resolver: fetchSsmDocuments, PreResourceResolver: getDocument, + Transform: transformers.TransformWithStruct(&types.DocumentDescription{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,156 +39,11 @@ func Documents() *schema.Table { Type: schema.TypeJSON, Resolver: resolveDocumentPermission, }, - { - Name: "approved_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("ApprovedVersion"), - }, - { - Name: "attachments_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AttachmentsInformation"), - }, - { - Name: "author", - Type: schema.TypeString, - Resolver: schema.PathResolver("Author"), - }, - { - Name: "category", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Category"), - }, - { - Name: "category_enum", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CategoryEnum"), - }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "default_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultVersion"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "document_format", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocumentFormat"), - }, - { - Name: "document_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocumentType"), - }, - { - Name: "document_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocumentVersion"), - }, - { - Name: "hash", - Type: schema.TypeString, - Resolver: schema.PathResolver("Hash"), - }, - { - Name: "hash_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("HashType"), - }, - { - Name: "latest_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("LatestVersion"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "owner", - Type: schema.TypeString, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "parameters", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Parameters"), - }, - { - Name: "pending_review_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PendingReviewVersion"), - }, - { - Name: "platform_types", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("PlatformTypes"), - }, - { - Name: "requires", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Requires"), - }, - { - Name: "review_information", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ReviewInformation"), - }, - { - Name: "review_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReviewStatus"), - }, - { - Name: "schema_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("SchemaVersion"), - }, - { - Name: "sha1", - Type: schema.TypeString, - Resolver: schema.PathResolver("Sha1"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_information", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusInformation"), - }, { Name: "tags", Type: schema.TypeJSON, Resolver: client.ResolveTags, }, - { - Name: "target_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetType"), - }, - { - Name: "version_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VersionName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/instance_compliance_items.go b/plugins/source/aws/resources/services/ssm/instance_compliance_items.go index 4f8347ac0d757a..1c98349f1b3ef2 100644 --- a/plugins/source/aws/resources/services/ssm/instance_compliance_items.go +++ b/plugins/source/aws/resources/services/ssm/instance_compliance_items.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstanceComplianceItems() *schema.Table { @@ -12,6 +12,7 @@ func InstanceComplianceItems() *schema.Table { Name: "aws_ssm_instance_compliance_items", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceItem.html`, Resolver: fetchSsmInstanceComplianceItems, + Transform: transformers.TransformWithStruct(&types.ComplianceItem{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -40,46 +41,6 @@ func InstanceComplianceItems() *schema.Table { PrimaryKey: true, }, }, - { - Name: "compliance_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ComplianceType"), - }, - { - Name: "details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Details"), - }, - { - Name: "execution_summary", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ExecutionSummary"), - }, - { - Name: "resource_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceId"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Severity"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/instance_patches.go b/plugins/source/aws/resources/services/ssm/instance_patches.go index b33c4cdf318ec9..c2d51022c73d7d 100644 --- a/plugins/source/aws/resources/services/ssm/instance_patches.go +++ b/plugins/source/aws/resources/services/ssm/instance_patches.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InstancePatches() *schema.Table { @@ -12,6 +12,7 @@ func InstancePatches() *schema.Table { Name: "aws_ssm_instance_patches", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchComplianceData.html`, Resolver: fetchSsmInstancePatches, + Transform: transformers.TransformWithStruct(&types.PatchComplianceData{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,36 +39,6 @@ func InstancePatches() *schema.Table { PrimaryKey: true, }, }, - { - Name: "classification", - Type: schema.TypeString, - Resolver: schema.PathResolver("Classification"), - }, - { - Name: "installed_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("InstalledTime"), - }, - { - Name: "severity", - Type: schema.TypeString, - Resolver: schema.PathResolver("Severity"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "cve_ids", - Type: schema.TypeString, - Resolver: schema.PathResolver("CVEIds"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/instances.go b/plugins/source/aws/resources/services/ssm/instances.go index f17c985cf065cb..0d720fa178da16 100644 --- a/plugins/source/aws/resources/services/ssm/instances.go +++ b/plugins/source/aws/resources/services/ssm/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -12,6 +12,7 @@ func Instances() *schema.Table { Name: "aws_ssm_instances", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InstanceInformation.html`, Resolver: fetchSsmInstances, + Transform: transformers.TransformWithStruct(&types.InstanceInformation{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -32,111 +33,6 @@ func Instances() *schema.Table { PrimaryKey: true, }, }, - { - Name: "activation_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ActivationId"), - }, - { - Name: "agent_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("AgentVersion"), - }, - { - Name: "association_overview", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AssociationOverview"), - }, - { - Name: "association_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("AssociationStatus"), - }, - { - Name: "computer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ComputerName"), - }, - { - Name: "ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("IPAddress"), - }, - { - Name: "iam_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRole"), - }, - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceId"), - }, - { - Name: "is_latest_version", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsLatestVersion"), - }, - { - Name: "last_association_execution_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastAssociationExecutionDate"), - }, - { - Name: "last_ping_date_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastPingDateTime"), - }, - { - Name: "last_successful_association_execution_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastSuccessfulAssociationExecutionDate"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "ping_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("PingStatus"), - }, - { - Name: "platform_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformName"), - }, - { - Name: "platform_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformType"), - }, - { - Name: "platform_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("PlatformVersion"), - }, - { - Name: "registration_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("RegistrationDate"), - }, - { - Name: "resource_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ResourceType"), - }, - { - Name: "source_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceId"), - }, - { - Name: "source_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceType"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/ssm/inventories.go b/plugins/source/aws/resources/services/ssm/inventories.go index d8cd8f1c827e66..21a0e9a3585860 100644 --- a/plugins/source/aws/resources/services/ssm/inventories.go +++ b/plugins/source/aws/resources/services/ssm/inventories.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Inventories() *schema.Table { @@ -12,6 +12,7 @@ func Inventories() *schema.Table { Name: "aws_ssm_inventories", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryResultEntity.html`, Resolver: fetchSsmInventories, + Transform: transformers.TransformWithStruct(&types.InventoryResultEntity{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,11 +39,6 @@ func Inventories() *schema.Table { PrimaryKey: true, }, }, - { - Name: "data", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Data"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/inventory_schemas.go b/plugins/source/aws/resources/services/ssm/inventory_schemas.go index 04f3dd7bac9189..5d4b13923e4db4 100644 --- a/plugins/source/aws/resources/services/ssm/inventory_schemas.go +++ b/plugins/source/aws/resources/services/ssm/inventory_schemas.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func InventorySchemas() *schema.Table { @@ -12,6 +12,7 @@ func InventorySchemas() *schema.Table { Name: "aws_ssm_inventory_schemas", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryItemSchema.html`, Resolver: fetchSsmInventorySchemas, + Transform: transformers.TransformWithStruct(&types.InventoryItemSchema{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -46,16 +47,6 @@ func InventorySchemas() *schema.Table { PrimaryKey: true, }, }, - { - Name: "attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Attributes"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/parameters.go b/plugins/source/aws/resources/services/ssm/parameters.go index 1a3601dc6f5177..1bc533b66e8c07 100644 --- a/plugins/source/aws/resources/services/ssm/parameters.go +++ b/plugins/source/aws/resources/services/ssm/parameters.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Parameters() *schema.Table { @@ -12,6 +12,7 @@ func Parameters() *schema.Table { Name: "aws_ssm_parameters", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ParameterMetadata.html`, Resolver: fetchSsmParameters, + Transform: transformers.TransformWithStruct(&types.ParameterMetadata{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,56 +39,6 @@ func Parameters() *schema.Table { PrimaryKey: true, }, }, - { - Name: "allowed_pattern", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllowedPattern"), - }, - { - Name: "data_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataType"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyId"), - }, - { - Name: "last_modified_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastModifiedDate"), - }, - { - Name: "last_modified_user", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastModifiedUser"), - }, - { - Name: "policies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Policies"), - }, - { - Name: "tier", - Type: schema.TypeString, - Resolver: schema.PathResolver("Tier"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssm/patch_baselines.go b/plugins/source/aws/resources/services/ssm/patch_baselines.go index d503a6b28bc0ef..9e8e943b03d439 100644 --- a/plugins/source/aws/resources/services/ssm/patch_baselines.go +++ b/plugins/source/aws/resources/services/ssm/patch_baselines.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssm import ( + "github.com/aws/aws-sdk-go-v2/service/ssm/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PatchBaselines() *schema.Table { @@ -12,6 +12,7 @@ func PatchBaselines() *schema.Table { Name: "aws_ssm_patch_baselines", Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchBaselineIdentity.html`, Resolver: fetchSsmPatchBaselines, + Transform: transformers.TransformWithStruct(&types.PatchBaselineIdentity{}), Multiplex: client.ServiceAccountRegionMultiplexer("ssm"), Columns: []schema.Column{ { @@ -38,26 +39,6 @@ func PatchBaselines() *schema.Table { PrimaryKey: true, }, }, - { - Name: "baseline_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("BaselineDescription"), - }, - { - Name: "baseline_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("BaselineName"), - }, - { - Name: "default_baseline", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DefaultBaseline"), - }, - { - Name: "operating_system", - Type: schema.TypeString, - Resolver: schema.PathResolver("OperatingSystem"), - }, }, } } diff --git a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go index 1bfb6589870d26..72ce6c899d99f8 100644 --- a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go +++ b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssoadmin import ( + "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AccountAssignments() *schema.Table { @@ -12,28 +12,7 @@ func AccountAssignments() *schema.Table { Name: "aws_ssoadmin_account_assignments", Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_AccountAssignment.html`, Resolver: fetchSsoadminAccountAssignments, + Transform: transformers.TransformWithStruct(&types.AccountAssignment{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), - Columns: []schema.Column{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccountId"), - }, - { - Name: "permission_set_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PermissionSetArn"), - }, - { - Name: "principal_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrincipalId"), - }, - { - Name: "principal_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("PrincipalType"), - }, - }, } } diff --git a/plugins/source/aws/resources/services/ssoadmin/instances.go b/plugins/source/aws/resources/services/ssoadmin/instances.go index ee5d00ca9a32d9..a06b8ca23479b5 100644 --- a/plugins/source/aws/resources/services/ssoadmin/instances.go +++ b/plugins/source/aws/resources/services/ssoadmin/instances.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssoadmin import ( + "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Instances() *schema.Table { @@ -12,19 +12,8 @@ func Instances() *schema.Table { Name: "aws_ssoadmin_instances", Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_InstanceMetadata.html`, Resolver: fetchSsoadminInstances, + Transform: transformers.TransformWithStruct(&types.InstanceMetadata{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), - Columns: []schema.Column{ - { - Name: "identity_store_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityStoreId"), - }, - { - Name: "instance_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstanceArn"), - }, - }, Relations: []*schema.Table{ PermissionSets(), diff --git a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go index 2fc556bdd6fb15..95c9b4e8e19c43 100644 --- a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go +++ b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package ssoadmin import ( + "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PermissionSets() *schema.Table { @@ -13,6 +13,7 @@ func PermissionSets() *schema.Table { Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_PermissionSet.html`, Resolver: fetchSsoadminPermissionSets, PreResourceResolver: getSsoadminPermissionSet, + Transform: transformers.TransformWithStruct(&types.PermissionSet{}), Multiplex: client.ServiceAccountRegionMultiplexer("identitystore"), Columns: []schema.Column{ { @@ -20,36 +21,6 @@ func PermissionSets() *schema.Table { Type: schema.TypeJSON, Resolver: getSsoadminPermissionSetInlinePolicy, }, - { - Name: "created_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedDate"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "permission_set_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("PermissionSetArn"), - }, - { - Name: "relay_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("RelayState"), - }, - { - Name: "session_duration", - Type: schema.TypeString, - Resolver: schema.PathResolver("SessionDuration"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/stepfunctions/state_machines.go b/plugins/source/aws/resources/services/stepfunctions/state_machines.go index 69ab10b5095d20..cb16fd37b9d666 100644 --- a/plugins/source/aws/resources/services/stepfunctions/state_machines.go +++ b/plugins/source/aws/resources/services/stepfunctions/state_machines.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package stepfunctions import ( + "github.com/aws/aws-sdk-go-v2/service/sfn" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func StateMachines() *schema.Table { @@ -13,6 +13,7 @@ func StateMachines() *schema.Table { Description: `https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeStateMachine.html`, Resolver: fetchStepfunctionsStateMachines, PreResourceResolver: getStepFunction, + Transform: transformers.TransformWithStruct(&sfn.DescribeStateMachineOutput{}, transformers.WithSkipFields("ResultMetadata")), Multiplex: client.ServiceAccountRegionMultiplexer("states"), Columns: []schema.Column{ { @@ -38,51 +39,6 @@ func StateMachines() *schema.Table { Type: schema.TypeJSON, Resolver: resolveStepFunctionTags, }, - { - Name: "creation_date", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationDate"), - }, - { - Name: "definition", - Type: schema.TypeString, - Resolver: schema.PathResolver("Definition"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "role_arn", - Type: schema.TypeString, - Resolver: schema.PathResolver("RoleArn"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "label", - Type: schema.TypeString, - Resolver: schema.PathResolver("Label"), - }, - { - Name: "logging_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LoggingConfiguration"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "tracing_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TracingConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/timestream/databases.go b/plugins/source/aws/resources/services/timestream/databases.go index e496c6344510bb..dfd9086315b77f 100644 --- a/plugins/source/aws/resources/services/timestream/databases.go +++ b/plugins/source/aws/resources/services/timestream/databases.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package timestream import ( + "github.com/aws/aws-sdk-go-v2/service/timestreamwrite/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Databases() *schema.Table { return &schema.Table{ Name: "aws_timestream_databases", Resolver: fetchTimestreamDatabases, + Transform: transformers.TransformWithStruct(&types.Database{}), Multiplex: client.ServiceAccountRegionMultiplexer("ingest.timestream"), Columns: []schema.Column{ { @@ -36,31 +37,6 @@ func Databases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "kms_key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KmsKeyId"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "table_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TableCount"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/timestream/tables.go b/plugins/source/aws/resources/services/timestream/tables.go index 56de1a113cfac6..5c9a7dcd71614c 100644 --- a/plugins/source/aws/resources/services/timestream/tables.go +++ b/plugins/source/aws/resources/services/timestream/tables.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package timestream import ( + "github.com/aws/aws-sdk-go-v2/service/timestreamwrite/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Tables() *schema.Table { return &schema.Table{ - Name: "aws_timestream_tables", - Resolver: fetchTimestreamTables, + Name: "aws_timestream_tables", + Resolver: fetchTimestreamTables, + Transform: transformers.TransformWithStruct(&types.Table{}), Columns: []schema.Column{ { Name: "account_id", @@ -30,41 +31,6 @@ func Tables() *schema.Table { PrimaryKey: true, }, }, - { - Name: "creation_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreationTime"), - }, - { - Name: "database_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DatabaseName"), - }, - { - Name: "last_updated_time", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("LastUpdatedTime"), - }, - { - Name: "magnetic_store_write_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MagneticStoreWriteProperties"), - }, - { - Name: "retention_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RetentionProperties"), - }, - { - Name: "table_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableName"), - }, - { - Name: "table_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("TableStatus"), - }, }, } } diff --git a/plugins/source/aws/resources/services/transfer/servers.go b/plugins/source/aws/resources/services/transfer/servers.go index 899ca05db8a112..57d62a663eb3ab 100644 --- a/plugins/source/aws/resources/services/transfer/servers.go +++ b/plugins/source/aws/resources/services/transfer/servers.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package transfer import ( + "github.com/aws/aws-sdk-go-v2/service/transfer/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Servers() *schema.Table { @@ -13,6 +13,7 @@ func Servers() *schema.Table { Description: `https://docs.aws.amazon.com/transfer/latest/userguide/API_DescribedServer.html`, Resolver: fetchTransferServers, PreResourceResolver: getServer, + Transform: transformers.TransformWithStruct(&types.DescribedServer{}), Multiplex: client.ServiceAccountRegionMultiplexer("transfer"), Columns: []schema.Column{ { @@ -39,91 +40,6 @@ func Servers() *schema.Table { Resolver: resolveServersTags, Description: `Specifies the key-value pairs that you can use to search for and group servers that were assigned to the server that was described`, }, - { - Name: "certificate", - Type: schema.TypeString, - Resolver: schema.PathResolver("Certificate"), - }, - { - Name: "domain", - Type: schema.TypeString, - Resolver: schema.PathResolver("Domain"), - }, - { - Name: "endpoint_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EndpointDetails"), - }, - { - Name: "endpoint_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("EndpointType"), - }, - { - Name: "host_key_fingerprint", - Type: schema.TypeString, - Resolver: schema.PathResolver("HostKeyFingerprint"), - }, - { - Name: "identity_provider_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityProviderDetails"), - }, - { - Name: "identity_provider_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("IdentityProviderType"), - }, - { - Name: "logging_role", - Type: schema.TypeString, - Resolver: schema.PathResolver("LoggingRole"), - }, - { - Name: "post_authentication_login_banner", - Type: schema.TypeString, - Resolver: schema.PathResolver("PostAuthenticationLoginBanner"), - }, - { - Name: "pre_authentication_login_banner", - Type: schema.TypeString, - Resolver: schema.PathResolver("PreAuthenticationLoginBanner"), - }, - { - Name: "protocol_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ProtocolDetails"), - }, - { - Name: "protocols", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Protocols"), - }, - { - Name: "security_policy_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SecurityPolicyName"), - }, - { - Name: "server_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServerId"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "user_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UserCount"), - }, - { - Name: "workflow_details", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WorkflowDetails"), - }, }, } } diff --git a/plugins/source/aws/resources/services/waf/rule_groups.go b/plugins/source/aws/resources/services/waf/rule_groups.go index ed0df11ce9d3ef..f1ce179b4c584a 100644 --- a/plugins/source/aws/resources/services/waf/rule_groups.go +++ b/plugins/source/aws/resources/services/waf/rule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package waf import ( + "github.com/aws/aws-sdk-go-v2/service/waf/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RuleGroups() *schema.Table { @@ -12,6 +12,7 @@ func RuleGroups() *schema.Table { Name: "aws_waf_rule_groups", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleGroupSummary.html`, Resolver: fetchWafRuleGroups, + Transform: transformers.TransformWithStruct(&types.RuleGroup{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -37,16 +38,6 @@ func RuleGroups() *schema.Table { Type: schema.TypeStringArray, Resolver: resolveWafRuleGroupRuleIds, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "rule_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleGroupId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/waf/rules.go b/plugins/source/aws/resources/services/waf/rules.go index 4d991483aae760..ab1871c9240308 100644 --- a/plugins/source/aws/resources/services/waf/rules.go +++ b/plugins/source/aws/resources/services/waf/rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package waf import ( + "github.com/aws/aws-sdk-go-v2/service/waf/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Rules() *schema.Table { @@ -12,6 +12,7 @@ func Rules() *schema.Table { Name: "aws_waf_rules", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleSummary.html`, Resolver: fetchWafRules, + Transform: transformers.TransformWithStruct(&types.Rule{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,16 +33,6 @@ func Rules() *schema.Table { Type: schema.TypeJSON, Resolver: resolveWafRuleTags, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "rule_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go b/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go index db61b46e012299..a04dac6defa2d0 100644 --- a/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go +++ b/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package waf import ( + "github.com/aws/aws-sdk-go-v2/service/waf/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SubscribedRuleGroups() *schema.Table { @@ -12,6 +12,7 @@ func SubscribedRuleGroups() *schema.Table { Name: "aws_waf_subscribed_rule_groups", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_SubscribedRuleGroupSummary.html`, Resolver: fetchWafSubscribedRuleGroups, + Transform: transformers.TransformWithStruct(&types.SubscribedRuleGroupSummary{}), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,16 +33,6 @@ func SubscribedRuleGroups() *schema.Table { PrimaryKey: true, }, }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/waf/web_acls.go b/plugins/source/aws/resources/services/waf/web_acls.go index 738c17f0fa1e58..b9811beb877f83 100644 --- a/plugins/source/aws/resources/services/waf/web_acls.go +++ b/plugins/source/aws/resources/services/waf/web_acls.go @@ -1,10 +1,9 @@ -// Code generated by codegen; DO NOT EDIT. - package waf import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WebAcls() *schema.Table { @@ -12,6 +11,7 @@ func WebAcls() *schema.Table { Name: "aws_waf_web_acls", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_WebACLSummary.html`, Resolver: fetchWafWebAcls, + Transform: transformers.TransformWithStruct(&WebACLWrapper{}, transformers.WithUnwrapStructFields("WebACL")), Multiplex: client.AccountMultiplex, Columns: []schema.Column{ { @@ -32,22 +32,6 @@ func WebAcls() *schema.Table { Type: schema.TypeJSON, Resolver: resolveWafWebACLTags, }, - { - Name: "logging_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LoggingConfiguration"), - Description: `The LoggingConfiguration for the specified web ACL.`, - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "web_acl_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebACLId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafregional/rate_based_rules.go b/plugins/source/aws/resources/services/wafregional/rate_based_rules.go index 95aa74f7a91397..6d7dfb7cf2b4fa 100644 --- a/plugins/source/aws/resources/services/wafregional/rate_based_rules.go +++ b/plugins/source/aws/resources/services/wafregional/rate_based_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafregional import ( + "github.com/aws/aws-sdk-go-v2/service/wafregional/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RateBasedRules() *schema.Table { @@ -12,6 +12,7 @@ func RateBasedRules() *schema.Table { Name: "aws_wafregional_rate_based_rules", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RateBasedRule.html`, Resolver: fetchWafregionalRateBasedRules, + Transform: transformers.TransformWithStruct(&types.RateBasedRule{}), Multiplex: client.ServiceAccountRegionMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -37,36 +38,6 @@ func RateBasedRules() *schema.Table { Type: schema.TypeJSON, Resolver: resolveWafregionalRateBasedRuleTags, }, - { - Name: "match_predicates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("MatchPredicates"), - }, - { - Name: "rate_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("RateKey"), - }, - { - Name: "rate_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RateLimit"), - }, - { - Name: "rule_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleId"), - }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafregional/rule_groups.go b/plugins/source/aws/resources/services/wafregional/rule_groups.go index 7f26e806357d91..3344e4c16ea3ab 100644 --- a/plugins/source/aws/resources/services/wafregional/rule_groups.go +++ b/plugins/source/aws/resources/services/wafregional/rule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafregional import ( + "github.com/aws/aws-sdk-go-v2/service/wafregional/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RuleGroups() *schema.Table { @@ -12,6 +12,7 @@ func RuleGroups() *schema.Table { Name: "aws_wafregional_rule_groups", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RuleGroup.html`, Resolver: fetchWafregionalRuleGroups, + Transform: transformers.TransformWithStruct(&types.RuleGroup{}), Multiplex: client.ServiceAccountRegionMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -38,21 +39,6 @@ func RuleGroups() *schema.Table { Resolver: resolveWafregionalRuleGroupTags, Description: `Rule group tags.`, }, - { - Name: "rule_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleGroupId"), - }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafregional/rules.go b/plugins/source/aws/resources/services/wafregional/rules.go index 413cfc10d98361..703dac9e8363be 100644 --- a/plugins/source/aws/resources/services/wafregional/rules.go +++ b/plugins/source/aws/resources/services/wafregional/rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafregional import ( + "github.com/aws/aws-sdk-go-v2/service/wafregional/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Rules() *schema.Table { @@ -12,6 +12,7 @@ func Rules() *schema.Table { Name: "aws_wafregional_rules", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_Rule.html`, Resolver: fetchWafregionalRules, + Transform: transformers.TransformWithStruct(&types.Rule{}), Multiplex: client.ServiceAccountRegionMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -38,26 +39,6 @@ func Rules() *schema.Table { Resolver: resolveWafregionalRuleTags, Description: `Rule tags.`, }, - { - Name: "predicates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Predicates"), - }, - { - Name: "rule_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("RuleId"), - }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafregional/web_acls.go b/plugins/source/aws/resources/services/wafregional/web_acls.go index 29462555bff9ff..5a74524fbceb2e 100644 --- a/plugins/source/aws/resources/services/wafregional/web_acls.go +++ b/plugins/source/aws/resources/services/wafregional/web_acls.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafregional import ( + "github.com/aws/aws-sdk-go-v2/service/wafregional/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WebAcls() *schema.Table { @@ -12,6 +12,7 @@ func WebAcls() *schema.Table { Name: "aws_wafregional_web_acls", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_WebACL.html`, Resolver: fetchWafregionalWebAcls, + Transform: transformers.TransformWithStruct(&types.WebACL{}), Multiplex: client.ServiceAccountRegionMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -43,31 +44,6 @@ func WebAcls() *schema.Table { Type: schema.TypeStringArray, Resolver: resolveWafregionalWebACLResourcesForWebACL, }, - { - Name: "default_action", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultAction"), - }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, - { - Name: "web_acl_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebACLId"), - }, - { - Name: "metric_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("MetricName"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafv2/ipsets.go b/plugins/source/aws/resources/services/wafv2/ipsets.go index b3db89554908e9..01d40150e7c259 100644 --- a/plugins/source/aws/resources/services/wafv2/ipsets.go +++ b/plugins/source/aws/resources/services/wafv2/ipsets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafv2 import ( + "github.com/aws/aws-sdk-go-v2/service/wafv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Ipsets() *schema.Table { @@ -12,6 +12,7 @@ func Ipsets() *schema.Table { Name: "aws_wafv2_ipsets", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_IPSet.html`, Resolver: fetchWafv2Ipsets, + Transform: transformers.TransformWithStruct(&types.IPSet{}), PreResourceResolver: getIpset, Multiplex: client.ServiceAccountRegionScopeMultiplexer("waf-regional"), Columns: []schema.Column{ @@ -43,26 +44,6 @@ func Ipsets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ip_address_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("IPAddressVersion"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go b/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go index b7a52a8ce3398e..5f56da6e27b2c9 100644 --- a/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafv2 import ( + "github.com/aws/aws-sdk-go-v2/service/wafv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ManagedRuleGroups() *schema.Table { @@ -12,6 +12,7 @@ func ManagedRuleGroups() *schema.Table { Name: "aws_wafv2_managed_rule_groups", Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_ManagedRuleGroupSummary.html`, Resolver: fetchWafv2ManagedRuleGroups, + Transform: transformers.TransformWithStruct(&types.ManagedRuleGroupSummary{}), Multiplex: client.ServiceAccountRegionScopeMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -43,26 +44,6 @@ func ManagedRuleGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveManageRuleGroupProperties, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "vendor_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("VendorName"), - }, - { - Name: "versioning_supported", - Type: schema.TypeBool, - Resolver: schema.PathResolver("VersioningSupported"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go b/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go index 63bdd7983d8308..8cc1545ede23ef 100644 --- a/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go +++ b/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafv2 import ( + "github.com/aws/aws-sdk-go-v2/service/wafv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RegexPatternSets() *schema.Table { @@ -13,6 +13,7 @@ func RegexPatternSets() *schema.Table { Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_RegexPatternSet.html`, Resolver: fetchWafv2RegexPatternSets, PreResourceResolver: getRegexPatternSet, + Transform: transformers.TransformWithStruct(&types.RegexPatternSet{}), Multiplex: client.ServiceAccountRegionScopeMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -38,26 +39,6 @@ func RegexPatternSets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "regular_expression_list", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RegularExpressionList"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafv2/rule_groups.go b/plugins/source/aws/resources/services/wafv2/rule_groups.go index be5924540b533f..32cb2deb0c0145 100644 --- a/plugins/source/aws/resources/services/wafv2/rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/rule_groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafv2 import ( + "github.com/aws/aws-sdk-go-v2/service/wafv2/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func RuleGroups() *schema.Table { @@ -13,6 +13,7 @@ func RuleGroups() *schema.Table { Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleGroup.html`, Resolver: fetchWafv2RuleGroups, PreResourceResolver: getRuleGroup, + Transform: transformers.TransformWithStruct(&types.RuleGroup{}), Multiplex: client.ServiceAccountRegionScopeMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -43,56 +44,6 @@ func RuleGroups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveWafv2ruleGroupPolicy, }, - { - Name: "capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Capacity"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "visibility_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VisibilityConfig"), - }, - { - Name: "available_labels", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AvailableLabels"), - }, - { - Name: "consumed_labels", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ConsumedLabels"), - }, - { - Name: "custom_response_bodies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CustomResponseBodies"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "label_namespace", - Type: schema.TypeString, - Resolver: schema.PathResolver("LabelNamespace"), - }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, }, } } diff --git a/plugins/source/aws/resources/services/wafv2/web_acls.go b/plugins/source/aws/resources/services/wafv2/web_acls.go index 8cf746c142e7ad..b3fd9bc028dea4 100644 --- a/plugins/source/aws/resources/services/wafv2/web_acls.go +++ b/plugins/source/aws/resources/services/wafv2/web_acls.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package wafv2 import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client" + "github.com/cloudquery/cloudquery/plugins/source/aws/resources/services/wafv2/models" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func WebAcls() *schema.Table { @@ -12,6 +12,7 @@ func WebAcls() *schema.Table { Name: "aws_wafv2_web_acls", Resolver: fetchWafv2WebAcls, PreResourceResolver: getWebAcl, + Transform: transformers.TransformWithStruct(&models.WebACLWrapper{}, transformers.WithUnwrapStructFields("WebACL")), Multiplex: client.ServiceAccountRegionScopeMultiplexer("waf-regional"), Columns: []schema.Column{ { @@ -42,86 +43,6 @@ func WebAcls() *schema.Table { PrimaryKey: true, }, }, - { - Name: "default_action", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultAction"), - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "visibility_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VisibilityConfig"), - }, - { - Name: "capacity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Capacity"), - }, - { - Name: "captcha_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CaptchaConfig"), - }, - { - Name: "challenge_config", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ChallengeConfig"), - }, - { - Name: "custom_response_bodies", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CustomResponseBodies"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "label_namespace", - Type: schema.TypeString, - Resolver: schema.PathResolver("LabelNamespace"), - }, - { - Name: "managed_by_firewall_manager", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ManagedByFirewallManager"), - }, - { - Name: "post_process_firewall_manager_rule_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PostProcessFirewallManagerRuleGroups"), - }, - { - Name: "pre_process_firewall_manager_rule_groups", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PreProcessFirewallManagerRuleGroups"), - }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, - { - Name: "token_domains", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("TokenDomains"), - }, - { - Name: "logging_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LoggingConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/workspaces/directories.go b/plugins/source/aws/resources/services/workspaces/directories.go index 82934a3208f58e..5d59927575d868 100644 --- a/plugins/source/aws/resources/services/workspaces/directories.go +++ b/plugins/source/aws/resources/services/workspaces/directories.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package workspaces import ( + "github.com/aws/aws-sdk-go-v2/service/workspaces/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Directories() *schema.Table { @@ -12,6 +12,7 @@ func Directories() *schema.Table { Name: "aws_workspaces_directories", Description: `https://docs.aws.amazon.com/workspaces/latest/api/API_WorkspaceDirectory.html`, Resolver: fetchWorkspacesDirectories, + Transform: transformers.TransformWithStruct(&types.WorkspaceDirectory{}), Multiplex: client.ServiceAccountRegionMultiplexer("workspaces"), Columns: []schema.Column{ { @@ -27,96 +28,6 @@ func Directories() *schema.Table { PrimaryKey: true, }, }, - { - Name: "alias", - Type: schema.TypeString, - Resolver: schema.PathResolver("Alias"), - }, - { - Name: "certificate_based_auth_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CertificateBasedAuthProperties"), - }, - { - Name: "customer_user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerUserName"), - }, - { - Name: "directory_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectoryId"), - }, - { - Name: "directory_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectoryName"), - }, - { - Name: "directory_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectoryType"), - }, - { - Name: "dns_ip_addresses", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("DnsIpAddresses"), - }, - { - Name: "iam_role_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IamRoleId"), - }, - { - Name: "ip_group_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("IpGroupIds"), - }, - { - Name: "registration_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("RegistrationCode"), - }, - { - Name: "saml_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SamlProperties"), - }, - { - Name: "selfservice_permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SelfservicePermissions"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "subnet_ids", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("SubnetIds"), - }, - { - Name: "tenancy", - Type: schema.TypeString, - Resolver: schema.PathResolver("Tenancy"), - }, - { - Name: "workspace_access_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WorkspaceAccessProperties"), - }, - { - Name: "workspace_creation_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WorkspaceCreationProperties"), - }, - { - Name: "workspace_security_group_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkspaceSecurityGroupId"), - }, }, } } diff --git a/plugins/source/aws/resources/services/workspaces/workspaces.go b/plugins/source/aws/resources/services/workspaces/workspaces.go index b6ad7091db6827..aab715e317a507 100644 --- a/plugins/source/aws/resources/services/workspaces/workspaces.go +++ b/plugins/source/aws/resources/services/workspaces/workspaces.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package workspaces import ( + "github.com/aws/aws-sdk-go-v2/service/workspaces/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Workspaces() *schema.Table { @@ -12,6 +12,7 @@ func Workspaces() *schema.Table { Name: "aws_workspaces_workspaces", Description: `https://docs.aws.amazon.com/workspaces/latest/api/API_Workspace.html`, Resolver: fetchWorkspacesWorkspaces, + Transform: transformers.TransformWithStruct(&types.Workspace{}), Multiplex: client.ServiceAccountRegionMultiplexer("workspaces"), Columns: []schema.Column{ { @@ -27,86 +28,6 @@ func Workspaces() *schema.Table { PrimaryKey: true, }, }, - { - Name: "bundle_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("BundleId"), - }, - { - Name: "computer_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("ComputerName"), - }, - { - Name: "directory_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("DirectoryId"), - }, - { - Name: "error_code", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorCode"), - }, - { - Name: "error_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorMessage"), - }, - { - Name: "ip_address", - Type: schema.TypeString, - Resolver: schema.PathResolver("IpAddress"), - }, - { - Name: "modification_states", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ModificationStates"), - }, - { - Name: "related_workspaces", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RelatedWorkspaces"), - }, - { - Name: "root_volume_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RootVolumeEncryptionEnabled"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "subnet_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubnetId"), - }, - { - Name: "user_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("UserName"), - }, - { - Name: "user_volume_encryption_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("UserVolumeEncryptionEnabled"), - }, - { - Name: "volume_encryption_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("VolumeEncryptionKey"), - }, - { - Name: "workspace_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("WorkspaceId"), - }, - { - Name: "workspace_properties", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("WorkspaceProperties"), - }, }, } } diff --git a/plugins/source/aws/resources/services/xray/encryption_configs.go b/plugins/source/aws/resources/services/xray/encryption_configs.go index 17066ff1d291df..1434b0abc5babf 100644 --- a/plugins/source/aws/resources/services/xray/encryption_configs.go +++ b/plugins/source/aws/resources/services/xray/encryption_configs.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package xray import ( + "github.com/aws/aws-sdk-go-v2/service/xray/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func EncryptionConfigs() *schema.Table { @@ -12,6 +12,7 @@ func EncryptionConfigs() *schema.Table { Name: "aws_xray_encryption_configs", Description: `https://docs.aws.amazon.com/xray/latest/api/API_EncryptionConfig.html`, Resolver: fetchXrayEncryptionConfigs, + Transform: transformers.TransformWithStruct(&types.EncryptionConfig{}), Multiplex: client.ServiceAccountRegionMultiplexer("xray"), Columns: []schema.Column{ { @@ -24,21 +25,6 @@ func EncryptionConfigs() *schema.Table { Type: schema.TypeString, Resolver: client.ResolveAWSRegion, }, - { - Name: "key_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("KeyId"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, }, } } diff --git a/plugins/source/aws/resources/services/xray/groups.go b/plugins/source/aws/resources/services/xray/groups.go index 3feb1746bdceeb..e232adbd3ca23e 100644 --- a/plugins/source/aws/resources/services/xray/groups.go +++ b/plugins/source/aws/resources/services/xray/groups.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package xray import ( + "github.com/aws/aws-sdk-go-v2/service/xray/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Groups() *schema.Table { @@ -12,6 +12,7 @@ func Groups() *schema.Table { Name: "aws_xray_groups", Description: `https://docs.aws.amazon.com/xray/latest/api/API_Group.html`, Resolver: fetchXrayGroups, + Transform: transformers.TransformWithStruct(&types.GroupSummary{}), Multiplex: client.ServiceAccountRegionMultiplexer("xray"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func Groups() *schema.Table { Type: schema.TypeJSON, Resolver: resolveXrayGroupTags, }, - { - Name: "filter_expression", - Type: schema.TypeString, - Resolver: schema.PathResolver("FilterExpression"), - }, - { - Name: "group_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("GroupName"), - }, - { - Name: "insights_configuration", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InsightsConfiguration"), - }, }, } } diff --git a/plugins/source/aws/resources/services/xray/sampling_rules.go b/plugins/source/aws/resources/services/xray/sampling_rules.go index fb7c4236e4e348..73e3bf90d6d35f 100644 --- a/plugins/source/aws/resources/services/xray/sampling_rules.go +++ b/plugins/source/aws/resources/services/xray/sampling_rules.go @@ -1,10 +1,10 @@ -// Code generated by codegen; DO NOT EDIT. - package xray import ( + "github.com/aws/aws-sdk-go-v2/service/xray/types" "github.com/cloudquery/cloudquery/plugins/source/aws/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func SamplingRules() *schema.Table { @@ -12,6 +12,7 @@ func SamplingRules() *schema.Table { Name: "aws_xray_sampling_rules", Description: `https://docs.aws.amazon.com/xray/latest/api/API_SamplingRuleRecord.html`, Resolver: fetchXraySamplingRules, + Transform: transformers.TransformWithStruct(&types.SamplingRuleRecord{}), Multiplex: client.ServiceAccountRegionMultiplexer("xray"), Columns: []schema.Column{ { @@ -37,21 +38,6 @@ func SamplingRules() *schema.Table { Type: schema.TypeJSON, Resolver: resolveXraySamplingRuleTags, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "modified_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ModifiedAt"), - }, - { - Name: "sampling_rule", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SamplingRule"), - }, }, } } From d12e3b8a86b6d838935b0c0404e1041445ab5249 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 12:03:21 +0200 Subject: [PATCH 115/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/servicequotas to v1.14.0 (#6511) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/servicequotas](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.13.23` -> `v1.14.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.14.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicequotas/v1.13.23...v1.14.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/servicequotas/v1.13.23...v1.14.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Monday" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index d43e86e3c60d3f..20d27f838c88b1 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.18.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.14.0 github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.16.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.17.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index a131535db79652..2754ecaba7e1df 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -220,8 +220,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0 h1:Yo5zv0KriAoPCo4yW github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.16.0/go.mod h1:r0xKT6nzw2oTEZ37LdnSCRA85zZwRFt0Cmc40+b9Rmk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0 h1:FObz7TAV6hXLH9RPUgctQjBeXsQ9dlRlo+ob3s4Pbik= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.16.0/go.mod h1:H/ErouUYrKFwuRLD4MIUeoyZgupytldUbDzCACH+Rys= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23 h1:QTbShmzWTmoF5dbd0K34aY1tXZV7LO6NJ1iRnJQ9v8I= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.13.23/go.mod h1:8I7mkhR5OsSBE1FlKOZ7Etb5gtA9881M++HhCEhMj10= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.14.0 h1:1Pcy9UdOu2d7iYokJDSVYBXnBb09660UrPlIwiVmuyY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.14.0/go.mod h1:8I7mkhR5OsSBE1FlKOZ7Etb5gtA9881M++HhCEhMj10= github.com/aws/aws-sdk-go-v2/service/ses v1.15.0 h1:hFlk7D1Y4OHaxTSbgGY19gso4tmAXuLi0JRlSZkgCjI= github.com/aws/aws-sdk-go-v2/service/ses v1.15.0/go.mod h1:yOTAnL3dDC5wYhxL6+PXAa/hvsia8ckCBqyhzptW5K8= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.16.0 h1:ZVu7clQZjixs6IYUcpgkUoigjQn4HUToPiRd1AjmCl0= From 8814685edf983c2141de47c51166de2d147a0b7f Mon Sep 17 00:00:00 2001 From: Matt <95309754+cloudmatt@users.noreply.github.com> Date: Mon, 9 Jan 2023 05:07:00 -0500 Subject: [PATCH 116/221] doc(website): Adding how-to guide for using Renovate (#6435) #### Summary Adding a `how-to` guide for leveraging [Renovate](https://docs.renovatebot.com/) to keep CloudQuery plugins up-to-date per https://github.com/cloudquery/cloudquery/issues/6335. I did follow the setup instructions and ran the website locally and everything appears to load fine on my end the only exception being the header which renders a weird space: ![image](https://user-images.githubusercontent.com/95309754/211044519-a9f7e0a5-bef0-41f2-b9ca-056e7605b026.png) but that's due to the `team.ts` content being loaded that populates that with the avatar/links for CloudQuery employees. --- .github/styles/Vocab/Base/accept.txt | 2 +- website/content/team.ts | 6 + .../update-plugins-using-renovate.md | 138 ++++++++++++++++++ .../renovate-howto-regex101.png | Bin 0 -> 75676 bytes .../renovate-pr-changedfiles.png | Bin 0 -> 72692 bytes .../renovate-pr-example.png | Bin 0 -> 95470 bytes .../renovate-pr-page.png | Bin 0 -> 18178 bytes website/public/images/people/cloudmatt.png | Bin 0 -> 13813 bytes 8 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 website/pages/how-to-guides/update-plugins-using-renovate.md create mode 100644 website/public/images/blog/manage-plugins-with-renovate/renovate-howto-regex101.png create mode 100644 website/public/images/blog/manage-plugins-with-renovate/renovate-pr-changedfiles.png create mode 100644 website/public/images/blog/manage-plugins-with-renovate/renovate-pr-example.png create mode 100644 website/public/images/blog/manage-plugins-with-renovate/renovate-pr-page.png create mode 100644 website/public/images/people/cloudmatt.png diff --git a/.github/styles/Vocab/Base/accept.txt b/.github/styles/Vocab/Base/accept.txt index a91167340ea4df..46c0cae55367bb 100644 --- a/.github/styles/Vocab/Base/accept.txt +++ b/.github/styles/Vocab/Base/accept.txt @@ -164,4 +164,4 @@ xtract Yandex Yevgeny zsh -Zsh +Zsh \ No newline at end of file diff --git a/website/content/team.ts b/website/content/team.ts index c099288e97934c..6f5820c1f68fed 100644 --- a/website/content/team.ts +++ b/website/content/team.ts @@ -83,6 +83,12 @@ const CLOUDQUERY_TEAM = { twitterUsername: "disq", image_url: "/images/people/kemal.jpg", }, + cloudmatt: { + name: "cloudmatt", + url: "https://github.com/cloudmatt", + twitterUsername: "", + image_url: "/images/people/cloudmatt.png", + }, }; export type Author = keyof typeof CLOUDQUERY_TEAM; diff --git a/website/pages/how-to-guides/update-plugins-using-renovate.md b/website/pages/how-to-guides/update-plugins-using-renovate.md new file mode 100644 index 00000000000000..5f37d14f7a64d7 --- /dev/null +++ b/website/pages/how-to-guides/update-plugins-using-renovate.md @@ -0,0 +1,138 @@ +--- +title: How to Automatically Update Plugins Using Renovate +tag: tutorial +description: >- + How to setup Renovate to update plugins +author: cloudmatt # Only renders author block for people in content/team.ts +--- + +import { HowToGuideHeader } from "../../components/HowToGuideHeader" +import { Callout } from 'nextra-theme-docs' + + + +In this guide we will discuss how to leverage [Renovate](https://github.com/renovatebot/renovate) to keep all your source and destination plugins on the latest version. + +## Introduction to Renovate + +[Renovate](https://github.com/renovatebot/renovate) is a tool for automated dependency management for your code repositories to help automate away the tasks of manual dependency versioning. For more information on the features and why you should use Renovate, please read [this](https://github.com/renovatebot/renovate#why-use-renovate). + +This guide covers how to leverage Renovate to keep your CloudQuery source and destination plugins up-to-date but is not meant to be a comprehensive tutorial of Renovate. For instructions on how to setup Renovate, please reference their [getting started](https://docs.renovatebot.com/getting-started/running/) documentation. This how-to guide assumes you have Renovate configured and running already on your git based repository. + +## Walkthrough + +### Step 1: Identify Regex Capture Groups + +While Renovate provides tons of built-in functionality to make most dependency management simple, it also provides a powerful functionality called 'RegexManager' which allows you to leverage custom regular expression statements to manually extract dependencies, their version, and updating mechanism. Click [here](https://docs.renovatebot.com/modules/manager/regex/) for more details on the specific configurations of RegexManager. + +For our purposes, we're concerned about the following items: +- `datasourceTemplate`: datasource is where the package's versions are managed. +- `packageNameTemplate`: this is the lookup name that is passed to the datasource. +- `depNameTemplate`: this is the 'friendly' name that is shown in renovate PRs. +- `extractVersionTemplate`: regular expression for discovering plugin version in the datasource. +- `versioningTemplate`: what versioning 'format' the datasource follows +- `fileMatch`: path to the `cloudquery.yaml` file in your repository. + `matchStrings`: regular expression to find the plugins in your cloudquery.yaml file. + +Using a simplistic configuration file that looks like: + +```yaml copy +--- +kind: source +spec: + name: gcp + path: cloudquery/gcp + version: "v5.4.0" + tables: ["*"] + destinations: ["postgresql"] +--- +kind: source +spec: + name: aws + path: cloudquery/aws + version: "v9.1.0" + destinations: ["postgresql"] + tables: ["*"] +--- +kind: destination +spec: + name: postgresql + path: cloudquery/postgresql + version: "v2.0.1" + write_mode: overwrite-delete-stale +``` + +You can see that we have three 'keys', meaning fields that are static across all plugins, we can leverage these to construct our custom regex statement for each plugin. These 'keys' will be used as regular expression named capture group. Those fields being: + +- **kind**: what type of plugin this is (source or destination). +- **path**: the 'name' of the plugin (such as gcp or aws). +- **version**: the current version of the plugin. + +### Step 2: Create Custom RegexManager + +Now that we've identified the fields we need to extract from the configuration file to create the custom regex, next we need to construct the regex statement to extract those 'keys' into named capture groups. + +For this it's recommended to use a regex testing tool to ensure your regex is actually working. [Regex101](https://regex101.com/) is a popular one but feel free to use any others as long as they support the PCRE2 regex engine. So taking our sample configuration file from above, we begin to play around with various regex until we meet the following criteria: + +- a named capture group for the plugin type (source or destination) which we will reference as 'kind' in this tutorial. +- a named capture group for the plugin name (aws, gcp, etc..) which we will reference as 'plugin' in this tutorial. +- a named capture group for the plugin current version which **must** be named `currentValue`. + +For our sample configuration file this regex will look like: + +```shell copy +kind:\s(?.*)\nspec:\n\s{2}name:.*?\w\n\s{2}path:\scloudquery\/(?.*)\n\s{2}version:\s\"?v(?.*\d)\"?\n +``` +This regular expression does the following: +- captures the `kind: (source|destination)` into a named capture group called 'kind` +- skips the `spec:` and `name:` lines of the file +- captures the `path: cloudqery/(gcp, aws, etc...)` into a named capture group called `plugin` while escaping the `cloudquery/` prefix. +- skips to the next line and captures the `version: "vX.X.X"` into the **required** named capture group `currentValue` while optionally checking if the string is quoted or not. + + +On the Regex101 site we can verify the regex is working by viewing the explanation section on the left side of the screen: + +![screenshot of regex101](/images/blog/manage-plugins-with-renovate/renovate-howto-regex101.png) + +**Important Note**: This regex is _specific_ to the example shown in this how-to guide, if your configuration file is formatted different (such as lines in different orders or indented differently like in a helm `values.yaml` file) then you'll need to adjust the regex accordingly. + +### Step 3: Add Custom RegexManager to Renovate + +The last thing we need to get this working is to simply add a block to the `regexManagers: []` in your `renovate.json` file in your code repository such as: + +```json copy +{ + "regexManagers": [ + { + "description": "Update Cloudquery Plugins", + "fileMatch": ["^cloudquery.yaml$"], + "matchStrings" [ + "kind:\\s(?.*)\\nspec:\\n\\s{2}name:.*?\\w\\n\\s{2}path:\\scloudquery\/(?.*)\\n\\s{2}version:\\s\"?v(?.*\\d)\"?\\n" + ], + "datasourceTemplate": "github-releases", + "packageNameTemplate": "cloudquery/cloudquery", + "depNameTemplate": "{{kind}}-{{plugin}}", + "extractVersionTemplate": "^plugins-{{kind}}-{{plugin}}-v(?.*)$", + "versioningTemplate": "semver" + } + ] +} +``` + +Things to be aware of when adding this regex to your `renovate.json` file: +- Any regular expression token (such as `\s` or `\n`) needs to be escaped in the configuration file as shown above. This does **not** apply to regular escapes such as escaping the `"` with a singular `\`. +- the `depNameTemplate` is the friendly name we'll see in PRs for the plugins. Our example simply uses the kind and plugin names from the capture group but feel free to use your own. +- the `extractVersionTemplate` must match the releases in the CloudQuery github repository which at the time of this guide being written follows this format: `plugins-source-aws-v9.1.0`. We simply use the named capture groups to substitute into the string, simply think of them as 'variables' in this context. +- the `packageNameTemplate` is simply the name of the GitHub repository for CloudQuery, this is just what the `github-releases` datasource expects as input. + +Once you've done this and renovate successfully runs, you should see the following the next time a plugin is released on github (with different labels based on your git workflow and CI): + +![pull request tab in GitHub](/images/blog/manage-plugins-with-renovate/renovate-pr-page.png) + +![example pull request](/images/blog/manage-plugins-with-renovate/renovate-pr-example.png) + +![files changed](/images/blog/manage-plugins-with-renovate/renovate-pr-changedfiles.png) + +## Summary + +In this post we've discussed how you can leverage Renovate for automatic plugin updates to ensure you're always running the latest versions of your source and destination plugins without having to manually update. \ No newline at end of file diff --git a/website/public/images/blog/manage-plugins-with-renovate/renovate-howto-regex101.png b/website/public/images/blog/manage-plugins-with-renovate/renovate-howto-regex101.png new file mode 100644 index 0000000000000000000000000000000000000000..0df8369a776d545429dfb3188ec707b7a1e16ba2 GIT binary patch literal 75676 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

id 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

OighZ|E^|TI0$Hj$$ABowB3>O?w-= z0!y2*Q#Ql!r?;T*olTT_i{AdhOL5izINP}{fmC9zl)k>X5PG-uP4aZ5--D_Y>Ou*~MwS8ssw;-@OUviuZlI|UaV-kHjTmO1 z$FO}RSY3fthDGwS&eHp;!bR&s@k5tE^dPBcb*~_P+v}i+aAnvg46b_tr#2=lXN=J5 zwjhM*pSZ{n;&IZfM>3wkjRYWrL>aNlBz%*{2%$AaBaNzCnyl? z2gsT5v>sx$vmk|BfWQA&n9P7=M?&f$oE}_vY}9lcfQ$cZOqa}W7nWt`Uwc`d_3&F`sw zwk3r9UCz(pYob7e$?Wy0Rrn~LIjnF;R4d}k!@V1W$)J8W*z>7jePj&`v@NW^&p#w~ z0QXu~3Fq)s2=|9A5|a&>)72qPh88{VwfB$Ag$UQ9wKyXk1q;9GITKkYL?T)yAZ2_^;`8o7SMD8k1J+T!qVEcU@ zlXnh4eO4bWE_qdnA{eP|{q+6z80s^>Yg(^@-gzYPeJIJH%n$E5%O08XRNHN*zKr9a z9pCzk6c$aEIU(QHWUU7~yv7|osn1&`2czG~Qx7UW%Mw)^(lHmcK@>-lP4~10>+>Aa5 z6K*@0Gh4HK;07+*KgfqUl{+FI!os8nNro=Ql2?&|Z=*VZ+{yrzU`MGL`1kOT79eUDFD_laT>ivi5iBWgi1*r~jS_N9n@mP_bZKKx7L#_7due3e8TJb)dOV4bFI;30Xnj+#xoL@H3V0LK8 z8B5;F(=a=91R+ZMsUTecTe#Xf_qhO%A(_@1%XN*IPfu>SYf0SB@!UNo9c=?P`79@t z$tkmPb9^<&&D-=}1`ZP*HBW~H`mkc<8ASDjJS<{I9HzSZ)W4CmNkyBY^zp+d*rVEG z$KzP^WYWdk78M2rAr?%Tpc^W##U+;21u;|zP-{o(aG5)uxLlzvKlW>c&1oDaB87%n z!zKu>1{T81Oz24yX29}Z@{gIWneJiBlnvSXhCY3MB1d?_`=Kb>qnnP9wByHI*yH+g zi7&Rd+ujh=^9mZC-9^Hty{oF&X52bs6u~&hCK3}iFZ7vsuJzhiJUN4c@K>pI;emAf z85@ke*hss`m?Y|Z%0rWhl9hh)tj7h#ik}9eFwda=Sw^$7r&k31E;sej%b}e!iInlg z2~0)!CgQ)C&B!*rhw<=vShA@(A0*57^4;}*C26P4Qg0_<&#m_;#aHPP17AmzXv8&_ zQ<3;NkYMxtWP0+aujhKi2C`lqZopl6^7zN|48Fm&(&of=aYyQy6a!JxQ!%ZSY5pf? zMK@Fu_fh1XKu*xHC`rtO>LB3lXTwU0l_fVA6v~FWZx_CLbKcZW$~(PdZhQr>T0I^0 zz}(dxwg}E&w2`#06T8!Py!NaPD=3ij*qN-HDEk=SbMqyXxMgPrRYBrLP;nH=Kv2)J zed64@(Ae`j(mTFO3~-BLmy&9W)`SJ)aBqNH;LNdP(mVUo%8~;MB;Br^IxMYyT6o#y zyApd=c5wo201K?V-1$mhgP8vWSIkqjpf8vvbQD*u%y0vaRsjcE}M@3H4Y?pBH$^Ke6LU7J zDjUzw7iUDs*K7?oHHvR~i+tbgCUBWiY1=e&{?a?8o?>({N<@4s984))L z3DWdiJFk|%k^Qk9K)Ui)DuQw7lj5V(c^eAm<~`rR>n!O&LB)mPd}z;Zq7XqhN&eGC zO3sTdlskyX#m<3})t) z5iTLQn{hu_O7zk_zs6u1Y@Bq5fmG^D1idK;^IdXz5 zv-9V>l+d#+l;JaLGo0QXuM@Q0Hfja>wxU9Es&jJtqKp?H{i;l~`OK@)FuW>KR0FRe zRg*)Cwqo$bZvHyT@ObYtvzhPxR-V+?cYN=*ayekBcrx3CnMocOrtRY~#3WU$Z*O>& z_+of`@EmfRMQeFXI|ONTVoi%^$jMjrA@ju&f!fL0{K$#dnDTc06t9WkwyTx5XjJy{ zo(-NFs=yJ0T+i#I!6}Wz&@Y`qEv0vUc2==N$%dQcaJ2d08TlN3K08WpudeV13!~=W zsTGK4`~CfjzUbm7vk!*PcnHY4IeAuU&K6YXnY$d^eX4|m)pcs9kyqr??$o@sTzR>#s3 zOkc^)kZ^i<+pKM;a7z|Zf#5PX83Jyi&vpClr(0UQR3TcA5KD)b88>lso=nB zz4EN~b5k_8pvHz-gGD}BvnhL3=AwK5)(8TrO+b(`?@3ujgdZkGnNOtAf*$wKpMEtzq3HpD=CA%}+i5`Nl2ZuUD_FX-Zd77AXS;%()OBaoO|GT>1K*JI*WkD~Pz=a<_R~ zdf7t1{k+5*27U!)CZgA)R3Mk3#D{qVoKd(aOv_Re2nuT><;)1p4lc`Fh=i~M z+nn!6g=sj)fc!iKd2A#aW9eQMm3j-v{fYQ$b9_O=T<0p24~hysbj!P!@G{ZN9KK!7@@N0UY8zEHsM*6S?6Pd)?Muiym8 zhz_-5(`!HD1aMOdKEBqW%UAX2%ac$&gdp5$lK^mF>&^@!O$(U*b3>B{d z|H6xJ0y3w65T{#=2qgL^Q4s;4Mp*I31b0D_@|3BOSAV9gs2af(zkMy7{G$*mQN?q3 z&3>Y>WHKd6K^BS)=s|AWSahV$gOkg$V=lWQRdTMk?`cI3ZCBz;CJv4 zr5Y1Vm8O80U}u(b-RBGhrco_md~kL%5SO4gQ7(kUw&ThJ1ST3%WcMJw^r?O;8=Yvs zP%9f_?(6;xq4K&1B8D=s`9~v$-}DJFAs=vGf0Z2|6te6}$6aqj#(g6(rXJo`b{$jg zJ@<*K#p^2oG#V*u=)J?t;dC(`OacP)?1KFvs@ARH4Z~b0VRMCyRE0L-oZpX+%kS`? z=O}CfdwS*@k69`I>Jad#e(qk+^{Acr7Wlc&+r89e+TZc;vgRNp3d#yMEIsh|Jh=U| z+=p$YH~ey*oX44pShk1b{tgI~IWeyNoSuO37Ty(!4n08=2dUzESf$$|N$L9=-&Rkc z$+C*8$Ib02_mh_!F1-pa;aB*HXpunmKB21EX7?3_N)7S2z5Ta_!n!=8Aig zQ^i8AJ#7HgIg&g3B>s@kUZsuh#m(h$*UayXH7MBJl&-Uk>t12H}*t~p3Z3Ee@X!+S+fj@$sEcsN`otL&M!iAK!Me z|AIuy&Vq{O`6?K7q$+WYMYABEl54|bRb7@iDNquW@fqNz?1iv!hafVou__rpUGb|C z2d8!y=uPfmRWiJVv2L;bW|kffs|t`A{glHD<*;z(!^VVtTFf@iDqHrhjAAwcdzv>? zZcl7Lt@g+2U@&mBL5Qd8)QsxO$_5-)^cm|2LN~1o5zX1KDi^in&be#$(~E#sPD{Q@?z!SYdX=di#QSkZX3n4<@+5$|99k)(q! zPf)2`ziP@nt5W(oMCiRYx!tURVi+;v4OO&8OKYKw^0BNa-%#F!C}TlEuM8$`D+=se zb93$RR5?dqgC*>b02w{4VuVmSzCywsD6SCg>yHTfR|BVM;q$HaK$B$>f^C4S>Jo!! z5uua<8RBs%tEyw{OJkI)(yQzJWO(qM{1;&)zHMZJe zUAR&hNjeG3k>;Uqv~Pd1H_E)pv#r>O-aL@%0fSFH=OkXJMr4#-v4NA<{6bVM=7ugOhM}jeVGOk-$B{Ada~ijYxa!ss8sn8x}O=lA&{L3l~dwh9|Q}t+9ke zXH=>lY|rNekE}+a9j=(}>^2(`Ukbnwe}Z4x}|V z(i&f_PQ8#Dt^!1o)fnlrR)ZV;Lxq8?V`sSYn|lD?&8(B%8Tbv5Ov35(z^k2o8mz_W z$gn_+_{JgO@3dv$R@%2)t&7RRh;Ow3rg}TE)`zpBFC|){&0+h@!(^M^zd}`}j9ZxX zNFR8E5r`jLzpfH<@w7r}Dy=s{ryP(@Ji$lf_vg{&nSoUt5ZE-1y`Z&^&ZL@*w7Jg1 zMff6$T!S!+l3Q!noD)OYU%CAIrm$43(6v+JA;**RHLb|q)w40yQDloYA27lEtHZHd zJ?GD_h`S6QJ->EreeCoicT3i}JJQs5bd7a+P0p3jNnXy=E5a|1P02WaKz{s+rW##A zQ5?;2{^RP=4|I)BywP*n40$Cq;PPr;`OEZ`wWjYu13{m@>;}G7{(>~-xgGxe_;pvg z{lfm8$*j*lAE57K^*81!?MJfBai!Y3+NJfULIzk-Y0~|yRyAW9HhEg1YBPpT&rP_9 z4{MDw)bJarhAKR%5Zp7fBFYxo^^pWFna`vFa(wq7h2^ymgrE}=1LF**6iTM<->rJsd+ zOj1l#Re|W({L#oDtSNR(y&PXm$NXoiTRukkx>c?|i`vb)?|e=glGwQ#kXgM`ywg2K zPr2>{9Dy+6(o>~sf6eo&V>cyFb@Idu^`z*O0ca;QMvQeUO)2TaObXP#!k{mk)T`uu z(Xks9wcx4Ysm<~AqfX8Z6y1+U-AV)5=ze;1WkCDN>S%${jnzX2i@VOxbfW@eK%?@q zMh{ag7E|yDHP7;CW2*iE#S2-7j!D_{Fr&KFNF}mf|2{I-6~UDSpCy4LX0sFuU7%BH zs(}C)`@~?yuiy!}6j$%&-by!Ae3Um%Om_A#O|gB&?BSpqyVJ#NxH#72f+gj-sBZ4; zY1NDr{_CVXD-+i~1)W4;*5eLWzk|@Tb}sJyH!u%geG!PdnxZSo|Kn!jPbeoydrL!K5SV->h!K&`!VgK{LCEO5f;tHl2V6(`ya&lj-lu${e|H z7-h<>7R`Q9eu6k0@1RDg%&EMnj5}8szH8*O!yj%aNSmSygOdo?@;cKXO1jX-GamKI z{NCA<2CW=kNv)NKDFZeIf(a^=X=fzd4^6B;#^>)bn3z7?JJ{;mZH(!7XU}`&FgTv} zMRItnk2B>^2lf9o_m**0ZQu8>^g-$n5=uAH(nv^$K}k2#NOw!8(ygR|!l7H~mR2OB z8v)59UH`T3y$>1E)-y1$2g!)0LtQkGWW2m*Axt{rG!aNW+Sl|2gw@G*g!JuvQ2>5 zhMc^ZBOS(wS`hi_MA1vTlQo6{R%sN3k*MAi@hU94X{575&Gm89K8Kd*JAM1~Sfr10 zrmuS9Z=S@ZDAUpYDllRmHduvEX^hEdYEM3)PntK=C6^fsdluRgw=43^ka)?3q%Ie} zcLW|^gQBwS8hapk-Q*Cbx;I3x>H%W6-Ar(6Qs3UWQYf_<~H*xQo`0-^>$UqgveEF8FpjU2fl` zMqW_C=xDd~VU0CKh|dm*yiY&4mHrv(iXi3B5tlV$!IEkgzQX%VFyqSBF zSoeAI&)8Y%`=6u@HU(X3Q&_`gB}YOC5h)Y0F`2bE{z)O{D~>?Cll0@Qbe&3K{PSIM zd*^pGL#WzMFTMCo>@c3OSJW|O<8c#LGbA0N00-}XDvG>zMC%PnCm!g z(cTtd$epWWl<_epW`>r^4CRxKQzT2Sc8gSfi!4>@o8$YA{s*6(y4s5)L26Q;gaUbw zS<56e%qO0aT`vW|t@R%)F^M(JG&?|Y<>Nv_HCbL*|#my1gV&eT`qdu=B1NZG(~ zrMD{jS&f)RQVxv{sf~B;hfEoOOqwS4!?=Alq(4njwvVm<2a$SjjhdM+3ezRt_%7UZ zI9lW%A`3=%#w4irE!-)eVv|%ga zc*##zX)9{jO!qi>bkx<2c4d{IY_z7gDy;z``8$ZEsWnFqhcdMyJXwTCh9B-3xZciu z-%jhuW~uyPbI4k2)qQbxWm>vj9i5KD)gC#FIqO*C&h{x1>hBItswClU8+uD%9*t zguTbi7SJ|K-`Y|vi(J?%TG5RXY(uPFd&c7J9r`jhQ`@*c=0P< z2LIDM+JG6u(*yiO)^e^K5E9iHp`Bt_*3n@|`8Csx;|zu_BHE?k)WYaWqh(%6#aBtr zugAxpJ}An&cfXO7P!au{{!!4~%c!8)+;Ngrd?9Y8MVX+xO#{Wd++&PhJjHOD8x0pLxws#RN9_Kd_i+coZn1NVa(Yk6ntUmQ8k{ z-a*#ODkV)V58;i9F}_yhyS*QxY_i#SUcb0)jC1yXa{zI=d!VZ`3-`un-~{mSHUXx= z$&$b)tl5)@HBPr5ViLzEU(!&CWAxPq718o#%0Q0({51)p=DV`yrp9oh9ib^*v}x$F zJZqSK=yd4I&zMYuhe?>a`$;&$kNKmNf#(7jh7I71gT zwU>3$%ihUCpL~C5%_e$#tmnRw$~*^IE1RWJ0+5lH_~__d&qbn)q}KcNJZ@Y*HCh<* z{dA8x5=|O@r5YFiYCmE>h=NPZx`VhAE;*)`fPWHvaSF;|%JK?49wxjkEMh-?7@kgl zFAwjgmv2evK$)^7XPh8|dm4?KOnI_v#X>m=o9SV6HHRtXejjGR9xPDZLUl1IzZ0+U3cd3E_#}xpy4m`H{IjS~ zj+sJS7wWE#l7X;ii@OFK3#J&UY%{o2*m=L=4A9PqJH6QQB@fNK zo`=%RDoB)hdp((D=uj!k^M{4*-;QdElqz$6JA%Y+1(t}Qnxr$2IvmB>J~>Lo=PqjF zB{Zjba1-~iwejsXa<4BtLZ|AOm`?O(j)496O_CDvh^<@M-ICtPLI}$_3@<*BGD~X( z=mOMUob{`pKD9|AyNIXW;ic`pH7nNR=zbvVMr<0IWX0UO88eG3&F21?XSG9~74q8C zdsCIq3MWkcB03E6{hu9yNTB>{!ck5};GkeU4L#knE6~DQ`$$hVhgE8PFADavq*q*w)t{Qj9bRu@q6(y;za3 z*^ODa+GXnEOQb9)J+ycxy7}H`Xk1F_a~;(DR`YG$r!hqGvG_0=v+faSU#^KD`U=bH z>lOwE6?XJyb0Ww%pViOkL6LTME@l>_3Hlo%n0kmrShi?kuMJ?KL@2kt=eCU|54vz& zUatsGWK(HzHVC8N|QO?OLcT(={s6^}crC*^xE=S}%=%*tV4# zF{*V98U|>YUpaq^=pN@9+Y8hxnBue$BjoM7oo1~diP7#WjpBwgL(6?!dq=A#CL;L3 z)`w)>>#fOfBM>*az-|#>$7X5VdS{0~vNHUj*BxmdD-rKMBF>}Y6Kgr`<{tLgVKp~m z>~F}z_2Cvtwb;$xO8tG;y)(P5KCNx&F04!~xw@v-4>y~tk!^S-fMh)$F~wOkQF1-S z)joAKwL`5Ye|5ep>e(3(Z%4VYY@ZajEb)tF)8<#iv)#wweGz%{3Z*hj0xNMS~4hX)ej(e4+vj`Vc`T2Cj?w^goxR*F`sbGBW4Boo{$ zL-;GXFvJ~`vg?o0Fa3xXNRKxKHEWG8ntMARr*U|`OkgYF)pN{ib}?@i{mu7OeVGQs zL2n80e*y#23NNS}CCh`3P?}T+aies?D!gC*8TUls-kr%@J3RS88~@(a)@isJnh}4P z>NC>cOL~sC)2erNm{N5sjCjTkBt+iu)r%oCTn9^WH@hX4S{zd~A~Z>}_T(e$gv+(v z^!a;j)8=G-ODV0LKhy=+%7f$OA*cM0fw18YA*)tHg?iVz`tD_Q-VYaqiM-fAVwk|1vXG)V8uLT%=cT&@$PClgaa4J&sj=MsEP z5EQA2x+3j!^J<(mOZt;bQkHVB=md52GY_#!RiMx_)J(~$3N^b}#F7*q00uY3(H=g5 zGUaC%_Jg)z0FT(F@CGjEp$vUWs!isb}IU@f_qnxUTD}H3FgFH)*3}KN9LJ9S``2IE<*tFL381Q*G_poit zmCH~Dw?h747_BryzOU2l)0V^Xc|53e`#iH-Hsht?MQY&re()%&`whI{E6GvM1#3LU z6^_b)c{a=TUECl>ypW~j4}b~C4Z77$s(aBV)zDG^vj~1t@yB21bjT?*T{Mgw+a9bd zU(LiJi~uhjoxFZs`Sk5~M_iYqB&jz*%BmrQV>Y+m%fK8OTxj0#-TM|t%%J`^$2-lI za{*hJ-7NWU0sArw0*MsMcCuY5$`6QsI=e>)OP1=&*p8z zqpMqLWefFb4>?7VhNw@MY-kT}Wu^vH<1WLyiW{33_5{md+U2Tpg|p7zAs5lUxFU?q*1bF5&ck96 zkNneVG-L3>l-EooqnAExiN2GgK@VV^Hxokhr_!M64SrY+mhb095uOh;DuFq{SJ zo1O2|Rd!l5BenS_vu#?N9M$VOwGq0RavXy%QSnZ=oU{=LCGmXQ~-c zj^xjJ^s>c1&jFAeDb`+S`4lLji6D{W|8Tq}O3|v~I=y+e)XX+G?W2u8$ z7x_d3F8Dt0>6;qDpCJY3Y`R?>mKyxqkxp`q%7P~u=U;tETt=m^#&hOi^2wV=b9-WM zD9|qyD?$w~e2zu;F6+dNbp%=s4}Lq+kD{Sy89f{vE%=q}m};%W`+D+leP>jXQC@uI zPIT%WF;d+vZAtCc%QsOq1;$rNjVclt4npu? z;{kjs9XQ)#N4xt9{~;@(aG@afQDV4Si|Eff@bCY8%p?@9_?<_Zj3Fx#3MZhbBK83w zGUd;<%poT8-;WVWgJT?K82b_mD*yQyPd^MWG;1YE_E0qT&&T9pVB7ouys30)ba{8| zO}0>4l@#z3FQ5|}_mzw1|9&tYc1Z@l@6Gb}W+5;Qt^q6LNdDigF@ifgr2cPw&>unY zhMPwpcG>@&wBGoqFY5||Q56!RwqDHb^}nD-rrZ2jerXFWeF4->n{?YQq~G5O-}lZcc!Bft%)Hs<)pz;2>rfBYesSz@lVO=kf9Ks63Er`6EXrEEW@W1Jv!l z7sFcF83Gl`nl(!!f!9c{lJuIDfNNw<8pP0CZb;r_)QDE+%bGlg>o@^rPWC}Ambi89 z@#VJh&6eJ-O5nMMrdQ7SkD`8X(&_C2ad8zeqDq4V_jYG$^QVPE&7bOSKn`a!eduzP zMN;<}fHN*P7YnTjpi6m?x~IK3vvBPpviJ(EKhv%(*Gn3e8$&od0i*lX|9f=ozNc+?@7yBWr+r z!-!U|&b@%M0pnDt>GtKHB1uj#CKLO|l*nGm>&jW6NXKY=87O8oguJ>~xGCFd0#zUV zoix|`AI%2$TCa8-*XRhm`_k7w-Ym!OF z^WzK4=cA!VUx2SJY1h&kcc3?wQ=HggpBc|QxV0}-4@O>&NroH^7#&x67pfpN6j)KR z^T7}UQa&02?)AuL7o5CnrUbq^Shu4u$8xUSH1$-xI*9uxTaIgsX`wrue2@(Jj~K_v z2@eBDyDH#^nF53lbs7q-G#uYY{MPwW+*B2_nY56g?pzzh&9y$i$^(u{K9}l(!t}F| z^SAaD?U-v(Dt=~ja=LUF6bZluQJg5tiA$$#e8;C{T?zE65qJaLOeaL#Q^ z7r{t6;uv@_(?1H{vUyu2$XgBQoV|xRQsaFBPCIE*izKf$*PP>gXE|QoMj_{?J|B(n zsH+})`GQIW%Wh9e#Yf#e>8^Rs)o-g2^%mDfxFl{%az_Zw<)U8wKFVY6P=RmHdFpV0 z{a9V4n70w|7~d>@yDYr0^%*Eo>>AgPp^%dn2U;=%AcJq%jA<|nu^LCLp+#Q>pkBr7 zP*mdbw0uU_>YXO3q1(5P$8y7e)Gw}vqaoPm!W7)?wZ_;{Qd%twD(rra<3|9Z@*25)UQSJi`p!u_kWE)T$)vtwG z&z|yf?MLpf@`s)DO?A#l{}jTG-q3y+D>S@$hA%}=D7O(c+9!>}`CKXFqJ*>Qk&~-L zgFv(15bxkwjTNY%d0VQoBZ|C{HMvii4!7CARq+{8GvJ$!dX>$9E}6I=i{82@{{#&2 z)+4J{sl-}`SCHy#%VePWG(z$+4}YD{a*&n4ZxPK-6KDh7y}?@Gi_vt1TZJJc#`;gc z#RWX~09{wiMt?AeR7AWR2yB{&@Sp;!kMWL+(Flp>N}cYLhT1^yl4E(Yb%W@D?+BjW z%WdGpegK>xd)+D;w~9;dlRC!+6g}ZYRq^iEh*p7>6LvF_z?Vf6K0)MNiAfdu_OmJMe5^{9*2E zMe+kgGuX_yNBnnPw{MyhK~0N`cq?8{4tdt)i0>GqDM$#v9?}eDF@>6ACj(D#I>AZD z`TW8Jw3vFZJJnv3=ftu%5i$1gWY0hebqC}I)t;Ba(o;%kRLm~&^39`B; zJZBzdU0~;Z4rs@;stG;2aeqww4)quB{K3L1J5Zd6aseGQUiy34<)Pe&T_41ipWV^9 zh6uA`;AkfriTf~;9=C~=`f@#l({sr+=fc4LwMWYur{m`I1MHO9WUvuj^n=PgBYerr z{bF>;kw?^;TopPOwA9T^zG<1WSnSfZWqv^D=Nnyu^W?%_mJ~3OKz;8o zt!ojgKl<9hdp{Js2>aPa_UX_75-g3QZF+wJZcVma$$|sj`?v>;v;-ZJO`K2F(jK5U zJ}7e|K9dGSs=YmqN^sq6ISiXc&V2+DlL);Xxuq)*&gGJZ^r%OPBQ+b@&o0 zR;7?oUVgi7o#v}L0$usL3^7_h%9>`mk0wiylEI`*09bYW1T?>d;?UD_&O6Uv5aKcP z#Y%;y1iOVY<>D*F8N8F2<3I=#*kRk`I(0<9_fi}jHc_ik*O6Glk6S_d+7jlX>t-3O z4w*}k^2sgDlRk5Ggq%{>s&lSh+UKso*67s|O5UNmIrd7VigbLtR^^(LmHyxZau#W( zroP8L+fsIuLW4KSG)$M_LQQ!q0(Kh?Z84ghe>#1_A2XWI19O!lw`_tH%#mAWC{~Og zZ88YP$^tABT$L9D4iO>*u`-L1kF1NVj4r-btjPbE+?hFAJu}B`6pB^pk)g+~XA{eq z{?t5ONJV&VojR}()i(RcL^?a1+`th8>!MR;=gZNv{>#qxn*x2_xtY$oy-L5$K2=`Q zr~WK+MBJEw}QI!`CLuSjDO4xhQT@+Vb;lC_hd~R=y>S9FSc(;uXPmtkrBav zm<|yL;TLbr!B$`KxRgTyD zBx*$ld;b9*gP3a0X%|be`_B>Nd-1D8f(Vg~3X6hPA}`;k_OTnU(;Psh?zZ=BBP!Ve zEXyW*iH<}%gnfr{4zU>}As5_o7VMQ{LD*p|H9FEnb_R(#?N2P78)&h164+u2KV{er?bzBTc`bm-*RfBiY)dGM?M~FZ zV-EBZeKJ8jeR3wv{6GEcUrf)`MD&J6NU6^NWuq2x?etpDh2)y_AGMcyTr#e?l#b2b zvraHoSt2LARcT#JXNp4!7>e@(9jPT>x)PmayFY7rkV3lxMU>N<>YO4x3RyR-J4$gd zG}Iw?nw{LX>17J+wYk|MNf#c!_`4G|3$SnIQDPVq!eTnVT<}e%NUj7!(3S*Atz-5> zUUZlpzf~VRXM4-w*KWV?_G#`j`H*vR=KZuUv}x8=vi@D(gr3Sx`oqBwno#=^C2aT% zYHi?B@987Hl5gsKO^;N3*us^>eN1yXu0whvBr4O z&eL_cki5M}2+rilXrwiG_q9u!CGihy*Sh##W74c0C5$@=SeYp2-C6B>S)ATeOg*2p z&VfA>X{GXpq%)WY9h2$j`Mh5?)q>ki=QjjCc7#Os(-%+b{fK+IKEvUT`h3^ z#r?R|B`==cG`>OT&k2a6ts@NNzhnvv296lnIVhnQQU_sJ>dBwT&%Q*A#oZx_N35Vw z35pSJSj<)a&`~?M)!lMxS!wO)3ji`(TGbm}4$Ni6mgpA>J2Q(kSM~%i3nnIBs(kut zZHap7MtpnDU+DLfcMk4DukCl`Zu_e)VGv40!lmn1W>;W$EM{Lj_42h9j1mZ~g|ehj zxHWA}WE;)I+T*54ojbmj360h0$u#Y*+)Z-ma-8~H4PnO}+|De4l`u8-+ zVr}Lb2uuHq+Q}i*{yW&*_3tIrAcXtTDC4E}|3Efi_yMA>#7P`d`it7{1mzLY@zFUx z=YCPg{y**@9SQNZ!!O=i{RP|W*y!Ph{D1VhJhC4#JWPNM_QJfZ^%g)jrD{8xO|YC3bv{L05p;gjCs8?Cfg87A^ros|NrnIndZB`5?xkxTsII( zmAqUccsP@DF}smkB(}!(?q;Ja4n!-Zew&Yt??aj`?=6iSQI=;3?od*lQg#uDUhf-U zOizkh>3|Z#esJ*r9=6 z`47Et_)$T;7;?Q_ONjGZeQAFKcoo9|@nym|Ru$jrG0T}ifag*nf1gVbC;?x>q_}`T z1y<~nj-5b%ZG`ntwXaQ8EkH3$$u>?M&K_^WYX`7v~kEg7` zA^!sii}PS%1gKM6yFO_RJR7u<(3rnm7fJ)L!Ee;I(6A98mRdmLl7es$B|S+xk3!h^ zAX+<_Me^*c>)~^x<{Zf-M6!S7GzdJd&bhN{GHK|^IpWpBC#pjm1w;AJ3~V~mfd9eg z>Jb9v>yHI*?k7u>kAcfh9zx&t4PMXvWSj zEYyJUIi41utYg3hSmN*{qivahbubHnTkqIK+;_l6vKihMDvk#Q>-SAfuqD@d<33$2 zfJwKioWLyx?s!&Izje%^hrNA+_zZ4&iE0o|kop6Zr0P)vTE(;OqFrvp#rKyC&Gb*| zi6t58!+24rdw+1RF&#thKQ7g6aW#pf!Q9RPM9&(8$B!5xjX~`YqE?FOyr|UF<`Ax` zis?*h29w*r+6!#GzGrcT1ka&bFX|kAn3&e|UhKCiK}_Jb(33y!!Z^%3E-HcX$6yk5 zwyvmz(v9jb@EV!wTBK;+w*-^g+7H+!{g&&a@)7B~Mt~ynVf;EWvYmW2U5hH`Ww%auV2yj9F>nd0S`O(T+5=Wm@ zQUH=^X<8R3|1@(A-dVD%%qIsN3{1G8VCu1sD2%{6qCAro^y=!Dg5-UG{3QnxA9Lwa z@4vztoQU_M&)Fb*7xy;Q z(%XCT%e=rq2qA&pE3-vl{Xx}FVf9uGt9b#u)9#ZG=MUa&z2w6pF5FxhdoQBV=nOz2p&Jk1t@UrGc5bvVauY%1Htii-13B)x*+K=0EP` zy=u{o1bFl*UOCj?;9Wk4-v+g;N&Xwit}c|xl(y=%y7zdAk!H!+u4k)0XigXREQN5l zBIx1}&bH2Aa6_ML{Bj( zxwkGVz?X|{1|s_)x1#Zq{3}3v8eAD)WqZ%dk32|Rxn3V%5}?ga0S+*#k>+yOj(yX`~8_U!xuNfW-|1Sxu_xRMRgx?&5HC z^$+5!pe110)uU(ey!Ms|@*H?2*w0#0ksDpaDjX0^(p;u^JA|o+`{K3fKhBG^1+6Zm z*~qsWZqvmE%Je*Q5XG`M%rxRNQN1M;6RsU(vNGkb0gtF}IV#mWn6X-<&AI+l#BM6Q z6iVEW1UuxGCj3wsbaUEj`;K^lSfKW)l-amx!;(;?nF6IK@A*_?0frX4Gu@GS+NU6) z-pRR*sD7pk3W~5q{Bj>C(D=Jiy<+t`c$W9}-y~i`JMe#<)k`~W0;j`oz4DgkB|OKE z{>?xVHvlmf@N5yP2b&tS77Wre5Iy1 z*X53%r{fJk9V1)~|2y1bc}4_S$DePZMA`ST5q+Wo2wrn2D6hs#Ig`{qIj2tuW9O%; zWLPVBC-2;*aQ2k+4Iq55^l*e;I!G3oy}wE)ysLdCn&^A90lMex#WIzl9S%NzCANQ9 z6P0p+7W5Oi;@W-W>A$_QU&r4qxVj3-B+a+Mo2K8(5Wzzm-IwF6^ySB=H{dMu#!xy1 zOI7qS>-Qrm7wJD#rlTVe3z`_sb2tA<01GM-74;-bk)=UGsbQ0=VKKO>=dRrk0@8WX zgP)+!-uqOc_)xNT8QWK~~>z_8ncGOyUiBMC~Nkx&Pin{HOj79Z5VKIMzq|ZFk%AIsLUg%p zj2~e!tjv^5xJ`qd+az(?PB1YV>|e&tG=JSEX?^>o-UGIvrnqEpof@@}Od`cEQzOR} zdP&wl>?)f;x0b{?9K!?ePq&Ecf}`W2B-Y#;FaYt^&yd`^d4|ra&_9W_A z$4bJokm*s6yo9}{O-4!S#3mUJC4*zJQRv+ON&mQ{NSX#tdI(BF$^$NpUFv5^b$mR+ zXvpu-_3*s7*YT)ECY_gwFnto99$!R9{V1f&i!mnr-ac?!KZVBW7R8 z3a8)kc-d;7fYzo?Uj9U$YHs*-I&6{_2eTEB-eoJ#cC=b11y@-^zsxO?&u33% zFI*Ak?)$}?aJkXsy_aI#CE!A;E*k6`>_rw{WU_EIIbUtb;se{uJ-tw-XHq{W>MFc* z;cuWkU#b-Y372-jESVVYmMx3pv0bm%u?Ml5F9Puyn zTf#B^nD>01F+73ienN~uMs}aaLx?JU4$Vb-h)QGNL5wlSa(iBl87);!(v-LB4qC72 z%@#f|ds+{`TSBFJ+`%N)_iC=B%$jT4WSI*Jsge*-iHtIc`+@>e_>Q%g-oz`9o0kve#)k$bfabpF!fn^lyt|%kgtvGMp=vrt#0a zeQa1PJsy@d?tmzWiwMy`X*HOxHusSoQ6XKe_(+b-)cw66TdG`v4h_u$&y-(%&9 zUN7-yIY=GmKsni`a59}Fk@!K>1InA;A0}LO(GI(G&v=!O2+@-3@YoCcE5&e? zBin&|-H3Q_`p78?YMuLzQ7)uN41+Yfq1dZb>g%hneA{TL9zUOIl}t0I2Y62KAiFO& zA(Uwr*D<%4HnMAbq$9;{Df!VET)>QA7%Giz^ZrtynXH>1BbNDm<<*yIgKr_gA-V>F za~Gz(H)^fE63fd(d#kc=^bc%M=!&EMIH8fHd%gexr^oTGlKTbqp; zdxG#sf-YA&ba-|Kq$2Rag6G05;$!N(NW~=+$Oqx4Q@s*ey(nWAFPP;hdqX@yeB-XA z^7??~xV{zCpD$)AawyI4sla)bo?pq*hZ(~!r^;!1QujmCD?5^cn@;-#w&d=HIVY5* zV+#!OEjajI=Rg@dzllZe53P-3$?cE} zK8r25iFj4|9QTf$@Duh>l=ukM*iOn4#D(!gKMi$a!V&tgbzSo3V!kit_O_-$fmX4! zAd}Abq8HO6FWx34x(6zx^Vap&Z}fVKZaU*M`IM5iX$(wX!hg)vw zJRv6RcSopp=-_-H7iK<(7o(j~nBNl6Ij&;O!Vwg3=GB3RY#;{&K@|jw?5pq^a^_^7=T|y8LZa!1p+q@Gz23i%RX;u)N0V z6I$CyH3La=Y!m{5r`4A_t+gK-C*0a+Ev z#LIB;b*+1*=q1UrCPvaG>Y)6Jh)3fanHJF=>WCt)kB0NSm;(JMUXWBL@!XqtSu?8{ zFm~8x#r(`tTjS3c5;qR2wbCk)VIzfOweyhz2GlnR)d8 z{vZ6o0|&eVW-uGh|1lYDs!{P7ifKYm{>NnS+|b8oho7BHTaElx1>`|m3laleVZwAz z!oEAVH|FfJ#2=$G;{X;UDa?H0?-d7Ez&)h*ayxl&|7B!20DA(=qjgpOULg)rB2c%s z{cQfLV5owV+xD+5++3f06?OdQ_ZY(4_5x16JeVliP(XbB`4)UM-3%y;c)DM0Z2qN+ zHX)tErq5c{-2X<|MgskMG|I@>-$9PufpiW>{T5&Tj))D?Igp@b7yX~kfgRF0Y^Mx( z{GZMNQk}42imCjc&OsX*%p`l-&R^oDkR1HD2Ci2&*WVGB!EkHoSKW5Z>wJgloj?lj zA34CgB(aO1BV16P_2JD%+rbWsegc!UM($ta$>|auvO%k z*Qf-5QN_iz`tt$pqehVMrD26K=T>xh^L$RgZY%|QqpIUE(MOL#q-&i!2KA5Y-msFq z(Dfd&GvXWNEl`Eoh=OLd_Z$7cCuKk90;t0UN^}Y}Z$1snx5vTo1TLVYp}C(%p=Xo| zTufV3=XY;_9YyO)&?&?MWHRlwzaeh`v>san(h;_4sSGIZbwpY2JGX855R>-|0zvQy zp{6Cgqo&(efB-7qk-^RC_XHlAIsD)E0d4f<_y_<8ZYUdn|EDNu+T9NU=c;zhdxH}b zM)!7s6yXrCMXhFQEn*-dv<)N>S&i4-{btnLdkl?t4b)O`LCgu0YMBhgYz~T`Ge5b@ z$`INva|1BP=Q_|LOz2&=-V2c{aCDVU6t#EIZqr$HO8|~<@6R)Fl35_!_;c9MD_&MT zN1!#uKy%i22r}U{)mPwsvzR-Mj}UvWXN3?CDXVHdA1~jc{m!u<0+fX$Y}?%jkb+|X zVuXB>cLG5wx1SFPRI1ugaemmh0$ybMEa$kUX#55b!NJSrgVu0-32v!)qF@D9wI)n@ zmnm=II&jxDM;~I2CLUY^G0hDt)R0pXhFG+Y@K4Te>6G(&^`RBuK~FI;0OA+!)2Rxn zg$q1|=pb#27r?wT*J(HK=4KwhiHKwFSKQ%ob>Go~#H2O33K6a%-%AvR)4Fm2%EdLx zeyrizV5Q6IKKhtsU=dah)l$`RpL>CxbkECmv-tOAX>pz7gtCH6*y3KojWVI3t(}bo z1{^8#4;-JrHbH8cC0gw0~rP);VQuvcB8 zGez0dj{Gd~CyziAbOt*E%h?Fj8aCkviGbD}1C!t}{!^?&?E=Wg6e^FYJW97wsd1Mp zAX(6;F9){0Yojs*rLB0Gdp?t2Yz-l|PAp=7lUm~5X0W4`x2_O8jtx^-l=(`l2*a1k zd?T`+t}Mm{dNEC>eSWc?V`&KL$gQ9TbOW{}rCKSBlcG!!gVr-ZuR;@{S#kniE)$kZ zlL*0I#$)+Al%s1A0XIOQQrget(Yj;r$j%L5QOve-{DA7TTKE^;95T?>XNuouK~dd= zB4v64Uq!WtLx+x%vGYY$m z?eg5pH@n+@N_+<2W+f?F6H@Agu)kgXD3Z`DH~!MxJRC*h-NS$gif!J~EWb|%Xi?So zOV}!2(g%<>1f&a4AJ(&=CPlV|Dt1DGwrP@7Vbf0(r%|)v$G19Ar@>y|uV+`Pc|u1O z`k_bkVn0ICAp4|gLvz5O5vqJ7iqW%fljQgXspa&{6eyi#e+J%M;aJSoj9zHo2}Q{x z9Gj%!+AbWQ+dExvf$E&@o9&ngAn(>#0JaHXdh7PA2~B$CAln%bE!6fAIw5?Z?xrq) zc6aNi@FPq<0oZyCa2nje>&A=f5qPX~(*aui?6Gni#9Hk1vcFjl)#5QjgAi5y_m5_1 z7~xUzMIHT@zpW(o%kL0$KQ=!9{;VuxkWtDAS1z~JU};#gXcdy19IYFG!q9PK z_cFl}g^b5iZ8xcYG6d@@O9B`gLhDy?j8CO&(`!>)Ui&M`C0YMK+r22rq3es<-ke6_ zH?m}&aE`TMk5TwJThV|Kv1f}J9&AHXp?nCwl=n^osK zVeH}v{t22en+ht%JOZgj(_AM8n$ETh!0QI2GrRS>tT51BaY#m!i&%eg?|j&Pni zy=)8+ZX0(Umg!>rn+T!4QOJt(83D&c%o7@JRPE*!27~uJ1aJbfCPN%=JbUNB{kK!) z;xO6)L-EM-x9}4@f-K4yQ}l@@!Cj`QhN8I`DZlVf|CW3IfOG-y1Md*7$Fpr+E_YmC z3;R^FH+P_$9X}nI;7uITvBi8mvE#+~CW)OlGEzV3*CcK4A9k6j69(Kja;ejy?H)>D zvWeQP1lg46v`r$%LU$+AQJGrnUh~_PsL_1;7GG=t*O6h3N;-WE2kQ= zW31$o4J^2+w6AK_U6xR+IBkmCe|-@&dB2H$c-x3cT0PPtbQzAeL@L{UM6!N6u@{5J z;nc?|PBPgt-hB17La$&RR0dEmF(mD|ON-Z}P&Nq;Ufr3^fZL{xc6&fxC8?koauFqZcq&Q~ex|SIhw#)iR za?;YzG6x#rm>G~Pg2)a__S774D25hlF%zpM6o*5U%PGaxfj7q?^lc%L8e7}{lG^dz zl1(njOg5%_)w2Z5XeHxN*-U!R_FC0&40eR9ZY|TH%4gjer-C*w5;)Ohxsqs2Oyb(o z;=7F7QFUF7H3<=eS1)r~G6{bq)8Zv(i^afb6n9f{P_|(+*eQ7Tck1?eGVr%W9^DmV zkT#&}Qxaovrp`+iL>VuV%1-&{Il9+ZPbe?@#uu9)*dXTk3DJn&B4wWBYT?h`kHi@% zq3q~HMqN{B3lIXRg^m^L`!TV;hKE%3EkUUm4`TbM{;5!DGaI_)U{p4>?#B0C_O#Q) z*5rNLXY6hksl*uV!~CD3)QVwUen`A>6e@#xV{fUxHed3{^Q%gb+ zN3=}m+LE=8Pe+z0M<_5MByE;kq-x4EVD#}9C}k*#N+B_fWXnE&ydNS?5JHLdHS^m9 z>qCkK7flo8&4cWHj>wU1G&8io6H5)&N9cKtbIqT)t`rz&xu<7d=L&2`FEnv9u{Tjk zyY-PF;8BY4Zj$`n0ttTXO&E5<#hnM!1^Cf(R}TiC_pOWgT#; zgE3jW2}wYTbw`VH+~b`kQP(-@gT0|La(VL)$YfPN33N4V?$Av`Op&N8Oc6RVGzKPN zYMXk=t@uFNXB-M$xfIK@9RBDLX4~$5$tOeZlny3ivypET3h7DnP43X!@3fOnOv9&; z9sJD_wH+7N5Z#WzMmTy8=x>oS-l9`07Yn1Mgqdozvo-<6nP&d0Q#uFPdo#DIchf^9 z57B0;fzVjtVJ#iO&_!8w!9l@mk?*F;&V!b!5t|_)(Kfx(xGre)-@ezT+>AZ1ncIq~ zJ2e8G!EEtIm`<38i)EUnm6MpH&0%P~r9W7@{14WJT1Bo)yGWdun{A(!YPDSrsm9lA zQZHE~?$0!_6wrIo;}Pyg?Gzf+Te)-%GOQNp8#=!PJb6^xDO|_I((8IY#aI^ww7o=#VNAJR5zGt=kMJyT zXzjSP)?knE9Kk5s*rZASp;mI-cfW}5xTb$zMQOAWQ;@okDKcL@$?OtBIaxkPo8C}9 z%icVFx8cbj@7>AaSqMyq(D8hFZ(5--oS`mtw;>8I6{?5ep+t2J=Et23=6DAwDc(Ht zbPf2SKlj0(L!0!sEXM)Y_&Q`a^PjMxfgs4cXDnWuAN&P#_#>aY%;Cn=?_h%jFx(WF z_tnvjp`25|E#?d1a~MbSpTLD;k#o)=Qjn?#7jmTK83|=se?5@U{8uIc4o*hA0$=+o zi@!)(kq#i~_go5s%>TP6xgo&6vAeZjQ~!c%hOmDq1TR7LNv?Z;iGU|;s4@xRZ1%d@ z9RK?+aD)*>)dFU>(fq*NRpfsE9<&Y5!@PR`fh>%uPtoC+<(T`GKYZ8u`M-UIwyXb& zHdF~=9gEF!^NZW!;-HXX{qIc^1(m_Ps!Pev3Ay1|qI!nh}h c^41P-aGjnU2?(PJK;O-uLarfXZ!6nGzx;PxJ-+k_LpX)p? z;rU}eJyY9LJzZVZQ&UynjZ{*QL_s7#gn)oRk(Lrufq;NKf`It61`qo|$x?Vpai%sPY+5JC{rV!~>kpHB7QvOhQB`X?88po1LA#EYdJ=1LIegrfrC zX~bc$heY7Sg)u51>2NL`U_K>o`e0Yg`CN37yx;Ht)^)dcckpmP18;XdpH0e9jhc3w z{$yfelFshv;R&rb_AkyKG;}d|cww}{iGp zVM6J5IF(Z-!2~R<(yUQ=bT+d*q7L!(pNdMU0!@-!R5(s2Gs%j=qTTYu8KN@V4a+@Q zUMi&w2EF>IHqoU7^R(Ub+u<_l6&^PoYftMn*#^12(d5FDu%w*?+f5kJvmikR3r&1+ ze7MAT0zXUNJ|_!;#!~1R(IBO3pLH3$OGJ5P63Bwa`3;!*`}>bR9&uiCuctoP|9(<4 znM=|BWHl{mJgs&nzfaV1r|>Hs9spYwcgj76{9`_ICF8CKr`mVuYESW%zTlxW*P|Ju zyQk{!9QR1!Rm(NnTGn!}Q8ZFe>a`jv-FPfIJGVv`Z)(l1(lS3Or4vfQZ`3DKXS^D3 zBMbA&p!F_75}!`bK0A=R;N=h6>=1taKF$>vsX1zRXxLABha-`qpSkQEmmih8uBP-l zD(+;7H=2{4!KC?2lCdQ`H#jt3D|$?y7Aod%&*8ePKn>W8((O(+rQ=O4xbOCxA{(3M zR!)QE{X^%vQO9TJH?Js!T(i?XZw0xl4PL5rYIVJS3c{zJx`kp06#*A$YR0pl@Lv~0 zR}wEHXi`wJnu~p5qARxwhh#|$xso(7{>##sF zKP-{KDRVZH?dV*Jdv{mKd6Kt0YrkVW-_*_5^KEwTlKQ)zRp&0~aUMF`im;_pWM17# zb@+qAkigX^n55~1*W+9%?+xSN8}V9;&jQ&c$j|8QM(vFnfs`;j?s(BJ&RH;Vyo`IW z@g07>)oB3HH*37+$A4LK??9vw9+sHu>GDCBp+JPT>^SF{o}3OW_(XnsxmrFF>#K@% zkN+#|9>4c`U3*SY<7p}XcAajSK^ zh7nWQtyI!H>g-n(#6s+$2DfC9OY&P_X;mvJ&BoIEw#rE|9AgQWS~lJO9@YMG;rZVp z`p=%!E4E!`;P3LK*}xZ!z+p2tLw2;Q-6&T)#0{@Tqo%V?ppON8 z@@6J5+UfMuad<-xA2-=l?6U1wdlvaX#=Nh!eHWkK4WqKR(A#QvixzmhWqb1+P+Q%) z_!DwFD7}3<^h4QNKKG`Dd(767Qktz(QHQ}34_E} zG7(X!QS$|UnwZ1Avt1(B>M_@%{Dd#CLRoo=SGDljFWreJ2M!S}VE%EsG{6cm z;5nfz`ZKv}-4%-Oh-h|ei^+(B$OaVFFF+?N#P#UlA}FUuuSa3Nbo%d$_OI)Q-67e~ z3qFTUzR*Mp-eCZ$&qi3MZkshq^;%t`#uYl~?G=vJpqno_e$Q&7GHlI3b_6$O<=EW_ zWi8Bp*E!mo&R}z0E#8Sq|JEwUb)=~F3~OxgV{=~QiiYQ3glY{qeQ+Y+W%O-=l`Hjm z-)QO5hw0z)MxPGrJ+)h7sLb6RuXRl1P`#WZ~7+f&_;~TB^KmPaaPep!hDjs1AUb1Ro5ld?!57ZSM;aTd9rHsQ50Jg z1|;*4n{doMyH2X0uPvi`%w}T-_zW6sc_t0&w0QQBCl&1UZLK!rT;C=KNsoH_M8~=` zVl66MD=)y}SORhC}JRk1GYO>jFj||nPy)O^$ z7=ZXtPhjV7Y`Nr-1K68gO+@_$`6q-9^X+$p>*2x@3NPNa#i0XYMi0MP=+>)<4N7ND z|16$rdSJ-Ez1h$ycc$;zLEx(c&@USm1q%;P7UDij#^;h^5&+=6=>=bj^gmg~Q}p1; zaJ2S^WCQ#%_0L|ypU`jpo-t&>zORckEukJ)b7l)~DK&I>1XCbY|9Z)S8es@Hw8xlB zr*#@&l+(+a`VN3JX{w4Bi*)IRju3n;(yv=KjaO!eCD$r>(UF~`f`M-;6?-i4=^Y&Af0@V9 zzl4BJJ>Oo7^DKMw6^SmaB$J(z2^nT-qXDQNswdgv#Z&m}wb8w8k@3%~F?O$UNp5|1 zK<;ghiX{<`b21%2Vc-4R(@hHvc9)V;a@A*LLGam~fYB#3Mac6X01l)6P{z&5^khiGt1oWN4J2pKZG@R92;HoaQ&TkQ_r^pl+(?82603-f5Nk-`*?t+ zC|ST;si_?_{*88&EDY8)Y1e7=duEYs1z2D96$&0n?pv@>IzPgTr}bY~Ew$nH`QnY! zk$a!Jn~$4%wtC}1Bcp0M5rXK<uSh);i;F za!GH$#3%(y`HiJ4hhQfADgGq_^*M$KFOw|n6QDS6z{*o3 zx;%R{2Xcr#XcTw_dNu+zULLM~S->1W*O3Erpb_JRN?qoAvfAvuC$0JHq&3oxh>SS9 z=banK7RY4Je|N<>aN3ZpxgDKqZ8qh7n09-Di_csC*2#v?%&f_X8~O=e%u3--bmgXq zBoTpjhvyn2cax%gOdDf>!gF-Kx(9W@WVYFc^=fN@+c^lDk_~W2rtxk)QyeDg9Cuj6 z7Kh5&{hprcu@!CEb2csFO~@IWt?%;~T39=Z#3WH!mXCFMJ^Y~i} z?z^!0r61g`8jpAU{6`oz0ef6b&m*!Q36s5;U(Ls2cn<%JW>Lo}@MQJs!(3|!GtW%@ zhCsR#L@&@nvf zaR&LCxd%PZm}gA~ADB-Ws3LS_z%*LSz}X(>!+_4-6I~QtpX1(vT%1g_hB;Z(c-EP> zs-fn@FlZDIE1~8$;frIO2&>NU@PWL-1%sE#IKG`*aim3;uO0(*W=v+*4lE6yCM$UR zMo@#Sh7|?0}Apgu{exq8noKDp>lC zg59~O&tX3l8Pg;i8uLSuRnd5hrttX6^D15PVMJdwJIviqP?Q{yNm+*5hY=2xZatX_ z6+|};(?7eRUgPaUV`TyZdtYvEYM`X5i?X0ke1oeKZu^ z#0w`g4Vi9}f$;)nNevyV9RP_kKkw9tw5ELiK%VrZUhu-Hmd{$9L>WmasBev5Pm;_B z?5Wz6#oJ=9CYk;x{hErt)U|BQ740vNqX=(sq`PHNDpO_^@Nl_CFFIL2W??ED+(DQ3 zpaFXqPj>&1YX~qIORkt7rEDM*D}PtQS*p?c1)Mkc>OI0)4Htq344Y@gJ0MuWN%q~$ zQrYye$NI=RVl1D|8ndg1aF?|1<#zKf5bu5{x$m6u+MA zmDlgx(iRl4#?|+tlU)uu@_1L8NcbALm2Tq?H0MGO@RX|=y(45BUBHsFytpi*j-tV` z@cDqVIo2auef(zT8*s(EK3#G0nwB5cg{0~wkeW{uV8_$`IN4|!KtQ0Q=EdNA-K=#% zPU@S&qQnJ-Op?>7&S%5t{Q4@J_FXzSb<);UsPc;65FQ(Rp3XIM^6H@$v4Hs35fUZg zvD*LX3PQb^G=Q(`8YQN^YboP+slqHwf2#SqTZXI$t;_-rF+N>}I{bl~ByJ9f_I4JdGneOk#uNZOB7Ec}kPI*z=mcRE2BzcDW0~#pfViGFfknh{F!2`V94h9I!yN$CFjDg@SJ;+XY} z2IED78A%YXo~fi!wZ(I#%ckz%$E}TU{DU*V!o#uci>}Jm~|55zFjBS8evm zM3(9PNVI%Ewn@8_g_@mfiR}O#<`LwBp>t@N*^f6|$GX7uO|x+lO)%C{2Yu*f!W)O_!Ija#@}`6nWK!*Q$f-1F$mN;LJ7}}D5dB8RvtvkZK53|Frh;N z2qIgeFo9^}jOJfsht8B~0SHuV=>%4dm%W1Q{N+MGZh0c%0=9?+p-QEzRhZZdODfPg zbPj$}wo&94ELmdIBvd%?NePpB?Yi#$YI`4bFFs{2f(5(E5zsQDkBUaee!a6maq$XZ zqj4H6%`gy-s^Pw0XBTIYu9)u6X6m`#E*4^e8&fFc(rUkN+~WQh%*^73(!W0yjxvaM z@yqP3U;HU~Lfv0TWg=?$dXSp*)_2W>8U@SIC@Y4vj)Q~QoR5rOXUXBm%!*}8d0fzw zz&by*lINfpAgFrY^z7kkZ{G3kK(6mEHAATvG%(7%tKc=iFYK%h$5pDnBReTSmrasg zPO$V51|EwFV1r<8yLEDvT2!H)B7@Cv9dgg@d6eK!j41ZJkgu;tFJS4I0}!wKv#ipi z4_&ZquP}176hbv>t<_UQFzV`!D#1OeFbu?_I-2xS>6*`+HTN!9@v7fPQW#ZFa#Hqh zG8ExA-7A%6Eal5Xd(^@(Ia4H6j_+RDSNE%+n$p3Yi|apzP%m%Bl290+*Lr6u1TxVQD6f5NX;d-AE^yb}+J z20hR6WO@-|nPDJ>q*EMF=>s+nO1*kvql43p9eh|6Awf%C&^_Fea1fo;M!B@rX7tm!OUB@D^y)OER*)&+ z2nvk}W;5Pe;5KF0dV2ORUHsX#p)vN{K_LAIG@>e_9_li(C0Ciuq`k4qPKNWUPca32 z_ zf|o}y2X$asI_g`lYP|+l^9C(xAZcV=sYBlRar1K}{G%jQ__1~TuQQa!$uiN+aKpu1 zE)-FPinz1-+bXxTegA}v2>I)8;m~P0T%jMU zo#BU0qz4{6#cC`_UwOtT@WVrf^C0QaIq98B=T9yLx6y&yHMWojXQeC56l>=xrC)6q z!kAqabcM6&=m1ZuoTH)@!?sPsJOHA@CE!|K&$YPq-AV+#kLf}zE`vJQ)^GmKpP zVJxnubOMKYRN@1>OkMIk>*dOtkk$nxX5~eS3eSKf8-6<)4v9GO8<^ar=v6Z+W*3o zZDJpXlcd;I6#(2a)871E@e}g83_b>&Wnup6S3w>~$k{+nux9 zpCIr%it)6}OXFA4k@g|jr*w(1>W88FXAk2iey8i=Xs%~wO%;8rF-D6iv2;7KNd+AT zHsnhe9qGdb5L+o%rN)g{nvEi^`#i=OSLMr83R@YtGR|T;r!kzDx9ghqBKIlLIRXc* zOS{tmrn!VkyRfw~@NT9|ma-Y?rijPR(Ch~1bDGz+SOR<*^!@>&Sah?6fXAjA4LcVa zsSoD2wxih7kMP*!#8QM!i9(+G8kY%3{2SV#`vv)}USR#InnA+OW&9~5(2`TqS|{n3qY z6&B4%%8Q!ktJLTcF#t;!Dcf%raqbxh3^N)X6b=d?a0>}A4L<=*(YRJt8Mnh`i*IOe zvI|(DDtT?L=&(t1EMgd!M{CX->u{7YRzrncYH&j+%o{&N{TYwTVH4ObINvkhW)*C{ zIYLKJ2NQu0eZWyL#W#J&KEXI~m}%sQs>;Qn^`?d-0Sgq8Rt-4e z-j4au_EHL;QIfzRrO8+FzJxdJk0aFRa4!^QZj*>d6&GW|(Q-$zUow&(4+ zSM$#7GBLoInnDV@rq(7;A)I}u@EI4u#PwvE#d}29v~+lSqlSe?vbIbo(rZ~XM&!`y z&S&lPxvTtIaoUZhSLvT!Bn0>hSy)&?zBk)yJ2}$x6g|KyS9C2`)sD~fto?rJ#3=t* z;H&>yV8FF9LaN?kA@3HMtos%CnJ-|ckiWd$T~iU@-F=8Ru_Cd^*y_Wy?EWQ!*Fm{` zdEW~^Gk-u0JsR@pX%z_Kl$S1yN#=j}a4y!q`D_>kG`IaFJ^xZ`5|zJ}7i;6=eFkzu zH1TNkkm!1qKu43PD(Yy5m6IEedk+ssA+=J>)LbST!Fvq`Ax;<=c1J0@xXjVm4(-6A z@BqHt;CxeQzGqIX^m6^?+VDm%J01d7XA z=kB3riD9^QCM>n`aIoK>giW{}-FkXA|KT=SS;3Va=vzES*D_BA_mb?6yX@L^;fyYZZThIn&DRH>|E&&?I&)Wu!)6 zgS=stjqb2Jh+#^wY?+-;oX&62t%Es5bTHzFOz3gQQBp4w%oB-u56nOO^>xLk6}L?! zJhq3oKE6COG*oPExS(iX8p(M$=oEBVplrYLt7Ke^VOv84~$Eh|XC#S4|)q!0WI1AELA6P-(6Eb@Xq`a2O^MrC}6m`BG`*xR+MBmI=SG@JQHzUrMAp3U>3@Oo(n;-M#TP>&tAUT39~x3JCqCNsd!rm0dGJj zYJ$N-azDD{Z<{9B_O1`tbM+V8a_3HNk$s+bWC=@qI1&tg(P6oBO@J^M?ZK!MCl1|M z()B^tVJLyj=t^}uZTjlIK@`ptZ*>CK&87|Z2}$9ZS^xe8*s(Sk zqycG~Wc|{NtT<8%)O7Ti$&flq8aaW}s&*pc(U6d5y5eA&!nJct^9`dmw>D`5_MLJu7{qJ-Z(c(6&@6Glt!9KhII~dPi>ZtsI zzhVI|G|0K9wkE7y=774rq%v1Snz4mn#j?0YE+_H?EG)`BY*fMhHRGi9NgTK3SAAK= ztH8d~PsOE*SJ#mE`GaTafQK3Gu*O43`eZbZRx@M$D$wq%c75w>ztZA!YA)n z`rMLma^k@kg>F>`jI!F+?<{`E=C-eX9*ufG?4K8Yoau1j=ka@VlONs0sOx32+i!D6 zE@lCrbRmCUq>Q#js$tPsb-D7LXdTP$aavk!K>8 zEbaj+?_?g%NU zXn7v{aDJB_#Y0??qda6>nZRR?8@mT|Ax-8ymf7Y}}ez(_h=TyE~}EnYEBW#t&+W`?(-+S7-5h`BfU&NK{l;@7?tQ{Aaq24P1TfTn;6XVp zzzxmYEYKOX&yjGZT1~K6?O7(DSD~@fuW_Vv%xZNjUZ{#D0%flNjJJLdIa{L```mB! zHJ-;B5+-3Dk>e@H{XFJK*P6>A-tusQ)!u-)k7U|IP_CgB(zff%lTTk;8wq#KS@4BO z0EMy}->FefO&Y$tdr^# zb#>is>v4~)M*!Dl9a+2l4}F z=_5-|a`_c0@_-%8W3HFY=G%itR)TS8fL$>bLFPc1*xku{;v9RH)6q@AKsS*6c~zcN zRMe$a&2d07CJI;(0ggtUND7OpV&6Lg9?-my_ndL+0^(H56gqxsN5|>_QMNyV92HWL z&d1B3rgOlLag0@Qmx?wlYF+A;el`Je{tV1zt9gkS%xwTbB|%V%VO%R@N1=|bswFrP z!sk#aVyG0JDz!aEcpzw$MW>sHV@VvTX2WT)z2iV7^MF5_lozMI*rHT!%8UfNrOmX0 zAN9Fu{wP?1_eJ9VxlWMjKl&qhI=>};Vq6;V?V`5ZN1jl#BA!to3KR6>j|;Kd!4OzJc6PX}EB%is!xGyM#NE{v zhn~HG9sBc=phO4;u$S0*^7r)G5=k^yErWQxuZzL$N;Yv#Spp)nT$g)aa5QH+gfeCE zAOlWO&lC(@s@FD3Cv(z--Eo&jUl%G=Q`sJZlMe86f~^83fiFBcy|&6s4oG~H`w<1% zbHNWyf`)=NU_QU`+2W646o8f;9e_*0*r02w+c8uXkD5!hqVxi;@Y``~At3XHPY5XA zpm*PBg4W ztYydP4>!B&! z#bh1BE_yx-f9R2qlb*>t0UpxHOkNYp&(+#TFUUf;iXBO9BiP8rL!?q?DsaUIrw zX9N2;k}dE(7|g?&N1`}&gpMW_Q3>$>!Z^8ly~?MlSE8eC zsn-fXefx=4O{rl4UkuIG{MKoazg8A*3sp6w8;5eh&@JP7(kF380ncqJghHwih3|q?cZI>s0&^x@+YP0=>T}cW zh02D);H`#5Ech&TgosVfe!NPWD#Y0q5jV1)e7L75=tA@*&&I~0@sd)?0lN9FbVXj% zi3#0o);GM&#a6DQZLniz1>9v80-0fLBzR=iVL_uy7?CUN*$4kNg4x9gEm-4+>p=P1DwJ&nop} zo@o@`rJ`_Xh2{)vT78ajuE{j|YLhz4Ni0A(%R0WhR-oWB#z64Osni;%AGKX)vfX+Y zmH@gdIjQ1HAnYG2W4P4UPoF|t*)aNH6?%|YUL`b^4uZXI8<4GsIPmQ=YS^z9Y&9w z{8*%>ou+Lvh-}Eu#`rW2b1Idl2;@t>qL&keC1a{7W7vzZ=s#2yWum02Z}6#-k6ELu zTc?@pBfxO6wBcq@k00+yvJW*?1Ki1o_2S$S)y?fo^`LR8u)(0neneL19%`xSEdGk` z?3yiFqk0-xUg9umpJSrAk2Y}~n`gge!|^tEcdO>FQM(?`{9Zd*%UsO6TSoB6?)dF5iayetw};J*H<${lCq6) zvui{-sBrIQA09Gnk;PRK+s){4Y*F1?)}nGw{)RmON^l~5d2KT)O2(koAoy7qN-fDQN{hs#Gt|R z?-bYZXX>DStRhq$I*sazgNT&<66}K52vAYQH?gc=@(ONv9+Gkb;=Dy`>0CaYweCm} zk9gg16Kx16D014aX|VIe7xTr+ekHDK88sLN`T-Rg~Ggcq^tuj#xFUl9H zZ2Cqb&VHRiJ{vnoH{pU;v?Q9wZZ_IIZQr{WWC#zu+ z7#GoX6NHUdXXmH}*|4=&%~gH~=a;OxU3=4u96gn;?>*^yaree+4J~A&;y8`as2rn? zJG>}e*AERC*`xBc*^nq(JZ&u$fxJ4|VCsLHy7s*&)=rYR9VmX+o_d(N8o1A=mV^7q zp^+H#B0!V;U`+rG9)DW7(ui+PZ_OMf9p)ul<$@aUTZo+@JC4I!7vhxb|HSp1P>&ab zU4-S!NBM&5CR@T8)@NaP?eF$<==rbg_a>KLt7og>)|%|9B{cFU=XY!DK@;D*dKOAk zz~;mT2i(kNBjhH#t2mV2}}6DKT5XH4+rW75BhUF z$+l!N{*nu37gk~cVEC?wESZcsBoWhVtw&T$#RvwtWpMvZ_D9Bgdw5-jmXFE}4ZbWj zlwJRdWR9_9dPn)#y4>dZ_O1UYP*16~qh~gyJBNA6$r)zzFfFf}I(;L*p#f>#@gm-U z>guO+0eH=tHAy;rsh0=ls>WCTqw5`W+Y#KhmLwCYL5i$FG(S61}7lw!CX6d;>>(AqzBpML`6ue|&-_!(~q2Hja(a+nnxkv=O2ys&1R zQqCecgjQ>mV4}**Oy%$GP^x=+xT_*|{MjJ#XCA$+t=OSBQE1)f!3z>9o6$sqjoB8V z-Ij(_#^E1w*c|`)wNds_xa;WbhfpIG3bv*=9(DF*wk7~r^w?O&d%$s?HHHBsRZeti zWMn&`8{DT?tY2RKF(AELXSc6cM#%iBm+s4vy5S0~g=IMf$PtlHipv%{)K!Qc2EDF{ zm30;?^7{TUT?%2%_>?X@W0)*`(;u1{3y@6I)O$pIMP@PjPTuc51*Om(xRM@ zza^}rp3N)5uUzU?TGzMtClUu{ zJ4a}Lfna&tU!T#+eGyS6cerJYo?7xKh~dykRQ7jprrCn3%duF*TaSE6!H280P+<{* zpg}Q?m41<#zF7*ha)JUYfa5m0QO@?a3^qya$SSFr0On{O|Ci9rmE5Q%fghr^-A10# zv-5C~c5+=>u4~k%M5~XRf8E(HZBm(TtKQta1r1JweTd364aXup29F7}%vBT{fX{9o zvCa|B(K*#D_aj!fb9!0^8*bjUdL2`DhOp`_Pnd8M((zYZ!LKm8&ct~cCo1XE66##f z*T~d8>C??V(uNVLoG|N4 z(g24dRh*(E4Tt{1T-db!U6fvgEhJ8w>u|-LuA0l~ZvAeqX}4>r&cbok3C|5o*ZHJu z$ykU9Wxq75y3yeaotAgWao(hciu%~ z(3`-3D=@SEQ>6Yzv2ERY6u^i16T`FGkWy-!;BY3-iJ@8f#E8Z%3xQ3LZ2;N^!jv{(pdR#N$@uSaB{4tf@utn=vLE=9 z{|i#|G2yE&d99V$aaXssZ|%(vJR5xNVfHz^Qbx;+=o=_EoKf3%xYUe8^4UK{R4j_1 zGZ2+_XPlEM1LUK!n6)oUwNemN>@hXV4DWUatO9=SVTX z*VRFCgRP`Y!jAM!T=u`81s;+mJWw*&-`w1wz0TD&hM%ulEc-fRD!JKxYvre|blJZ| zAoNY5H!)w-#{alw88n1bJ6z1) z)PHw<|LAy2L6L{uh{IGD+9rEY3=ujhM zdZR&9`*-asVGr0tP)M$VPTq!0v}kc0@Ph{qv`c~C5Zr`&$&XmSEWo7EFq!UJCZk8f zeXJ=ndh3ww%U`!bLNrUW)lj*Gd1`XRPxJ7`UNhV_#HJwT_npam=bUN~TpgIX#k9qEuWg zXvpZ^5XwVOELY@&@QFyMXZ@hKGvU3@NB4;jBm&UBuc`jeE>!!|X<0(O8DFgi`r@;3+1 zh*xE$Lsdd%_MS)%TjafZos3Ms9E=}|`_?NI*Y-U#(vRtd9`pH+Qpn&p4q-+dMm>-R zK(ltOTqXqoAU#o4 zBv$~Pfux+>DpRlMaj{-};*&aGA30f+BH=L|)BL=_4Cz0bYfp4m9?TIeSo$t68K0AX zT_USg7>W?WkwK?dwPc^~g_NeeZ!z|eGPR}cbLIIoQmzyvX>qu+W71uaVzZ>`zLXxG zbd#Rje5AP~hHtsDEx_nsI5r-~)Ksi7NuV-UEUnw$*71W*z+(rb%=;_vF39li7Yw{#EgF+GfQw-Xcx*H^bUz=H%tTpf4COL_rVB zVDV`MK8hsk-))bg3m9TV_A`|OgW@&|{C|o^fb6DM8$qRUK&OSfsb#=uQfce+{Qgr57Jj%qC~g*JiUQ_MTQRQyI!@HcaPm zz+lko%#I`CSHNczsDVFr;i#N@3gDdA+)^mS6h~5x;9MUy3d-}(^A+Z4Fe|vbGtu-O6-mM8$acv@j71ddYy41Uhn4E==RI%&UzuN z-gu~;6Y6iSxkHMjaVbR}t9?WpG#@BsU@yPt9rGfNz~_JSIezc^o*cHdub_qJcKjyL zWH%cc=_EiP=)`Kb+NsxeIFXpr?q;u8p&G`eLcDb(?Pjf3fNjG$Qy?lyV>b4gjvwaw zu!IH6Ki`agx!my#&@)+z#8IIzX$?%?@PE2fYyXhX8v`H8JosD<%lv*f$Kem-O#V*{Ca zxuNKKcg!)C#fy7)1g86{FxYsfmGIspm!aSTCdvOL_cQVSD-WOPO8HeXrIYcJdG6k* zIB$i|GAi9!(xYGMFD>~rM*YG$+quLT>4VXEi=z$u95rrB!Jfw*i`5CIvcJw6k-Xo| zZAs&a_$8ox?($X3rspnM45}{A-!iOVz#LWT#fLVUEuGWZjR^;gx*{L=tI`>wKMQQp zpS@)^G%tQqBIF$UKBSGaT<@MO8x&wyEzfSb;L-}J(2TbQzqdM2s|G`Vxkbcs z@bIc2@4iRV+0AglnW>9^p6P~)u%zQ=Q3~kEmPwXNcC$U9ivp6$Pu`Q+@YAekSeJBW3BdO(L%=on^&<<7l4Cb=Ydv z`vDMZnU#p+&?DmT>KTJ*Ixd`{3TG}&QFd*u0586_^1NX$9G^tV%#HEmewc0aX|v6> z|8QYLz(Xq08Qn4A#^t6T0YKi~xnn`DPrLoJiG2(w*fLG3a;ShNqy2_0^Q2}c{!v3q zKTYtM;%Ya|+TMCiD5Knf5>`Aa!G&s<|J?%2nrJXu{7xK|$BJcU`ATd9+A1}LIhjjg zmHl5912G8=tap_wItxNbw#n!fwYw89P?t~(Bx~ZL^ z3Ne>HpEv6Tmh0suhWLX!t5=UJi1n*nazY%jp!Ce=km3=OfX2g*nye)Ml5yKih-Phq+(;QKVMP z(I5`2em_$id_CXjNRFM)qPIZhm^E7|M~HeTl}QYCHk~e%`X*Ms5EUFL-IMV5)(KR4H#73~8%Dx3(BVEnt- zpp<4#JFe;RYZSHy+inZ1Q?+(AW{Fg;ZsG!)oVkJ3^3Usie-W!tIMm0VGHITf1odZI zw8Oa2r+?_M$zx%QrIVtXuaTceNM+0Be$un^=4?+PT*FbeU{KvV+VQ!3;aSwUU@>En96o9t(%zK( zUcqLLCB?9A&O9o4NTojZw^B85%pd3Qo^<}Ll=W+r%A(9ZD34*ylHbD{Gjve%!fo$B z-n(au+BIC-yfNI3Mm)-tJ$4lPhgvSR^J>yB`fyvh|Nbw4{%vg<3g$h}Zg68Vv#{x$ z$I)-)%uSKk-Q4{w7p|>`Z<59uKBlI*`bv< zeBy7fj0L*-*3Q}w5%rmq#N$b2Q#1|X4V{*MWKtwzj316kb0}Pi#?xqp6}%!9e$r;O zoGU#Bqs}5QUbx^ger??$AeKxX;PvS5zafV(+ap@@%bGKpbIR;^WR=(QOtp{LDESnS zZCdTdUD4ro$QY#M%X5M(ukRG(PSPPfwfvVE9tV)`90dEq0m zgTVFLy@#8vz9O&Vp6eta8R^wE%7;I2QpOweSk7Ysng^AEE&>>pk4>*=;7kxekMmA4 z8I-wUCk1Rf)3w=x71qn^`;*B{xK@8p*?@aT@~a-lRMjh9DR2CqIk}@FJ6e1t>Rzq) z7iZEV<-VK6G9jqcHU0<}mpq3c583G|kIDyA&+OKCUsy)L+D@Ug8kda8-1HM~@^m4; zhjD~TWtz5j2_AwmEp>YI8ewoK{jMJH3=t*MIck`RyKJ+_($YBW%ehgq;bmUg(effL zEu-K>)@(3^g~P0*sv>PnX?2g-VQu*AJl|ZPtKWpvmz>g5?lI8*MZQj->DaW?RP8kP z>&?UeV(+cO;_9|_T_8BYEw~1EcMSx0cS3M?r-C~KcXuZQcPA9?!5xai-Qm=~=3Zy7 zInT|x*?0SS##Pm*KKke~s;ag3`&!3nB2Ng1lz2m1-RS-SUzZUlv*uyz*q*E$NC+ZX zR`ypu_@+DXrxkQhgL1i?roy;iYzt<;N~AH32SZ2dtfKL^ShYqkb$B|=l-!Ea zw+wn$mYa1JTho&|;w3kXkGVacK)3r|Bi9ut=5cst*oRK6nWKFMs%APE^U3kXzsOU> z3yWv8k5gKK#mjdGm3!~yRbROHL5mgZIIPYLa++-&l&@OUM!64BWFpAM;dxfY@$H)@%L|mu$>PQlI}fHNl%pnE@v-rG|&7Cc9^w_^Jo9U6g}K?`CD{O>zQeM*u&Ts@3-V^lMXMM@?B3k=v05kub{I< zDO&EH3dfaue6zoGGP1T_to7(luwRQSop0j;=y<4fp&I<>UR zL}S|9%v!&7=yCct^*XUh#XZ5-T>>{sf_L9q>)i zu~RPP@#$9ESZ%`up=Liy`=}w6(Vfg>6!O((k?~yV@=>4X=KAo( zHv@^kE_Bis8O=QLfhnnUqbFB|`t0Deqw)Dc(MFdAw@XI^m)SBFT!kG6&QE4GMAQsm zpl7y(X+0c79V4NQXxVh6t@woPGkCo+7~#Z1YLBmi7-BJ1*|tCuS!@@Q!+dp<<$|!-)AC*x2YeCt+9=435q2^80En zYMke#kkGIql{jZgGx0NRm{j$At^7N(T$&JR6RE$BX@oB$0U5@4a^x;MroxwVB@v}E zmM~@bhrq})Sejh&b?fwO&&Pvu_w$vBj+==>*9eJG$0}C3{v2vkgV2hOPH5R0eJ1{- zzkE^DyPa4vufmtfTBnxR1;>r27pOkB%Umn68I~VS3-#)}kiq?D+Of;S@9dFM;gpt7 zuo~bp(EV>s|(Q!xD^u4Z3Iz5CsH(u!&~Nk4bGrh%<-=!Ko0 zN~0`cJtahPJTifinp7BrwAaan-WYi5y& z4Y!QAzdn{A@{^tOAJ1y@0c)57qX!J@wq-@gYyAAf=U6Fg=CMF~njJ3Tfik^3Fg#WA5T=C08wZ$s%A4d0=<-DdRUUwmMbO^-*L2* zE*3PqA`3*_d*AvBM<0XqW)|DM^~{`1^Ln!RI`8lJ{uo8}Clc?cI%3#p0e|QZg`y{@ zqxmbG`}W%l=f1Ms;+&3qdix9W#rb{*J~-?#;F_=l_a=GcR-9aJ zi*ZZ*zzlUMiT*m9n`JtFy}nj4nns%zElogZYSmOw;W5j#>o2ZALH_ttfq+T@U_$7U z+LZjWgmICMdH;}Vq{{Y1vfF-*_;RDodmd)R29XAA^!;~g8A|9b9IsVag0ygj<5KRc zlU5NXIOLt83nQ8NryT%RC;u1wAw_Q(5zGX4u5p^6hTaA7!)BXhorfB%im{a)$9I{! z?29;1`T8E04YcX}PAuSbY18a1+W@eJ9V1=yU7f*mM|rt^WFc{sSLTlZk0nTj8&%xa z^J$i3(IXgs({#h;&mJ-iZ}8+6MvUQfZ(WZD z0yclX7@+()!lP-dXAH9t@(c?JnF-ZZxFbwPyhoUQF?zjdKfC9~PdWPIYPT9Y6O9in zEw1IBtpow@m#YMz>mMC7q7)CiMJg{4#6z3$z2RhmOJ`R!#-$-4n;2(KxWLp18@#w_ zMBgN>!FVC5!!fQtK99HNhCG%G#$U5w$)aj=inKfxn!^v7BDL9Z9HVgbb?RI@%PVyq zMI_n}M4X2)vmEG-Nvd$1n{XsV$+E==L08XnQP($L!eARiCS(X3(S z9~SM z!SZ4f+xu!$_}gkznvr=Dj*KJEJ=8KFG14$qfuJTXjG*GIyjRi8VuN=|eC6v^2yeRa zmZ9mU$k8Ev2vR7Uex#fO`(-2c%ERSAq|&EhWfJO2E`C_m=F=6D@3dq|lJfm+ZSC`q zQ5@fZ3$~rDx590sBnXHn`%PlONUqc|i(isO{FgeY>LWbQ*H0--kYOTYG$Sa_Qvth% zOuWjp-B0&8Y54c!3Ai6ueX#(*FyZbHyN1F5itVYONEAd^1&Vy64et}0P!T+dC7m&} zq>qjzh_=xb1m_u0+1+k}da#C`7?`v&O&(xGr?3Vs65lw%Hhq8(Y1~GvRM2_k zka8p;Nicmn$czh7Eok&D%zp`#_rZ>#^_|e(wBu6oB?doFcF01-S;sY33-g}cb&6s3 zH6VCIgZ6;z4rLCz!{iGzY?q)XSY&r5Tp*8BPVqPm#ZBTpPqnL z%DyZorGWhEACFO_mmXKa&yb8vq}WSqq`KN)&BJ)$&8MV8-Z;B&oXKm+)Sgo9-b@Co zWqD;2#h&axX zFBK}xwMWqWIh3irg?d}R&RydUJiSt9bgxWZ2-lMdYr{;1C_Ii!u2YG2K>g$moO#eL zzEB6=5%WwAMPD!oD+HKaiv*vx%|y~^koOR>_ja`G$_CXNhURbQvD@Zis?V2^7wFZl zQ`Ocp4x_KU8+{085CnYe6O61_7!Z6L^B4s&StmB^_N>cE*3x=mCInx?exigvD4UN zCgAwc+cyNyeV|7lXLLl4?B~7^62`#cR5E>qf-_r!W;_Nor(3UE+4Slm>}*~}T42Od z46BOyzy_+=!W~tXaWApS1UYG!X(6J%O*)GgqYvGt{(JYs*u>^wbz3w@XbHC*KrZNU zruub!H9|I!K8oHtF_e)7p36J?s$qCe_6%1uO&{djmur|cxKsT7InOq&PpNwIGEMgPeaPHyrLu`MD5wEK3sMr+<@vfUN8smZe}o4^-0_6%+vm^+AKT+8R)u;O69UsP7@-Nq*aUYNg z!_`{K*I?tJ?P=2w_hXXiE=?4uDZF@0YE+jKt*za^S)dZ|Qt+Aiq0>F*Arcw<@|0Ur zyxZ<kuAXXsCEJ)X+l&> z)NKbg&)?}4_heJk$r0JLWu^m6lwc^sNA)li%V(-a1_#jj&^kcU_t7)h^Mtzu%hb@+ zn3C&k>V3siq+Rec`4m)Ew6+5|)abTn;^2#yLOT>Rh@ck4)jJPQLos@m5o(h7S%!9z z^F2#@`9g}#6g7klds>Vfk4aal?jj0nI)4Dx>{%EUuJJ($##197#AR9xRdq<7o3Puh zo*AIvA=S>6tK|H!qZLVuVVbxHLfT{$`n98AX*2`xy{#nB^-}1QcGo#OEEprGwGH zZdzGy9hoZqS)Jh;IZMG`*q#vUr7utHkxr{*2i5?l+i-#mteyf&eXnm5-@24ghT zY_5IZx7wwsW`le+bva+r?_}zGI2Przd5@{n`H4-V2rry6Pw`4GVa7}LkO;V4Wvjt)FKSr8M zmbq@^W2eNVNe`C8(S(K7AG+AlBxNaDn~0vrk}H`+TgH9=O=9&<0 z>lt$VdMrygf8uODd$XSC+8FYc@dbB$?rF27Na&3XUzR4~Df(i7fF&SE0nUJXOr*2S z=o==rLCwK8h%UA0a(HSV5Kx9wvZ`8mBE)~x1vmnq4cTN24YmQVs~=n4BDF)?y#2D` z)JW!di6pgA7HHE;df$kN;Me)ub=Lh)$}&n zX@e}wuLcytiO%NgV+Q0cu%wYRk+*z#X}SWBXmKiiLtG!ztVGH zIMF^v9`4FoO^etPxfCN6+H0A%UvZRqQ?51yxqbT%b?Lq0MK{^CLPE%nIPP6qoL7>{ zH7Lgwn_E}&hf+bGT*h)P%zfR)-BzP!(Bpg+gnj09<8$bqYm${#Z*-^JiGZk2c`KZN@`H|}T^zx-zJ$qnh++_? z)2}-j6*uxUPY&jNjvB7T`AsNG{UzSsNB$mpNnyYPA68MGeG#S~2R=yl=R?={ae)~O z$smabxHKF9PYq1NW}!1qCy$CF6xhdzq3ImM&i2PGd+?9^aJOyj{->ITQ|pARmKe%3 z@6X-X&(@En%tSSy0_e9aB_)`{P8)(oPab|*w!I-uQKTDL&Hd!4mJN@TA4>?=VEg&- zbboTb-K7|+!Q}*$y=C-JCbEy;JR&3sl~nj67$;iju)EyjK2|v?YMl@$a9zCeB#B$WpGDdlt3|B*P)Ix~0@_6m)Jwv$L&Uamol#3j0okLICpoQhcM zh+uI=ck~-Tq(1n7G^oD5BD^9Auj~riUXZ3li!pt^VShx9ZJl4)vWEM`EcdZ5lz`EAE{zjBFpr2X)(6b?1Xac(+-ZU*X zs`jnrhtkXR%2jI7y;4*X8-d|wPgLG0Z0_fiCpZCt+CXzsY*9@-;M${OQ*HZIFA=h# z!7X!6?j7k+B)&w!hxk?nO2zCBEOWbi6vJhKB&CjCOM$1wEeC+$=K1&%}eqTiN+BlK4%J?c1}q{e(w+p-}!tJQLB< zIQ1LphkspRhh8M=a1|me{dk9zuTua+LnWYOyvfM$-ph`}8d`qpz5Y0|vi|4rAojST z5n`^Hv~taouOrtWAI`(lXR-ow*`m<)#lipzWn8d+m2v>(VqkB7ZUgu&C>x-&|- z>}=<{)b8X~@)3UZ5Jv$^+yI7|pDKAM;A`wv=#|YR%B5g~FZ634lK8KFgz+0ww0@y+ zTX8<7o^&DS*5%X|=%OUvyT)(4f3N)SXDw?uzHt1WJ_>9@Xx!3G|M5GQJkex_O4{J! z%_C4zgiSnrSbJt_s3Fyd8;4{>O6k7D)^nco^uCd-jA}emtigYjwpI%<3(d4bwWA_w zj#Gixd`W=QIM2G)NQA)`M{@q3o*^Pt)(Sw~V( z^`^i?CLPTYH2&h*A?SD3+~wA&Oz);5zx^uFd=7$1CD@OsA*R?-J$jUUD+pusav^r|VfG zEpyx3xQ6GjN1B;>{`1mOWdY}Rz3S=vu|u7*vq|VeB#BTEyav$$HtqtLKAhc$kg201 z@IB5B{3142Oh&4}cf>WSis2M4#s-i-n`Jutg#axzov_Bq`8*5P)$Da5`~E@R8fYn? zzOv#^_V;?f4}w`?_+s!)F>dFe8sF>$(h4ZT7)eiU!d;s2-S&m3f9$FJ@{U1{F}^t~ z33X2Oj=Wfn`EvpSFo|CM@cIDdgynLEsBf797zU2qABCr2~t;YhWGRr(jw_7EiIV>EOwp6Dh-WR2+Y z4<;lilGqIqA=^Esk_xFM27$;;GFm}0wdcl)Bi_0L2wffJO3G{`;**@655kbxKSO%r zXKRRgY@kjE)Hq-5MZ-boyIhPi@ennSk<`z`E3j{0HNPjY`#Cac?s`ZOgAFrcVl(lP z)P>X+BjU?+f|~-N@a^hxfTIbHuhHgna(^{krfUWcSlD7m{og3KUQbwJr1m&znz%43 z3Tz4Y$e%_3##xCeP;DhZVBhId<9~r=^cFnNkw?5Yya5{_h{xGwOslGm2XEi#w*MXc z@{=Z)3#v8y*x{T}>yRb2bjMtl^|fWX#ub77WF<5_xRH|}K8x>jXz`>p5(jSnV8K3} z>|167Qo^JkKk~ofa%;S>oiw0(W~nRkf8*;Q1Rth!uX)DM*G~xE?*H)?IUNQ@5Gl?w zdF20#>HV+%^v)<)-35HEm_Ey4 zNLZ_XE~Adb#*#^hAjkNK_@mOW%OiL)yXVW2<3=HI#+-T(#>_8x$&En`!jSwCoCd7A zf9)o*YH^dpx1!|Crlj~t501sX<)X}Kbs?Z@+*j|by+1eQ5*IR^Er0Vxv6h)w>HkG{ zZlOV^H;K8j?5&YV?2sxT=4Tgn7Oq7JbwbSO0bbWy8w&p#*j^M^6IZm~c$nhk&E!9> zqFflSF8)Dbw5<~L5y!%sGS%gaf7P+4IN(AM7nDoKshRgl(UyT;00(xB*IU`K| zHDgsb0`FhG@xtT+9qkx9ehJc&PR=8Q+5DA8eP#=ngE* znd}xiCG|SCT%Z3`+7%HI(7~zb)vA;QGUWlhIuMejpuWR2nc~$fUZa*-zb$n_W=Aa} zap-K-_gM{T8M{RGwMc1})v#N_ax%B5T9-q$v$c=&^h1`x4>3GIJ4UF*l+9H44})j@ zfS|S$yVYOOgiBQJ$&cN-A+O@MULu2J?j~vOAQd=$MoAuVw9A=EFjZSWf z=RDOt`!JaBuFGOia;bD@xR+>LvLp8|uklG0b{VtD&yfa=Hn)0b^C6e+^wh`QqrpB7 zZbnW6!-{T~J5rSzmjrc%mn|>wzRS1Z{h>L3Npd#W^?3NIcUt4}v>S882TvO8-v`W; z7^E_Ys{*{XI%(kf>dIQOQUJshs7%wAS8X5JTn8mbrfUU4j57RAc$S)G_bX$>p|w+e zG(PCO_=15!niKW+TUsp=E?4nPiaXJJ3EBHS0tER3MpgP{V9ggOqR9QB5kuEwF=|(M zC}p{1zZtUF(>N$h8ZHMaYdDWIH()P3Ke&iiwx7L(MsqzbiB^cc`H}XB8s}O+<@`25 zGCWN9olXu?O+mp>OrF3QO=??T=WI?vP45nO4FwndgLIwqBpGDg=3!CdR6Rljmxs5TcuObFE?vz!7QPe*Qc*wPrFb4^M{6C ztIx{JgwFIJ38(F&gd(RaQOJejR1WVSfb+g_lkKQ}WIlZEm@R-4#N zzM%UPoQj1{&#I#Flb_$;V*$^781rvetm;q{IUsnlojkCHd9}Amu)pz(}pGeB>t5u74Y>;CN^ts)wmpR#g7>c)q?< zNV|x^v>YiDSgL@r3;FhVcUV?}kdoq%`U}N3M{}wRQTsXrMv9@!o?95G58wHk>=u8N zD&$EW>d5B^>*M+Swnc!^J-YH>wdu!h&#fV5A7A)=Zo)lN<$f*QXub*{zIR*seGg?m zk(oibSR?y68duf%UD%U?*`Of^8Gn3A?`;U&X0OMkMG{fMs5Pg#_hTcSl*RA*y~rWQ zxcLtpP!2*uTdxg{y4^e=0h70#1^f?~{3pC)8&de3DH*g{p_(8NWnCEdo3)2u5$!@i zGY9kTf3zR70g2SYLn+3?*0Al@h#Qt_ajp)Low z_7)s&ee-Y*`ZKdzxeaKRgS(C0(!Zw81y0#Ryu*99rjF*1es{`!HE16LoKgQBLlbab zy*hJC^UGWBsyTKWgv8HFSx5W^baGYQXIJaoi`}f}%2(<1|IAGoG^_Mz`jo~nObJwb zlkM01or9~O@=RvquudZbSnQ0OUktPutKZ^-nLTeag{!?!D-7(u|0eu-Ep31x>Dps* z>5@5g%OH&eNyQDsNarB$=@`$rjZsw%E>^qG2zDs69v1$|i=aVp%3NYT2)< zA8HG#+}dcK^ns}3_x#zvaWU((reCvBEmUcT>$TX`z7)7}dA#sKiXR-gUCmoV9MtJ< zecnlcsSA(%Y)Fq!tLIh_O?5JrFON@wwb>hY1H>(^h&=BjiL`pDk~WnP#BCv8i#Zd5 zd;cO5IFV0@(_dr3IkdbzeibQE#5QuUU9gvdSi{R+AFvj?6Y*3&_yVSrqFla`y6gjS zpKg9{bNNmRX=-(JZDd$ndM^M|s<{-l?;rMC=o|e<02(DOaHOiBlb~f@YykNKzuN;M zw~b2tM4LlZYthqT#S7&L=+`c2HF8t^U_3)e8kY!IJA(f+>mDv}i#_7@q8(!Ypyer_ zMn^b`k2t^8EsTpK-~~eT=df#>oebRD8%;@?t{1yTYjeJ)Q8wz7#-@F(jBsM689+$? zF`mwC><`lAuu!4a7u}=7E__u0qZ~|CAp%G8LT#Bbc*BfE$@p_U&e!WY2Tl$k1a)Kb z>0m->LrK((UBKBmKT5gyy54+>EN+;+=$l{i6<}x2y2NxM`O+DDp@sq+<>{SHKmXel zo;&^wyHKtt{%C8^!y~Ls)!7hAa@}@~pX{pv*EMF2o16_4}g@;T_;^@`F;;O7t#zu_rwYq>d6f zqRcsBAxxAELWSBFF`NV=DGX>Lk~bZ(pOk9FGOYhpTDnJje{o4OcUbmmX<_p0@yzSW znE0MJ?#YpnmX=mssV!Y=+(Xe*If)Jy!8!6rK$8!zH69%ZN8c|hz5Se^);S!LQ+>=c zdCBv}z0cr$IB6K}j#dlb1@A{SlYF(<<}Y8fHIaSYl5cjTWU!F;4CaST3lQ#*g+!Fr zKI2ZiBe=u455Mi+6=r|AXsqEZdsl99+?T^o%Uoa_MOt_(Pz=hiIp%h1CDuA!3I~#_ zwwf6A(ajj6q=9xz&q$`->q<3Lq$9bH-;xqUMUF+FJ+r(~-V##fyp?kpO2#}CY0q}@ zs(hRu!J7USM_6_8kVjBS<5gXF?~iQ-gObA&Vn7&x_W;43;%lzTpeeKGcg1_nj5t!k zT3nsy8i~83bPRH(#?;gpGHZuy{uNL(NS~(p` zIikOnr2$__6-8}|VnpssjL%t9ru-=$8?=oxcmaXTBFTpks~dUrlDz@4ZqJ^;2LBNy ze`4U{NgF^mJYIi{mSlCb*r8QrHVruT=NbMpRVWysJj~&-RL0@hZOY(e-Mh z1BJ>YK!YTD|GhTZb}48hHag|oX47+;UcvcNRXDNwa64Yj%5v*?HuqO}Gy%jiYZ=D)?Kxi|$L@BELN`CU0;P@yPBzxz9(} zhQvHs7v4F?*D)m_hI1onT_OR8;A^2iwTJbqY3UZN&__S-lrT!_c*4^!!F}YG*cu_A z^{}hZIYYI_oG39mpqYNmpBw9QdCtHRAl0vO%bV6Y$uWmepJ+SVP{RLm&~QrATgd)cfe_?p zMvYlW8^>b&8KhI-&?oVBy0y`K_o2wkHH97KQgNMVzN4d9o67g+yv=vV*U}oF&6fe0 zHMf$#fJy-?xS&nk3-9cZ0=ZKE3{KKB&_gMr%y+c0F`U&CdM; zzA=F!P8V>lW`Sc`#ke*EAno@+eCTBcXdu77d`)_cSZbQHcpNqF{nB1Kz6W*^zK}{0 zaasepDqfYCm%A+M2m@uAxi_jSH@zRP4^)S%^6woYV&?JbTCK9WpYLo>10F4!7{Dag z4F(!Te9~&=9@Y;_!8ca+y4;s8Gotb-LEZ9K2cyil8&%BA`dm#ZAMD3@sU+G@xEyqh z^#C}7Ox-S<)|(a4nN|Q@TJ(J~Ybs-zf*`o!Zwr||Wba!=#^+rEv-?SC0w0qsqEnfw z1f;Wy?K0FjAoYA?YBC)e_TSb0JF}4)wT~3L&d>6yo}yh5ZqKXg9`ioSuYbn9a9=uw zW0PpbzQ_owO~X+~ZM%hoi;mSCw_#mmQ@-0BL3hdeQP);A>R$iFVk%RX@sMU+!X^~C zS_UdQF@cGIGu^O;e4ybYy&7Gfk-1rs%QjtEGUbC#8k3d|BNpS5-83-jmkNbQausvs z3_Hv{Tv0aFM>$?CBkP&kDkY*ML6p6TlA-~a__Vb;PK#rTp)4CscpW3tl#4GyZCY+D z`PoFH$?RQ|V}71ZLm1hDj}XC1&8L3F?bFPK++TS5Q}@)uwl5cJEuQlA3|otSs>T#? z$)2`C&#zvUt_W=vVc!gqa7g9}AeXJx3Q7(_gE*%4xew88@Sz#2Kl~2nAEX=m$v9;)h;&O<)s@Vm%k(9uL3G5=)3ZnMQPEFZ-_yEHfVVSV_c*cX6ve(f zx7nTMl_?{)*&L$0nwN%d#USBx)A*XfW#1lIxhn1#s1MC_SnewgDIOv4ZCDd|b6X@B zUHXIbd2FlAk^=EROA{+;`!~JqvDQKDV zAI?T;(CMYxRvqJhHfZS2xpcxpLhPBAN^8xgG)S}6xqrRWUeId=C;WFd0zc)oSTHHO z1&B5|R!%DRhn+jbR+A4C-WJnH=AytapHzmfL@Tm1U>OUBOpvPn2T`QWWl88lSN_$2 zK}mAL3(zLu;KbW{y*eFZrZxDzgJ?bZ3D5)3w=lk3{{VC{Nhj|n+ znI)pBD+roWH3)VE14?SR`z*utwB>lgM$OVDCoP%YXeQjC$@cEh=i0yhN;}MDqvG^y zBDcKsa=U-p3tvFgm14j$kKC4`Paw_`eyXdhu!@Xez}m3ityQ!KA z-yAh@pp`5$EZ!JL5#FGUTs~X|rQ(E=waak$BfCMxz>8f-dSfUQHyJTXBbjsoKAp5% zE0SHFjzzN}BMCXeD045cB@fbZpYvK*sj~yy8260+Q=10=C8L_gEI!|R5)E|sHHL3F1bd^T*dde|WNo^KUSWVY%Ankwx_;v80R2#^_8h>EqU{ z^&b3*;{m$*NQNHUyWN=!gU)&*ARc@ zCQ&fs4tI%bw+1)2m`^2B!gHA%(<_X3O^vLO%*V6MuZm)XUJ#~k3S$B44E*C6)OTU|32eUw)AGKFQ zzZ3|9!RRX{oX$kpDs{#^6{|VpHaO02h34(d97%HbWI}~&TX#S~?ke!!cHu(DGwtl< zZ=>1w1viuMX@TMKQ$5jEV z3Exr69#U$EYxB2dxPBobjqR{@QOi$AML`h1;-@w-qL2iBrWuF?*}BKN$60~Nf9UL9 zIv>QM-z}kE6}uA~S(g4uufTwS`cz}96b5ivhj5?PVxzHinNPgR2%5zDL;NC=Tj@8< z9*GMBxFZiWoPVY(&6LSgWzb||wbvJQ{}6OblIlkse${RNj83&CN9MODoLgvzT_yR02oqOJLA;#h!Z7!?cOXH=MBR z*ewL{iz15jpW&U_wd>^e0{*or4%j0Bf_gOpGnHnZ<^-E%+Pb~oAgj)5zxjgJfqRFX z1_erD64a{n6eG4k+$7D@A^atqywckaYp)tp3$jJz>XimHMJu5Kn&Hf68xjXz=ZQs4 zADYSQH3?@9V3JXmF+IzwcR4wN97PQVZNW(^A0gu*?pf zqV^Gg)cH9Zrz}pA+%Y&tFdqqG^xk|AG znWIbvS*m}a3{^oqONE<^~F0Bmhh?1LM0 zy5Fs{i^|akrZYgBWo2*TrG$=4DFU~IzV+2Dh3PY)9>qL*LC@1vNQI+v&CNLe@hOq%wA+a^>*chhO)7ZkJe_G&WV(GP+pO!mSg=^Bkm7pS~!aPGt z@!WL(`g_dU_nyh^WgHgwBL0Mi;KywGi&tu} zo~73Nv9ihK%S0yG+M(;Oc9zyIt&U>}Qq}n;Z-$u^+n)q1jiP0GC09>UPd%HKU`Z1# zN!_RdF9Gagd=N~u_tXiAznX%=N$9r^`yP#8HbVN!)ONeM&V;upGOvE>4NS9Px%Yz2 zBes|rx8uF_3vMMhofh|~xOd1DmrrhcB9vCC=6$vq6+~R4u7s;&*yG#JSJA#5@yTsc z(jTaKW|dfH-w)-8GZ&cnldn2S(iC|>{9Hq8pYzHuzM0qTSgvne(awDpep&g7qzCu`)X=KCk8o|D6=g!)tCtDe;_j@yO6dT*fJr|?CsDY+W*B+EXwJFYb9 zeAaTepBd5vNgJsrCH}%|=R~?`-w3;1WD;ug7`!a5aZSSm;|;!0{__9l zAs)=nw-EuEFin9oFq{Ee{R=J48d1r(s!w+{(dr#(g5NSHA8@#;o{9f@Y{XvQ`(;2< z2cIPM_CrUDPl~b*Ar{`usAopwd3>BtOgXKFYY_1Ql>sfdK4ac- z(zV518?c@ezuR5e(Oub+o1EeNqTE}DEWk2FceJ6C{1P9^9|T3izR~TU7B2?=kt)tNm80OUwpxgWYOw<1SIT zwSQqe@gFLl)x`lmv_|8?FMnr2=YUx%D0Yo9m;Fj^n~I?qj_t#95)T1C|CH|Xo`3bH z+hXv>PqOzMx!o~pLgPgWs%PHkyn8pYGB=sRA_fF>IrMVtO}ZvH9HPNUeY!4OB%wQc z8mUXx&&!~G`nD;xnI^(?3sZ9GzJ8HXXvVaYixr%Olu1x7p6=>@#^P;f*sqgH3~pV}D1pPniipaX=Su>XA8Z?FdY)`C2hru) z&_LP>43~%!-!3jSG8DT*5e_S%4)8bh)O94;$V9{j&B+#Gh9R?3!$RxyZqov^ACKFv zWO-@(dRVl^Ke^emi%~uS&j^gmAh`GXZn zMg0D=VyV>sI8_YBlv)f<7;+7P|9=h7T*zzSV39-r_YsI64dvd7e;nYgzCx#*?Bxox z`yYJ_A%kvj4I$GnRrt5-8e!)LopE#I{?Cq!!EAs1f$a0}%N+Q>?*?+h7B@5l$cSne z>EB+(2!Jim5C6XnLk8&opi=b#h`Bmlg9=Cqhv!Y^u67W!{50KMlL z8?_Ft+X%o+rvw&xpwnkD6ra`|^PPXq7-mNASr2W<|1)ljM6sx=m zVR1@-)ctLm^d0z9X|^=rHlsBVr`}`0g5TvN#82h0MvNg<+x(YN@T~}S1ld%T+lAf9 z+Hd8}o+V>O>Yk}=#=24kiqFQZl)mW1iI8Sxjj6B`3!m&A}_Q>0rEL)VKdmCpH!44f1d8_>_hpGIu&Oy`2gx)2j|6 z;vFm!@S+0=z%$t{IVOI!AyX^eJDx3c7WO_WN&CK?2-t`C>Cc`O4L|*jzBr%qMlpY? z_ExL>GV?=ay5R4tkaOnE(+jrjl?&yg^NWUenZ?2n?dh}{11gC5PExz0_7d`{=$Q8C z?J=+0@`nmig|~h5j2^2aPN^sNeyjhwXRo6CqBl>_Q;O32ZDDA!)iw-=XCK!3Xi(5w z3()r!pl^@-lx%D%H~i81L*be5haqt&oa^&|Z1Q7XhhI(5ZLStclVkwuUuHutPQ%gI zjp_@V6RRE|0U}lhgEptjM5ag2CTjUiY6%9=ZI(a8C&Dt>XkAdaB@3tgRY+=Lsuk9H(xm=pJpd~WP)9}0PrGI?z zNgj;CRVQ4k+m+>qVL`+B#eh2|7ks~o)Y{M`1NT&|PSp0k6*!UEu0hXJHkFOS2lslJ zlpklF5@k*;{_;TRoNO|Ew}e6X)@tEq#Ga_~Tkmtu;M68+DhLwIQaGy%l`od*^J9$( zisLbf1?O8%W$MbMG12(WTTMkR9GhQUoaa>)9%9s{1zMpTukpPYD4`o!J;n{mw`GpU@cqzI9u&cCHZEyJEGc<@II`}Rwy}!1ssVS zLbWW(D%TvVrGfiF%u$JAblBB7*qsM)$#E@t$_F*E2)GVC(7!I&lJs!711$O)|GnC$ ztxm5)b;Q3$CBS;FGqAZ6uu_z_HRjtd4P9~IGnF5r{*;>BTt~E;9E&`-VhR4fZ z?Tu0^PoB6yOh2qQD=U-`@Y2m07t7rWknGXIQ4 zVu6K3jyAqBq_8prm><6G&_=M5Xtb3=e7lK7d<^uveBDm-ar%C;V43hs>AIxV88D(J zt7R$C!{jyEQphGz^GLaNgno9NW##KQzj6an@t4HCTvvpj)kt6bY@x4WAvHDrrSkh86l_`V63m0DtVt%tFR~0=v z9+7H%XsvQn2MT)mKfm(%lND5_G8!6)_?_oqu&6n(u7qP&YBQ8E7cElPESaE=h^&!F zzjHy9k$-ClG}V#2ReKfJAepqWUeltRr6a&(ns6nW`|)2rkz;-pT?U8;GhVEMM%Qck zfTd4|^EJ=J(cyU*=v*C;MgLx_M+=clYU4e;%vK(Sx9@U39m=|FZDEe4P*v3m8oODa zYfC}7<5E%48_CjuihGLJR)O7@?Q0tDcGt~0E}Ftsk@Nn;oM=+;cvkZeBjn!<@~0JZ zmL*HQj>+HN+wJ}~O4S;4)k<$g9qoS7OlQ00wXUdbatiFcy4aSqUMeZuQ^Nzs>+__h z*z*1%i=v+mS!h}R8hdm74eUyw88;-a4Q~EGrDR6?R=7SuTIE6OS$op{Rz$+*^-%tj zFI}RPD^Rpr0!|r|ui<619r8PS8Oj8-y7OF>qyIOowZ1FOrc(a3u9&m z3toL>AnBLybBiQb1FiJ4kSt_modBcweNFmVwqb{dp^ZijU1W+c_KLAg@cqW3ebgT5_KA*_h;!)|!&vz{roV6Ec z_ny6Ho@ZvdQ6p|;j+R;r_zZT#d|vjrzP`Fe#%GnF&*Cgmk3rs>{86)4ZG3t6Ec(t* z=*mncE6_-txY0lyaraR+1Zm&5^@EZ**=~}mY7Tc)vK?-rTm3tL&Qf$hw7)SXGw)9p zUOnjL(Vbs9nDNLdUC8UN=F^3i{wsn+sHmDgOWVQPD!ilBxa+!`Dogp-)h|9!&Iifu zEakA0k{uLE#8x-eIWC;GK0X93f`*fWh) ztDh9i3;ANT-=-p#cs(by{lyS!+a*{18e3V$fq;!}^HmrOXbK3};&9VpC9xOb{uP1} zgu<{uV&6x;y<$G!rn0tRFE`SkeA2#p$!Y?bfMa}qP`zfnTs|fGwzy?J|s6Z^cU&9FM3U&^j9)#s#?S0GaF;=I0ys|Eg=11(#ah= z=@P83xvjFdP+c)FK9}GoWovX4x_pL@iYXx_xKw8>%-`$dlmjALJL)+cfBpRE{&9tU{o#^W8QrrfrQ$`Fk?I>g85)KA?gU(3W`I1% zHDRvR(t)%!RI1T8!Q2V+{6G(fN?c2PZDayTc^xB6_a(z?LEh;d8=cT+4H$AodFx-H z3PQ8}!IU$)Ke@{90v z%Ocy}o?*8JC+8=uK326KUbHmY{n#s9GS;Zw6|^SB^B!f})3S?4T}Ch5^!(>&;tIG2I@ z_=wXzW4iSHz3IkU+xG)j{Uty{eMbVNuQsmt9zC~1SGD^)9+U%(bo_<|mF8s6!d<{| z#Wz$HW>e6T1c@MG)$E!ZMyMMcjiiAyX#x{G)>q1bSnAlEe!s~MBob2O5rR%MK4`=> zz&MyIR$pFI^-g&-w-w2c0ZN3E3fU^( zEv@#Vm4|h3XTg}L)MD1E!A!U}K|mDVGKpdn#^TF2x z@DhaM$-du{)(s=(t#oR2)L@8r0!(xy@2oX_@Dj1N;HU{hT;%f#yG<X!HPS`gQO&EqV1OniU zI&kNEs^TisMvR+OF%}mju@bz=l}fY7_vC%D6)9DYofIa_c)E`tHHR`!hE<;8D{i(_ zaoBRWfA%|F5zkrFPIt1w0svz5xpqLe6VV_KxDG#V@Jq>H7UOZc1t&9>F>GX8t}ACiow))YJ3~)u03K`h&{F$zXHhYGG1na_R%5i--H(AOnF)2o3oFxP z*&7ux=?r$SXiHhezB{6JJ9!j#nORDZY9?$-0jUzY7G4oSxFt6{8X(2p#@G8i$qS3 zYEoSX;z2G!HRHu4q|#hCfZu@(5z!oG&6)mgyT2)eA4G-%y|XY_E_M?MEk(wL0blKl zV#Yvlg`na&g=60!Nu-p(s8O`8ydhuFB`J3)+RMWHkhkuX(l@fO@@2Xb_VfoS&6fiL zuw6x&z9?0$@X8XK&THcB(dhRZbY>tL(>yh1yB7C*WCHT}xaT(nB63mzdgYa%X8Mv# zXCMB?nsTndb^QrKA&B~+-fJgVP)`>6jf3b~;HyuMFgU(6wQBU#uSAYaPsFcV;Al^&yER9XSvGn(%2d3D4uX(}OelhD*Q)^GHY^eaQ&~g}2ZT zl0t{z1PuI4YWBWG-<&>&^*SOAL_K-){lxjSTQqExh5JG&O@^V;Rk6`Ov*lzp(3sS7 ztsy~Q=9E#r$-kqY&=)=S{#qvzQ{R{UMpPsylSxc5V_n|gg}^#PEQm1hrJR%_)oxh1 zGG@9K=e=V6%P*3Eb52g_{5LQ45h3oJC5H;ZR#mwjkNlLOv#al_;Ghc-(f*6{68qxi zE_axlWJCP-P8(qUvQfa0+pbdExE2^aMA`2vLES;USbm`ZHx##g3opq(TaNpN+*wsB0gQfBNpTr4Q{jhE`sqs#i(|#V6 zxMl=OHZDWPHUU}SBS|(4*w>2yX){>mApTzBVgBvAFkGx9Tp|Rljl$0SQm6Rd($%Qw z$%Yx)kDC5x>oQ^D1x07aeMXWR6P1&)v%|^eOiY&tvlutMUH$03@tA7`h(%>IF4^ZS zvhSO^kqAnpI71lKNN#I9N(u^u zb_AyR>=`OicpuKlcN-k{#y=kC2zWaXCs;H<3BMF;^>;(Y`dGqk0L{e_2CKgkRN1i4 z5#Rn~&dCK+@_OCHvY0zdS4c%t6}C3cHhiFXwJ1UWdJJ~(wL0f8vyZAr|559L!UAtL z^s{XZt|Aj_lR=uEw|#{!_X3N?Ejh^W`}XV0wnrhAF|;Ev|J9EF^|i#HI!SEr`+jH( z>+oW1`?`P`cFBP}RudWBCZ9EhuD-P!!5sP`=YCMx-R!p>Yrj11Nt32z} z=tPX7jM|`2;+>@;7g1w%k=C1$sT+ttSuionD>uELO>^Bz5iuYmQDOTcP&(Wy7omT4 z@d3Q^@!AKqyQ}SiHQ{@GN7rSpmKi?Lp&`_+fN``_jT(DIC*0e*kB=KJ2>T(IbDvo| zQM>m~=Dg5hFeQ|nh-Ydmv?B$8D4|=%2_wj|3+pyagQ26WaYm91CoP$t_f-#4m?aFI zFh63iUOl|4b-lVI9Yex$3xnszXzrX*F!uRa_iBD*zEqSl8w^LmXyMKjGkExFmvG;{1#0nq*J?|_#W|>z+iDlXo1`r9E z!ghv8!v_(Dai$CY@cNfpK>jkrR7|k}T$1jr0ZaTEN5qP%gn)oJCqctc_9d7#>BJZ; zNJHELN^50k9U060+8!XfCJQ0j3sU8gBslSM*nV}ek2iW5qyao%c4PxaNFnuO-E$5d zxmIHc*Gy5GSuIIB>vAV8H%$*xQ=VU?O>QZd=38xd#*SrpB%305so2FLMl`?g)$jB+^aER^V-@c zt9dZgolDaZ10ETQxyF|S4_*`Tzxc?%fRYp9mpdr&Z9{%^(SIT`FA$uiyb+s%GV#Ly zV_yHak^MmgC=~*+qyAk<6oB=him(#=4b=DnrCy4kNq$fN|9;lU0n0jxuK~y3HNXL- zPnpB~|8C|#zdOVLv`7HD_sc(D|E=Jm0;P{4$-gJ%pC9ia0CI7I51IJ822!B(-jD74 zA6V%3uu*^GO=ws-e~sB&2p%YfGu{^Yqr1XTBp3i1L=KXm{2#FN`-2x6P>MP@?DyC7 z@B@g|vY29+#9uW$kpZQoamjFhboc-N1p9oMl^fM-qfswkjcL9<8j7V=00%WF{MA#c zH8?1xIEtq&z_rEpV%jAbmoI@z22EWzgi2FrRMp zB}mG!7TA*bqPPFEFu)>tufo3z&_ZI^k>I)38Xf-j*PKbM;X^5{+o9CsXpGYRwa~&) zV~N5afuiRpO3z_-2YxneE1ugr(z4fmTWE~FUny7#60y1x4Wl=M~cV_?9 zEns`j{uU{n5j@qhKQ{1#j!6*to zD|0gt<>_;r+IX|aB$M2=#ffjp-2*w2U){~5Djh^|GOJ>a-&u_`C`R5`CudFQpW_41 z=`$}Q5)_S%*ud@s6{%npjjJmH7!WO!=21&yP#{a7ZN)+IZPa_Z-7@fIMU_}|B*R%3{cc677BzzmZ=9V*-%ibY{r7A=ZG!1M zyA4Xa0;=PrLY@qBWjcx6HU_f8zjJ#JF;lHsK@mPLQqig8MgiGl8%ORksE4*zTHSbc zXWqn9nNI)U^DqXOu4jYv16wn3bj!9#J@B;h>2d4@V?WHwv0d_=>n)cP0B?iwb!LEU zAJVS-E1A0u{v`h>;BEURt^AJ&;^vDzAQOEIShLFiEnUHmPLsW+qqo5In+|d;~+tbpw7pERG!#wZe~-mg>Qgk#K8tGs8?cUB5*qx$p!&PM}YsKOsHeVAnmf7bP39G?pUVP z)@~){ddysC)b8W`HKcm1Jq`(%xedPebt0SV;HUXBFUVy~9wgmhTNa=5&Tal=)r*AM zW%qz<>n+ya>tqQ>u$yRWRV@NmBP8(!#btJ;6m*|#(>krhSyg8stG^l z(R*(pJg{E7l0+Et*PkrL?k8()1fna<)t|?rGx{R9It5oV0V1LjX@A zDsSkimS(g1(Ju%^y8cM-hN1OD4!)g0xA_R}Y^c0F$mDHZ&9iQU6wUkFj6)#yxQS{# z!COnFX9mqTL6Jn2B#4)uWCDPXYx;}>>LFykyRETJ(GQ^?lXA!*kWw^Jy8Q&l-p&D! z00DKPj3H;NsTSM}gkqa9YkC#UtiY6)M4DJj_;!GK%0&8FVX>J{)%HqYk8SjbS!Jlk z)kdf9b}dn>%5csy(FTYpx>wE3#I6j-n!@sY3^SQOBYBi9@pChs4Ufw+hQn-9!=Ufm z>5@i``Ght~5$?z@p7X9eWc6~LSUQ!0f!tG}AlbV%xr+nxS2LiW)nki3uY$G!@5nRV z<%O(4CNw-MnK&uIy`Q?DA6R9#N1pjU%%P{#x|}m?ji$+-@VH%RJLBvHNV^?2UE1zn z&=o1=H0cd$x39R#^PPXW7kUPVekj)HG%-fV-6@xW$oP(3;CtQtx`SfP8rLmw5CtKZ z=(85XQsC;v?*-In5~7`G*+QC)He8x}-!P#ax{>hvOfPbvwY$b6PUaaB7JX=|srho2 z<%s?h;M#T+uLr-AjuRpB0PoO5UJ3($Z6@>H(?$rcqxYxeJ3NPy=t;NUy>?J6sUsa) zJf4lO+@$%LEsOwGI?x%=%KTPWsN3c~@A&KH6mtO)IuR)qZs=@S$Ye2s%XCtE`|+}# z!)!t(<5~5%?e6EK@sNXiu4btOV>0*GknqRfz}%0y)!mv;`UD&|X7~czl3FQcXXYza z;lGyfIl>|^SMD=?)Ql=o=^^!$k_T0psfKOON=|at!^E$8e9Tu`#OscKlGmEG=d@Ff z^o^*Ta+#u0H|bN(W-M zZIXBg)7q|g!Q9rEIqA^EnH=ezTNHFIJY8~8+Vgahw2ZS>Chko=N42<|N%=tCS_D}i zHoQ$$uat2xw$S>_xBW&T_xZqT%EDo{JMcYB_g++VPT!B?gv9NRPB8}$AheK1gNEJB z-j0oOzPs@w;87AO*dnY6Ep$^6?Y-P|NjOaBtFK#;&TEmvphNOu?BsDUo_-QE^2yeiVLYr?XjY3_&lPp;KLBje5jja&Q30 zflsd;o7xQ^Zx-#Qs~q@zn!}<=Jqb#VF^_Q10FV7ro~^1Q^2rN)_RGr@I~$8DgJ*`d zh7vamueM9RQ9?e?Y$oQP7yHW!maA>0ISp<&pC5T7=a8lcToRfhVwEhHv~m%i3f%x7 z#qqtS61S|c*Kf^#7M@o`m}W8dN`PR*N(y?N6b>!4q zxUzJiT*8I7yZsscgFlWXzGv?>!O}QivEJPd6fASFvvgH|TEJUGkaz4-Mone4j)_MJ z)G94``(vin@w&|>zP!Y+FOmpTROdaSL%f6$_f;3&?yk%Ft5ZiI4zB5aJ>5ykA$kC2 zQ5X7Eq>>j0Qp)zv*I>TjITW&__k+8fn;YLeAKO|)@7`K=GTl3NF7monwfZ{QkR|t> zR~q;p?Iw*}l@9Ym=4lt9z_#1hrNXQ*d`@LuH8mkh?pd!jGCH*j&g8eo*=l#zzfL!4 zC#5xEafdS~mjw^Odhh7fOJ@r@t2kuoZuLCo#RxdT<+^X$zskl+PpPIiJ08Ypbuv5l z0Cev1rB=e}B0q@bl7H~o=whwWr{^{(nC;z4vfgg&SFy}>m^2E}u%w=3Kx~icPAPWH zNvg^9O~w9LfAPsaLFhvKS#0M*Gj6(Xz$W?4G|OW8Tb^ z)I~r?08pW7yGA8yCyyG09&|DPtZ2{caFieaJ)@13k(ARapO17GS@#Oop%o&i#lms~&9+(%NC;oYV1IBA$yz>>ci0{o^Lo@%*bE_gOG66;Hs)yG0 zNHU$nhn?-&5v{wWsln^J$zItycllKAubX}yz@aT_Vv&4XG%C_As3%>Xt|v7O5*gV# z=nau>Z)=?%y7kd+b)89&09;%gh|6?KQ?Qt{rH*stX{DlsF=*t-q+_XHPkc@0F{?8g zNul;9Z5Qz4FxBml=iCSw%~GwiSY@*D#b!{yCfG?;>i)G$BtqV8r(A#3TqjQ#vD)Gw z>+o}-Fps)Uj&XIK3xw|^dl#ecH!d-A=wp!ue z=Lx*mR18AzgRSAY{m`HaJU1v6w@Y*Q?ynAG&me;`jcmqS$1q677eCNH?zK7Z#qc|y zD6SNr=09*cB{U_J8&4%Lo}D+4B^KPH9v!^J)91!f*E!yzn=+rzbLY(Sl(*d;rUOzD zRRtIph&-ZRoTGDD5`CS^uU#qsm{%3C8R1iX)iHA(8x%`~jhS(N z$DZ(}yD417$0J4PG?r&uO_J+aJz`?)c&;<+f!q3HWd7Aw#iRpGWUh zT3JZ^8=l^lY7J^}uEs&#o=eZO<%toM6zMWBrf|)4FG`%2E4G2v7RJ(fO57Wd_kyFH zeMC=eyJd@IAR)?|Bm2tl=rkjGRMR6iD8cr7T)D2bZ#@ zP09_5B41a_!cmY8gfs&6*CkVSMl%wfPd8+EIrosBGSNU&63SExW%0)M2>Et9BZ)vR z9GN|3tE9ra7Q3C%65Om^>6wP~xe%<`{$&V{;Wk5&T5Sl2=}A_ZRw3;uP4PTi&7u#5 zZq+**kJT!ZvHZvl@kCZJSRY&cc#TQ}m>K;UB{?+awiU@oPk=*ZU*lvt6DMRch7D3s zJn6{KFE&xDG(nT36HtT(GG&<#&04r}ycp|1$)mzj&Otsps+A_Z&hE#}*xSjqJaoby z%B<>6%U3;!tTkYL=a2wg@0Rj5O##Qe&}p*#PR@Pf!5v>-Iu0ReVQSG?Z}EGPSnSv7?_O`h8J!Br+V`{Twm7>+!!&Ck(qg5QW zVc-xWoULhDcG8|K$VwtJP0(~F*mp;@WL^R7{^m4!`URO8R~s(k49-y1p7&7hp=(%> z3b=ww)JiMS3$-h=J(V=#zfp7!rZC1B!_C^c`NTw$&!qC$N~KH}#rIxEEUC=8{Fp6W z%+sDPknsdU4{Y^?6JAMwE8))wCL)RwFpIJcD%ZH}Zph{iwR)YwVO%_2sC$?^Bl?LP z4k-sD5lQl%1XOaAHzbm<9+u3uZ)DIPQ5p|H!euh`R9u-VP$-C8&x3_9f}!Xcp%Zis z4;gcL(G;i2vFYPt!%ZpP1ZpU)e1893>O4RElJ&uF@^0#<&19WJ2^x+u=(M$cKZ~&g z&$KUua=F>_P4aYY;}9nEu&FBj;@OEK9Pv9h@xDb4@TqLcC_cDMF?}?Rub^>fAa)U_ z7ylJVPSG2cn3tk|x&^yIS)ZHKGo$RNmQlafu)HwYP%$;@B!kaOKJrF*&zcrD9){R_ zSo@nCKKrf;%f}diVCU03p4xc+L9+Op#RnwJ?^#=o#cqYM6)E+{KQ#-k37?7zqpt1;T+QlMBY;^G{H!4L`CG) zhHZbyZqCdJI(BXg@3=Hr&-OAJ1>@8Fs0%NP+xt??7>rMuj}nT{o=}F1hhV;tod@7Y z@%u}kr_xwzXw_KfB4#|nmfvQ%SAI1ccu#;#4t<*WfnAps?x9lKj-=XucxfPBOWkG? zdBn?S-?z_Yo?YIo*y(GE#ree_Wvps1shK`8XLG%`LzQsrNSDuTmHUmCM%O3leuAAc z7iqL9#eI(BAJD zED7t{>8UvDoBSUJ8&orUBvcamb!B+$sQV%(m57kJKEmK&fp#(+4zo)|Z`xW6R9&*4 z$Xur1u^GPacWSvH*7PERAoTX#lo9lzf5i(X;0&2}XsR{w{#Nm^lhm&7SRp9lJ=Ew@ zHU>3vap(zpfGjc=3&;^+Mo_n`NTpyh2gCG1tC@B!DH?Ad#^R8l`>f!dY7J7F&+Uem~@6iZ-|NGFb_aR@C{FE!fICFYvl z*-Kt8d2%1r%vUt$PFhh>rDpQ=px77e7Z zGp09Q;y3(VKt&7l6j|RAUi;0!iS__%^uWjEg)R92dlzbgsguGs82qIzOEtYxSxwBgr-= z0`9=eN;ihv8Lk@w+OJB_0M|g7fHO#sJrTG+^)P2jyG@(ta65oI<9fHKe28FGlg}u8 zbEJ(Ac68xYY!Hxvj==(rxBGqEDo@?6|EFna-#n>Pk4`7U%+?wi zjeQ?J*uqzZPR2tClYOAra^Q`=+7)D$$d+x2rC?Yx<5Y!cxa2{~A- zv%H}~`Y^(iW;R}h@+I7NZMAx-gRyRM-QHBBGw9T5(|aWCZijOldULGZ!{Z`Z&02b@ z-g+9`c=VC7U)FB$lDnM4YMN!?8A3588GvTqG}=PO1^28;JE55*hbHy6UhZ`lU}E-V z78)xhNP^zR#!(=U8ryqj8YQEkGPD)MDP0PZr0NcJw-MHNf*FX`Em^k&goH%5`@{xy9p|c!08#)V_W0>~cLYk~ z3?pm^S%W^-%d!59PD|Q+qOyHmjm6gM{n_aCRnG!GUF&c*--*`@B|kMBGF#DW5*v=4 zQMgKO@ibQ0T6(cxsUP~#B?23-#sY1!_wn8Lxe^5-7p=zPM1&5zb;0Dhkm z8cxOtahvO(MYwRkd?JwL#d5^_yy0)Wn5){4R$emxy zldF=2ewV)th)6Na@EvLu+IO~3W*JOfrmd=C)Gu5>5?x(I3*wc=?h^aybkuJad=g*NdnI=uyJ71Zgj=h-*PyzL## z1+0|3hkCb;Kqz5)L>j&Yq`@cg>oQmBxTjZeNHm@a^jZ=UD5NwxGattxGlkI5%r(c; zRMPP7`K+$`OEzn`mRJrqj-m(;w?PH;)Vs0MLiXD2%FN@OOcGzm@i;7nd~NtXVj{fiQng} zReBM7w*ppEEj4bJFZcF!=CL)Jvw*$=w!XE8>CeozbcWCdYq2WChqFp$j09wHLPKnI z2WIdg2@S-+pyqLR_!!6|%eIi%`;qCM*VpYT-ITt`{(vbUG+}&9A$X(LBDTol^l;&A z?B~ezRtMT%cgcRNTZJ_K6=@kjX8B{jv^QeXZU7~5e5R=j;H0+?WJ#V(_F|0?o9|Hm=sclsTR`i3zE+Kb z`$F%Bv$3jfAq~dUTML=O7(WL%%(t;1$Y?`$lD{>wb}Y3lLD$YAQIG>M6VlpRsjv$S zQbTJdIu}$41Tv&vgJJT%KK>)*m1oCiwvu40x{5)A8TW6$g&xeO*2t>fz24`u6N2T5SyQH9kW3 zehBZU2R3gD-ybU{Giah^HSI9u8XM0oB^%v5`yD+-;0e}>Y@%0Nux z%h$|Y#i^(0#I=D1t~n&xrp>f7I>gG3)yT3{ZLLBHL&-vydr{|=E*2ZXwZm<=ChfMy zkTG5-GCIk=UP!5-IxsxMvYu`(rh?kl)uBmfG`K(J_FAl%&#?5g!JAW{Dr6Pw;sn|} z&R&mhCm*a9u;kwf)3<+Q(ADT+gYZd{6^tFO&kNpZHoYXc)w;z=$$S0iVO&8Vp(;~E znc?J>NX>ulcSfYp$nL)l!AXalIV{-iJmz`oU!WQXx6w_-uhu*CFjTR?Gfv??YIYFJ zYn)9NX9gt%RG(L9Q+c{&+7~Iia`g0w6~MtF*bDw*Y^ISnT9ruH8B-;^;NSPw>>Qgx zmFsdvS&l$#B4yYe%fYyzP|%ndiNsc7y@r|SkbTwWae~S3`H*Wg5F=ggu3x(WqZ_Q5 zjT`)8TM-D8rBaS%lz{0GJvdesnEpcIMKQe-LBorHM7dOcRpr79R`ltGTcq-bq@z$t zvhf8nLt-a!3|RGQwWbnh^ji)8icHBZ!XC3ffzof<(CNG(5@iS5Gk-!&QNqFis!9@7 z9}qzC2LksE44}1=vwUL*fJ4>)5L7u0p z`lnlDK0joD#*A9eTP*)9_5SU(NM?nE^rtf;nkK@#?to((0bM5k<)`hpIg>e%BB905>uaN@yyz7eQ^=E@rYxpl)hqFzT zUh&~zoww73j|YHP3UhMhGN>z%hA025I?DSM6ndAhrRu0nxZ?CzX(#J?{C7~E6xPpA z9`mgp&E_BL)kuUqi74i(3*-kXyMx611FjQmpP%TRELTyE&65QGgG%1`3j@1~aHugJ zzAMFxbAh1e@e@?N<;n-dN%G$S+SXvAg0Ab{S5D_ltddR1$RCi=da!+0*GM$$!>o&s78)oI7DC{gS(6V)=Q4K{iG zYvi+J96t?A&+7*;zR=@kCPYNH1n6!C^Zp5u zJ4pI`pOGt_p(~lhY8=90xh%oM5&XIwf?Z|0hf%ur9`7Bbva#Z?8kRGnAvhqaV~FXzws4;eIunyywMO;g@Vu#{Y7dWr4v6xxr=PO5O9n-Clu zFa3RTpw|dC_R}A356WfGBPf@FM5;Mt%n0B;k7mc{(48^aNp)SDxLihLn?z=9P)Q=_GSPgoj9-EzH zw}0_$rJ)Lr6BFAzdlIl}AFZ^O@F~1%^2$FKgJWz8L7ht&5PHb$uG${NH^|+(t2JZO zba*SD!Joy4|D)czaxPDJBAfT=(e2tuBVz?aJv^r7`2lIs!8+(aqJV+|5Mt=3WxS2~ z)LvtWUA>{Q`}TWA>%Zo!)HHoD=^^-tM-e06YcOCS?&o(7Ro0_KE_C~{A18S2_H$cO zc*A2q2%rY`I<1bToq0~>*8!<%Rw`U;?GLBawL&c5T7GJ_+Xhg5D8nk6%)i`VxK^5D z&@01!SAsN7s!{+bPck4FZu>H-2t023;1V}m>s8(PT89$%SugKYK~L@N(WJ6tO5Rt^ zbr$iH*z`QIYC$=Mb?GM!=Z2Y-yu7TQs^vx4Di;F=1?ka8_0Yf>`PD=*r`ESCh)?DQdgJOlEzMRHXe$ z@XLzm;VMo;2YrlyInn@_8>rEteaz_~_uSj#S$QD)U4yxh$kJH(x+59%&T#Fs+xl zU3W9x$HAI~v^)#!6~?=t`ey_>zjV{nDSxpP@?@7g!(pIOHEU&z^}Ja*d=yo~Bkm{^ z&m-V;7#&c_uZjOOS7)L84qyPgq590YH}7|dh;W^KPUBrL&0x0@^yxx@AtuJxSi_`| z%Vj+NS&s3h507rHLb;qj+5t&Xp~6t*!VRN0JEC1n9$gZeOY0;;R%$r9;6$wki#a z#q6~Eg>2WnjTB>1m)~P?1~0O+tVh(99SvNX%~30D^w_F6u#HE9)Ju!iqU^R1nyexw zs{?gfZN(9B=s&-nyx-;MOrugwDab)@5K?E>tLqJ*CSu}5YamDyI%qVDVMHH7IrDQM z8svjMVoy3T!v;NL7oXqOv9166wiE85M$5vw_~!QA-OgB}b0a}nN`+n>jll=56Ok;c zVUU)nq`9NmRpge%FaQ@+t@vVD8dASviz`lFqh7A9R)$V(VY6NmhLB<%>n$u26nPzU z>m~h&L%PS(z|pb)8p&+|8Q&hT&td7_)M$B3mi8ZBR|BxqjWDd|X=B}rmd7|cim}Jk zLap+Ok0|^#x_bxQ*+CD&S@hXn5C#&D=hnB+3FLM(#_^~{MxsUaCYcJhXJa!0!KF0% z8=m^{#4J4_Y;-DlYS-rtj?^|Wxs2SpEjP9@4jjK=>|U?M*sd>WE@mMO!XT#koM6O} zBHr?F#>7fHU`(uw_7A+lqZ2Vq@~aH+>APzem6Q+|*oWG@!Bz z!A8Pi%zyC4m1?)tsZ|a;Ut_A2Y_#r>NftDu*_(o>xcusle>)3GMAXPtDUh|I|7>yW zD*4}70KrwpFr<{LSI4v(r#(%>8;$G*#`_9Frq5?}I?c(2uA#vJ);yI>S^nS92AQpW zd_=$Kz+y;iCR+1Xm_*9q3CJ|jlUkQt5%fuTGN0EP2lBDg&9MCF^N+&`Vx=J<0_!XQZNu9487u$YU-1e+BYlSwADaR0q zgr%+9rIKl1u3IPP)KzD-@F1tQ%OFq4rRGF(hfI1pYyXiJ{F5kSF{Ng4-|y@E78cbiV{3)?T{>FmrtZFL^gG?8F^_+ zpp^42zHl&}d}4^%?Yru?n~JwqiwzT5;tK>56EdvzRxpnZa@xkHwTaKut_vD^eCkgH zCE%a^HkYmGDc}(K(AG6ciP9A^{kG{!y1%Z?Bjc2~Uw zKAd5{0jq!SM13V58hDT0ziG^R8k#Z3$|bUF27X}}Z#Jkvd=CFh#{q2P-WnN=q%qW4 zd9L2dZ##FIi@b|$uQXZW3`9-1gfzk3mg*S@-Q5gVVluQ_b7ssy7AID#v*lJQ?plKX%6{&hy7T1nf(|cVo@YuTY zBd#H|k?VOD&3#b-YkU8fFp0JcsBmy=#M!7W+>>7a_sREf=Akzn z@c(Wvf|dSJR{*^QNJI|Mc0)PN$^Xy;0ov|wg6<29oc~c4e}C|9|6PjvbzAH&Dl5rv zg6>NyiN9;`LLV3U@PWLwy~=dS)!0VaE?4t+tTq>k?HV*aCEXt0QVN0bVmOWquRyju2K1(42l;7s)( zcQ43+O7Dn>JOZXG@tZBNPe+XL|MXwr1H3d4W68B7{}R&a7gUE4_F$83G!`>)Ma)+) zmj0V-7X*(~!;B8$g$k!1`g0!0Hq>zwp-(rZV|s!wcGkOtY%dpp;3MFQLqR~pVLSC= z&z=1qZ?5mtfT>j0tyQ=A862lfijvR(vmiCm^a$yg$echkM`~SEZ}K`1qGG-c7Ob;4 zM$kGlVbYF;)#=|iY&5%w(|h`8#dihJ&~8uby{NrPb$OSoUIz_kVd9$i&sp$+rw;f& zr!$7}{WIfe(FixHBK5x7jg~o7GD*TfyptK67TZJERz0w_rPK>wbJ0=liF2 zsd^k$NJrPpGvn_B7?*jO`*sT9A-@FNB^*h4DXS&xW5Ii|vWZz!4l#-yLc0&KOD!G> z+a9aBO`PR#M%?6L&J)WHHrt1IEWngFLryDbhO28bqt=sw0*`?a_$`)AiH7usy?p!%>_ zst{VMgn|3vuNicZR*kkW3?X?2mr_fi(l}B+2kE!JxG6jq=VDZL%B3EhE2(6g)Qz?` zMkeq2*CLc9y%B&1Ratbx+Aqy(N-31)+|9!qhna#0LA zm1=-f6(x|~tu_E=QvO{dibAsIY<7zKLQM#G!CsiaiIn-asvtVyIKD2;^Wnl+I+dl& zRo2|g3cROXWQVGTw232{@g0?WNh7NNm!h^O{g#3zGrlk&Ce^SG7OU&^OMB;SlWULluWXaWu{eM=d)@Rs zt(%tlN4!~mo?@B3vW5pnZzSUhYW*NIq-^qjv)*U}Jo7PGK7qTfF0Mc(T}ndkPSUlm zlpJ2G8WKgNfT2hK%Ss&t^6PtIbv#PhC|V~Q4*tTJeRF(Xp_PY+FFMo zq%5ZRqJVewnDXPE#W3E)*7bU6e6L5UQSncmAQ9;d!R*=;s0v9{}#{uzuhlhNrnB< zHqiVN1yHJ&n~eI`edH_*__x4C;r(&$fJz?3fzoy*;7?^hDB1W6(}!1fh}+0@Sy>ca>e_N8&)N5~|Z71cy`&R>MGU9FQJR!A+=1 zJPxJNZUc<+?s6Ltmzp`b(mIy$z(;5#5v(eh_@B$b_%vnt?q_r??xmBRe1T89%-z|t z(OuWG`Hp;AwR}O4-GRfCG?R9lK3`zkwg3&l#!qj>pjetoY#gfFv!xhW;&dJSCLIcs z)=yVGH(223<+VLM;8j)`P`=`>xMCqBp@&rV^(v-xtjFX}uLR09b(rOkN%0475#vs4 ziu7t>Wsf^4^9--s*xZMm53evbKE3b^1_8Y8FZI88m;j8I53Hs0FPVCHFI0L#F?M5P zIIz_@V!X2?cxIU=s$6miYP7%1Us9)JuJ+#y?;51q?1`A#tTeD88ojD4G+_dY>B zoPHprXnE^u`JTju$HvsX27oB_sxZ6N#iu*}`1Y$x zIe4kXK^-NnA+y>-y*<@vEJ_rGh>!NGavQk&6A;S_@XmeD*o$P85EH;Qgr8R^_Nj3+ zjXItxj8scLwUwb9GC+p;xpX3=mFIdB7Gf-w$Q#3<#E-eE zm@QZSjp7B;wp;<@MMa+%mqStAC}kz~^I_uL*=ID+Rl%r^DluxbvyFjFr8|D!hiI_n zxgqpF2d08{O`X&}_V!B04dP>KL-&!p9RZ`EIu7(v%1a@ht#PTrMfORjR@Zb6{00cT zQ`w7@n+Cjuo<61U$&O1&XMZX=yZr8CUzZlY_+z^9AU90;b1XFdq|>p`hXjYb-8Tok zR1#rdFjPFU#oeUoui^RJ&wTmaFEnuI4(g(v=yBozKO8`4iOe*~L!ypUXwpj#do)Y( z7Au5msQGi0N3B-cXq}D#^V>^%__{+ra`t#?kLz{zrr4MDDZV^YGJvq&x-S=uJ6e4p z_w!6=&Qt9-(3oqAp;VDkpFhR>M+WeVtu=yn>1WNO10pZbP5ZtIH zas(0$c)6cy7 zL4OO9pQ)Zfh2rLl?_`P9l-&-fX&=5O772ggrB4#b3Q4U{q=_G-$BR-JO_HlGS{EF)y8+Jw`sZhw8Lq-}%ObQqL{mRckNYou8o2>Z~ z*L!hU?k5>EFk|CM=*Yw@)*E?)<>J9xdapMDMsq;1OyVkVY6gKo3OIK23Iy2L_n&ao! zHPBS%!^S&IHCl^XWYX%@qJy{V77@*+%IU&rmyd3Ax^blIZ&-ViL7 zklchOfkz}pCZ_FA^E2y{QpOPeHM@?ob_bME{1PoDNN!RUP}2e~N`X!)G|ynFt7cTMS3-u81x zI7*Qdx}Cxd54)9I6PTne`?UxBg5Oxvn9Sw09jvL+9f2v6vJYoW=05)aKs-UzKs7k- z^f&*kY@pg|+J-UMcyW|Fv3mEi7>cc0Si2n;WS z2<0fc87l5q_wysTh8W`^@34<&J4&3_0ht~#zmFCZvXyYkv_DQ z!rkOotN~+xoZwSR8K{pS5f9w^KXYiW)(&yrxT5E;0W*dq267SU`+EWcvj)ld%R|f& z0_1hOJKd6xTfZD?p+o9!Idd78zOY5}S4)NuNq&^1LQ1O(x%a|C!M!1$Mn5a_*72=5 zY>FjDKLZv`$2G0Xdy6xPil8*BzwTfgo)~Z)?lWN}sF^YNB3^_7IM>Y%+gm`!lj&fj zfGR-%Ifd76uwGhRv}S*o_{ggot>jU^vcNBUba_Xg z&6G|-RguHh6MdlSYSuKvX^XUu%xtIdaKlSJbDS+AA} z%4bH8jK#1khk7{&`XvHmEf9EWA#4Zpxu39O(}0>1iL`rPZpT@*b7Oizz^Cfj-G_6> z?6O%b#e;4uZ>2OCZsfGgg*wOmQZaYsNZCgD@Ak=&5lq*t_`Vp)$Py}In=)KDd6O2i z`&cRUjuXmdy73jW4p%AEx*1b%@Od0mdW;uk-5&~fn=ku_>UJM{l@Gqy7j3^cjY>0| zSZZC#B2hX|enDOCn#$NvaE(W5gZ{OOq!BsQuRQ*^7u0!T!@$NJGCh(x9AM~(W42qW z*Z}3aN=3p;j=|bcyy%^+{pKY^%AF%)0oWF4R`{-aeI^-w2?0t*RdtGVVmmO`h z*o3G6>XA(dmVbrVQRXe%F?WhJRMa_84y-fwl>=@^)mv+M{3SwyWL43;_UPj+yYho^ z2pd;!*j`A7OpDNjCdF7?59eabB}!jv>U*VnS%mGSH`axNi%dG_DmA9FcvuBZm%VOA zA9np;ww|?3d*&$<1<>W%tuC?!fb^7(g$kMFxE>_&V7DSz`@aq+l+d`J zFS$i|*#K;6^ZVlH!x!m~R)v&?o>x@8=$Ge>rUvh=yWJP-*1|EoJ$->uwh8Di)Vyx( z?0c$rxuJVsh25A9yQ2tl{R7p@<P#yk}6i)Uz8XwNd4M5tyOw;M17 zpeKh*40bOVpBk?H82M3|IzEAcGwyD%QJI>X8I5Hrw$hXsNq!7|)agCN<8#B{-&bEy zKG?1@p-N$7nU+5YXg+QI8t(!31MdhcC5l`;*l5_DF!v{o?dl%en*jX&8L#0JNJ0*# zb(Qzd^Hylb*pJV!Ky!w_39DbSy8+Lh&1W)TUbOIW zlh|c;Ca{})A&|g0EyXt`WJ-4%wD@78D0FLyyrr#1yV!`7HWhkidCz{bIp`C;Sw?2j z9m6fl?$iGc;LImT9o!jn7AdCmgBt6}tF}O&;@vf`L3!?WmX~~1kuybBP9ZzX_+~K{ z(vHw{437x*SRSvB=WuQ&!fZKB>}3QOag>$p?0dYWRRI_7uWc{}LZ7AXZoTZBO1>m3 z$~{%J<_al2R1wRGTDmGUAp@W6I$vdUG-7-#5+;eoy1&N;$2jSTV&WQfG3XK}tKK1} z))|d?C4Yk+CE{98r{gye_1%59bNit6Lr1IbklNy*wdgWK#m^q|{4+fyD8!8SV{K(P zwNBc^CegG~a%1$`S540K;W#uVW@XId+Xs`Y{qkkb1qfo-#w3GGx;E|bA?D`O>qnJIq;(|9lR!R@dE$rIoxwO61 zorDW3K;?N2+~|uoRbm%$NGR2k*r_p7y$6Wfp5bH)ub9KvddWdC-mO@hB9koh4cJMQ z+)A1Qiu?AHf-L$jVM$@Tl7@X2EmrB0kg*f<2Y|@P)DnwFgKr3T`D}bGU$}Pd;6KFC zv>agnKG9Y7u8?Zesh0#W+&8`uxoa6v0A24 zqFkYVKX8@4RAhq`KH^BROj=*Z`hM6@z0SFnP=5O-*N3i7Hsf`@$CU}BYWf&cHw)rY zx~YZ7{7Xc9E+>td$P;7mMrYUylX4}U%0Hs*`n3GvC{DJRLoLu};5qHe`qZzL?yfGS zmAn!D;z-+)#oMSE-ZhymFsu(J$~OMMzRx>5nH1X0)`ycD-*h>Z%@LowvUiDboAukQ zAE=du1Ugl#CGXVPuMs{ZG(UTdi6};BY=z+xN)2Btgs$WOTc(_}DTawTlXQ#xy!tIw zu#F?Rr#bTALKWqB=CD*M3JSK7f;f9bFi$8|R;4MYH-%-3E+IohN?s)m9s>i`)N#bO zx?J1oylP2JE@%sx^g-V#hhq)hXKBp-uz?x9t5Gm~7)d4e`%5(}nR=3KMYpYAb&OgP z4YTDnu940>tkmI&{nB0v)HlGU#+)?ea_otWONT`;x=}Uf{`AJOZs!Zn-BuqPv z*$t#xmzgFSl}=HYL*&z5q*}-2u^N);KrQ-_BGBS?*cZ=E-J;B?Ei7Q1ij{t`RhNjZ zva5VDhPl)_ITp4WMuK@n-`@(+?kv*+5FkiMp=B@JGQn7;Ts1~v)OGMM1**@67hp-zdtLboHmKis`AcEake)by`I}g=A$``UHClVP zR7U3>q%hfYGSvX)u7=*b;C;Gim8o#Q$MhVR0e7FT?z7kd>kZ!at+C2QDW9YZWhrXG z$2?!%aI!3~8n1J^ zkK9nZ#JFNuW&|Fb<65#85A~{rx;9I(-(p!j{<20qlOoFuNz>zib8|3i3v4;eoHCJi&FkLyy1 zL!h1#Uo5ZHQq@+~*akZn#xGLf9d0xs< zR74lB1i>c6JsTxSvudfrQBsXsfjoZofx7`Iel|mppG_%z9jk?;nBE$aUzZbb=Qs&p z2mG2&4bVhIJnUhxTJk=6vx{UfW38qk#ALijij0iwEzfL~KJ)JVa4=Gf4Rt4I)AE$pzkB`B!H{+GwmpVitg3 z3O6yLK^;UqpwtAaww2v(Rc-W6OB|)HI=ACxOtJYS$>ix62Wr}BFRqI2B+0aTC@(0H z)!ffgl(gSVbS)@9>?%z@p%KNDSRMoQfSH&Q5q*^E1FWUGU<=@k9>&ojT56 zSMX()9OV%GY&L~%Aq?-iJrJK_Tqw8E&2#)3++^kcM^w?;+l2x&JzQ1V;A}Z5x+FGj zMY^{*zbof*>MyRFs|FKu6-@uBQzSpZ?0E&tJYVZr`H%n6M+c~vYH6*V|Jx}h5^a=! zOa2a1OgFgRnF64hof zb!P>%XG935puIVHeSrVkcM77NGKCzF)Bl=WW>$dsGe5<*zv?*RmM77#g&!wu;2n%J zK5sa@+Tnb5$&8s%$AJ=Oo)@CBXt(3tVkkD7%b^gluSi;F{xB^DyVCHBDMpWP{BBEm zRC_e?>ZQw0iX5II_Xa!jsg!#xrD{nCw0~RLev*Gud)a(iZq~beMhh;ID@$jqhlQ_E z&&GpV=chm9Mzj^Z#l9P0E)i`p_tcsyT3(Zm|0tJOL%YN@gwPi$AN%eAUSw& zs#Ulj?gi6o8QWMPr9UWKN4!yp<(K9L%b;cpqx*RbDX`c35|Vw+k_6i*eDCAH7O-(p z*NLsQJXK)b;u7j{A>0fii8@ZmGnPo$VSST5nkXox|%B`fmix-{I z^}_YO)dsH%M>Zu6fth}fr9hE^*)tcC-(K-WDBwH8C`LceGAYf}&v~D-$R@_Dq&pvD zt=_ywl{72>VmY~e1U0l_kl8v&*Srs{jb>^Y(C@WFumsO@R}ESWS&!uD--Lt z@pR3KsxgyDdc)(!{WUj4&!77_L4qC+1fdtLrtlTn>Ac<(lRW}OAg3jd`@ByOhj;`s zrT(dHcHJ4;>m^fo_}lokIK$qu$88YK#F2p7%Ju}7q4yal%(z;IuD+^K){t7WUhBPJ zt;xYR78{_{s}m7U|Fz8adMwk~&b2;I@VwG3QozLhuC@ypg21~NwYFZ#`2OP5Wu@RJ zQ)CyOa(cD2a7#dZX+Zt!l0`4pce3TbiG(%_l=329YyRP`WTebbr6Ik^e9dl^NQeCP zgfrH+S=QIWj8G;LeN?LbXhgirl%HNuYZ6kpgAo??45Rj9&0{OJPc(!y{vO+P$V}f2 z5giG+@m3csdvh!<-`frC_z{j5km(yywGsYEUbxqNugQ^{*k6>Z&9l+j4i1Em0X z4h$=@Eb`Ho%6b|8ebNNHKfAe5#3VJ-^uyE(6`9RxRkI3Cuy%u&9wQ-llhP}1?+L}m zn3Sd?;bSc0`=f#)PRG^4f}t&#cV74Wh4FnwV5EKB*YrE+Gb?8Wkd^H2N>k5-TQIqt zMw5(25lcI@ltGF1YnWHtl_wG#_RtMaCEiRQhjH@Wm}!>GJ;@1qou(k|#ED-Cm6?p% z-hWgt(fAbA{$vkTrH_5>jp(U2!&unO=_Lu@Yw+8DK>ms6xwDfU)3^KeKBYm;3V6Qd zqR-?Si;p_BL{2gG2han9$YIH!WW+YIxXRRD{dbWvM8D9@Ytl1d0Ti9@mD(XU=vjyR zbO#jgvYIy7rRK-H`C_%0+k_E?EL}UP4aQK$;fA-ON5c;P;6%1w{m;hQ6t!f0v3A{a z4UQPvC<6axmeuh3g>tiHvnDORJuA6p>6gb#4lm~^<;C|@4F}`NQmy$D9o~lQEW9bD zP8n(hGv9eZ-sUnRVjw%1O?;2>au_XAp=jpRs68bYzc33F4SKr*!4*5Zsx+VT!aA?CpskcZxloRN$a^C zAhhzhzN$TZ{e4&~E;#tZ{zHc#-IC)U-U#Ma3yItxEhNHI+tTh|>m@}dgW;Dv^Oj_` z?NW*R4>ljQd@~?BrqD)_HRgG4&~g23X90XIalGWU0avWp^tefrT-P0=Y&(yKX5dtl zSZg2mp`W<%5v1q5nzk2cEB6**7xWBDLrNN4L-$ALR5wb6E?yLMYTi7|wJ?d?P7Dm+ zQkkjI!uo?88`0UV9qO=lL&-9GAf8P7B97yN=e+V48GDl-*B~I>CnicWGOJa`O(B(e zd%u=GWNsIYk4S@|3eG>(rdwE-szUwiya*)x!l^L2S+CYDZuhHuNNe`+_9w;9Pf_n=X~?k44yu>>%kBreri>5z@6{h&_qM#zmm%&HVCaqC@}N1WD4N1* z=ulRqU0>-Uv(f3=GQ2aXTHItpl|d_m?mVSCoawK%kE{=_nbvEI{Uni27+FnmPT;j7 zJvCFTxaHRz98-Kw$C!%bGKHIzhH+VFn~#(2G2X}XIv@eNP(pdvmpV(By^%qcZ%}8j z?GF3$(Y@^SP!lUG8Ec3*15y%|G^n-^i_qIADR|Dd8E?aMCi`#N&onSV=-D2*_C zrQgeDF)RG>Xfrv@_zmPqn=m1F$&Xm3JHjFE@x5P z?VoeQf)5|=9-VyDrx1fIc_H8K{V=rd9mm>R=>oKq^UkI{o`u{@AME4BcBEx(DwOV1 zr9z5~RnUiSfBv*CL7Mn|s#{9@4>$9V=w6uA=wMk==fXs-7Z6U+z_v80yNZaU3(K(u z4R&>cGBeDpDz3uvF6>pj=B0+JG7-Q<{jqotJ1L$V%^w3Rh4C>X^iTm7OS09fyhgoZ zdvv&rjm<@(d0#r?Zn?|XCTh=S$z+1nY|9Cw-!j4zVF=BM_d zX!}HJGBTu0^D>qj6e_*if)+{iV8Lq9Tv$~(T%?D9A(bQ7Q-RX=kJ+h{`wP}g zy(hwb2~9EJT%>woN z%lqo13g-Wi`?GO?D!y=HWbvCLe|mGI3F8_(V6kFo{MMH4IkN8;B^RH79cu>bVL`(4 z7kLLea=)Q;pw9Cj-+LJJY6yE^F7SE%WM*Qzae69^FYUDJ?6ty$yB$v!tFc439{eQU zz`}+qq^eO{%5ud!i|WVo>esu?FhS0Scphf!CPo<6++*v@k^Z_oa%JFW>aFzMpBTG1 z7O4%c;@;@biZ7@=!dj=o?^Hg#LiG0?bp4W{n2sgljmeLlAX36R zP86;9p>_@ei`{{IDz_pI0?`3of!*xpfZmU?%zTR$tTjX5@w(Jm_^TV6?y{qW zDjcp8jP~sg53>D$#NU6i8cIR<8`}3yr$@s5tlQ@pxNk$?^X@)w)GMa(`WI1;u&8KW zS?hq|s*{_98OMt3p(n;bs*Ka!f9?C^jg`caZg_?3#h$+}=ia9G@or44JL`-ML}EtB zo5Z`ih3fGj;xFi#Ch~5ZnN7*1)|^Wgny z;D6AQ?T}r3#^d&0e_pnu_x51MANzQLG?md1_kL56*Yn0;?@PEJiD&iBIamQ&eZXOJ zyL&MRvBfM~0?U~%W@N~hJMQzd7UMbD5MgvNJBs#dZPLB79c-US}JH-?$ z-{$aYQJmebqv7+rj;apLHKnfdbCo-d*x_?K3)RxY9bDm9eEjhVspQHle~|+~+wU#3 zZ9t0^4E%)LFQ3q-G4%9qX!hFHMK;XL(EYp4M89k90~*Ec>7mIscV^(l?l_86RMQnF zn3-pz2pI(*KbYt8dC10@un;DURBF_xm9Jj;A8FESq`_Sp>;31A?#H7$sV7(0$rtlE z>u3I0!H-JSqenbWI1=)@%+)xlZ6hKJS(Uiay(SP`vmC9TW=bAyQlYo4=lTbXQS2Va z?CAZ;DkBmxz;oN1>Va&x-_1vcyTWItNNFUwi=ppjgi|nXESxFIsGby$p=%i6^*tJN zV%#OKSEB^)gT5h#{X53zD*N2g&JEE=KApF{+t^|3yOUZ`iKSNa8w#4KuSEfQQ+FJI zBe?^knii{_ImZW+IzmUQs0*5@4QrFa>49;Jl-~87Fx2k6Tc_mfW`CTVRwxf^nfXsL zGXq#mY8}>EYRH@H6UPZpY`c1yR{MJDt|e^--R3Ney_L0Pkpj~CkE1;B@9wLfEnKDw z`t49SjwQvyWl5znb88dJf8G-SAuVw+Z@Dt(TzNrixwNBt_Bf+mcE43qhE5hJD%Tp{ znT`FTA5`LBC8_~wG0L&;pLD2sCecuEMG{7bFj{m^&N}@bFO~_&Xbx4D+qDNd|d1 z-PhmLSj}ZdcXkN&l)bKMtgg&Ql@ z2U4YKAtkc1Y~4m%%(l$AK;4| z8(7n}$`)PL-$sU}cMY)zrYT9^H$i!--!3;>4Pl@2IIO5@E7&lY7jWQ+JYxlvJgQaq; zeMrcc=&ol}RQ+6mMUqJ|2MH~<@GZSjnDCRnLfN7#DGJlE&%^zMM{`FwA>R&zBgYES zQiXq-WY4G2FwkYau4Ph*tcCB3=Gx_W!7`Zu-Rh(kaN>aKDKhXFPL6?@^N!#eu1*GA zMTFC~oEdeSLlLA`upS*Fz2gqs4qoI%(ktP@ztmypzg=$5SwezL=V3tV?OsZyMz=#~ zs|)o0hCBca3HRBr?wQ52Xfk&@+)zQ)>}5>j|2AME|6QbY<=A}Cjw`{%Jnm=fF8i4`_k2Ee+Sgu*|Jd7TyhD+yNtrS^W@8j z{sBa4gE})MZIyLa^lf=exMPjZ*ZhLb1QE5!)0nh1__rJ79nPedm2dgZ*z;L$#0Wiv>UY*Vzmit<1Lo8RKL2jc?GyS&U0`okJhTc2 z@K<~lBbKLuN*h99q@<#Ge|s4P_s{~D4=)V8ANIZge*6$0o|5&?tk~rLqZq%`kpM$9 z7i~?-enW<*H=lq^wquccg5-b9@^&JEjdhc~s2r(PYQM40|K7*|P*3aRQ^5iD%tilPgaI7^C|o6MD)~UC-dW%CQRs>2%s~e zV$u1DqIG7zK+m7Al?vhZE7+*Wj6!lQ%B9iKP6swF?dvcHJzbp-||=!E&*@IuHV zB1oX7p}33 zST~>(PU!0~n{{oNy+=eIemc9jbPRLhfau&KnIsy=c7#Rxyy>m z#xb`OsUh(`(p5PFZnF-;ll#MDN8rzeNN)5T^>LXO^Yc`-p~Y9;+8fDJf$;Q@yQO+Z z`OAY_LukX0DddhIhHA%8;}pyA;3xEon~-Mf$z|f&>1?G~eC+VJ5X#sv9bUd{mc`ux zq0snx%`_AU<~QW-PKX1#%rT`*V$9f|4!@vNuM$|I-708aJhDoE=YGtrr7?~cJbTlK zvb>Q>ZfC$rDf@Q$Ti5ZE6w^kFTE5%bPk3N0nc6R-mywZylG7wyuju}Z!x}Pu36j=# zv6uE;fdt{ngoS;ko z>leFejjym1o%r#y2BcFBLIVtz`kTcuF~k z=FE00*x!sF>@&FU#>hvf4Ivf@FEz;4ML;v1%(yX;Q8Bk+3WYD2vOK_(fgx;mVJAp`#4Ty4JJbgaBHpBc@V8d?dWaWOk&+>^tcz zMb7-Hk}6s(j|8wqzNhcbTxD=VDrn(XH3T(UdReAi;Pj&p2gRh7_C`#ju?%5u|79v7 znLgfn|Gv9}=ZRn-cLYe|dw!Ma2!h6otW}5IdO_vKw9F5EnVjCo%+r>$!9C%A5dt;` zu0u1xHl7>-C9<#B2*Q)*%CSY@AFHs)K>oGJYE z>)=e#-k{2a!Mn_3NdgV@-jGj)w>7MKDA~jKm4Y1y zw^`Q3H&8A=Sq{iP;UW+;TF0A9KVNz&*n0(ids{&h9AlNRtUtw8Dh{Z$xDsN=wRf`x?;^UM%<~vR<&W2vX+sOkJTKj>o6k>d z$E^Aa@JJ0R1}-j4uyYqbOk464mfU^`@1P5AXrsNWx1-z(^`XKh1@w}0;m(iR6eW^N z#r6|`gb-iJ8bGb4z=To+3Rj&PZ3(hsZ^tzZ++%=$1Gs?})J~wi-{svR#`7W$1w8Y(7E)n4PO(>1KR`GPRmyhuLp_Ac13Kq{D zVn(LBA(X^$-|Hp=MOg{m)+)?*QFA80h3Xa8R{jb+jAE2<=j&XY8{cj`hJZ~MUxx=Y zJN3oV?=>cFy75szawBA}T8H$g!{FN04+yKIh12z~|De<;k7r2fXnND}gqx1UQObAU zDfn&WS~bRmyRio{){^86r>IQ}ni%zCUxbIqw>POb*b^}5)Cc3wRbqFoPC=d?xQ|`- zl%)On>XL{#+T-In&hdCRppP%yVl%OHMHSLHoA^5YjUNh|w@UAnEdV=^uA7z@p{{Yd zuewzS_^KWWn~x|54e|M@W1mdQ z74%rrT^Ye>aMu}MNxDMmYn-uJPaJ6}%6J)7X=X?eDMRuHd>rkJ)rxOH$17kUxvSpwd z(cRQD*cKo%Jo!H1x!CX<9i`~XKm^80N!T|CaOwEQ+6jGTj3>_BnA1*KA|g!e-KmT- z1IyG|#fx40AJ!M43pXYHAb!NiLkS}UBh=4yq&Z>7ucUt}*u^uGrX9pFa7Vq{4=$P+ z%;7oLDh`vSm16$i`N{d*x%T_=rMJ(72_w~I+&E@AJl0@dxY`+?BYJy(^{3Ms$PSS; zWpsFh*orF(VD;%_m#%mP#;_c3)jFfS?0d9kbE0l(&ioOcSShZhC$_!NbeY|k)5%$@ zp-r$p)hsFasl1>Ckg-be85V3mHfCWbbIHCmz(#3>0)E0Dt0X6u@H zDAdB}VrDL)(^#l<$n)GLR6Bq*zT09MWySL;bLyrdmeZk6Zs>Cuw^&{wlJB!W{=j39 z5*1RGqacFF&SmPKq5`uR+^ol>O+Q1^$Vu@ep|WDHy6O__g^raOWH;a`Dty6>k)T)W zRi6UYHL(gET8s_%y_1p5X5h&fD?I>j)j9T~q6A0(XHA6%_`ER_>!K-R#@p)c9fBx=wldMRZT7PM@^C%fmYNf7d=;?zE!e2JpUulKGe{kpdXra zL3lHD+q-nZqTSy`Gv2$9*eRjalIR;rDldlGqe7tS%3P^Z!^<|hl!J&gnUx>@G_Xie z0REX9AgdJ1M#~g@^Yyw8_Y>f{4mmNF{&bV#KYuS)ygP(9GhrOce7t=?bz1&mwzY^mZh{nwySN2*mH6w!}#V+q^LSo_eRj z=jK!+Z+?D+-(Jg;kw-D3q;~MO~W?2r#qA8H`mCQ39-RBK`a8uMv^DJYx$&%ZA zltTa0C6?C6#ir`xN=PC-vBbR}2)U7Nv}}?vFNq?vN9M%4+ju0>vV4JqTm^<0hR)il$>Rxtj}tp{eEt%>i5C)cvj+(8^8?~ zQA@dUy3RsuBP3c8UVvT7Qq6t;RZf<6N49#*Ohh~OYa{sNo?|gI#62=pB5menb-Nn6 zn8v3#`Y3o$o=N7ymJ^*YMD+MX!$(Ap>)lp+!xfrf+QdPocj=5~!n4*&dA}SV?3v|? zuZAbhl@Zp-N$vD2FCZZyjRh}gpIw6jE#_dHNW-fU`&A3K$ThMbSozr zr6~LK5i|=AD}BEhM^UV{u0Y$8S)KpEP)UFZwpW`}u@b5QRq|$xjOXOZ19({v}zA~Cr2Y5sQE;> zrUH1VW4fRD&slExiGocIc6LUyDR}=8?nK4f4)W?m*@!p(6U%8!{@??5lYDo^^^Z^m z&_=EjK(eRFgB%~_UtjWn@>${~>aCMqhZC7hSRKH`ZFi0DOu!8`G%3|2@V)zSlLBr0 zGYK-qY!{jDjaY4Ze z0l)-!&6sdxREfj@K8=S)ccOKZb^&t*u6amUatqQ+dy~$#aOM_eN-A>n*Yeuat#mlJ zH!xGnG)IbwbGlJaHRD4khr5%9Gnela&bS?PI3|KS?-<$64! z*mnB=$IWzMJx;>|l}Fc}apMQTdG@!Bf!y+`nr(Ep3`NON$2mE@>gzpBm60f0uJZ>n z<||nj^pW&3@9wzVFmp#V0==5~S%Z6$8-e{KO)xyA$rr#MJ(5DLQmkJHa?(4> zAy*DuC(}4EGpi7Vnyy;)=KcJxa?m})mZRMo_R$)zm23?aijdJ|hC}}J!E1;$l%1?P z2SVk3eZ%KS$Schn~IiOsAX95a(h+5qvfq$m?-|AfLuRB`dG>g8*Qn#`G(a z{z>~SefX0DK(+ZF2QaV6uw7cp;CgrE&rEoARl(r3{P@MK+7;^wuw%}WURQoPNGLVc zC_|u$Kbh7K@^Gu$Vu0vG8}9TDb2hExv6iU34fP1=*!R%yZ$wvbSRr=*QTT1S)!eTS zzE(f$1R5r7y?7xp<(&1gRGncjf#nSpyg3b5uW(qav1>OY@W+A)a%XqJy+SWfbY#xq zvv6PAt94`TCg&c~dnZz~fLe)jdwpw85f64@uzQY^gGJ0^6CF8%fP<8F`DX#RX`*7T zzsvf8mZGbtsvha|ce34Q?QMAx82sh9pc4B4NT^g7wH`?@>?r+lidEKDsj?eMX7RaL zw^a-a8393QGPL1Ogb*m3%g~n^$z!1zDAO;Jb0s~iEqdLw`S_-ig!L((vb&d~)zBnL z6Wb4V4jtG%qu53M)N!z;aFfiaxmh#-Aa=Ao#wAgpFh2sHm+h)jn1G} zH5O3RceS>jjUp7%=sAh>=U@NbvBn1mKV2|IeH59H>l+GmRk22y2~A%f+2x0487vYJ zUziljh7h_lstX5)QsNb+E$~OBn30zl7He_$W3pTNYzf3ckfC-*U{5%)*q2KYzUCcU z7x!^_3D|BMmw*qJ*owxbSmA)Vs0P0ssBezGD4x6kvS}4w1Qup$i6Ey|!HRB?3eXzK z=}vDNb#=`=_{0*KT8|fbNBQK7B}22@=Ch29d@kEY`HgYKr6TuZcq6M(zO=L(9R&0o)uBL4H>UP z|00gVwVqbB%nqz*TeA*i$(R z*Q1#+Ul2DU8GkVFTXZeEtPFQsqUX!B7G*>c__VdP|B6Y>0i4hUK7Zbbh+fq_RbfIs zNK*fp1?zFYSz_1%3s)eC1SttOiAjp%9V&@X$im?G1_RcPmyf`Ln15 z>PnPWSl~CbcwTxLPkkuXRzGPK{ak5p1q*6XP^Q}(!kzLg_yCdumd-3V?@CdPAr?6& z32~+rKTj=uvU%)0$ zukD@x{l%~$fK&u?(Z;F$Z(-^G;A;g_sI~yZ$Pv|1g^Kb>+Oucj&r3GCYDIzIthPPG zX^Rdiy$OFC#d_HzuzKO1l-@9WkR{&Q;B+Y()w$ZVgmHszIfwBYL+Q7k21KXfp5>_( zoE18WW~6djApy^aU!HtAsl`Uf)@TElV&2KP?16wQjFJiCs2dL?SUA8Vxnw>ExXk}5ey%?wepx5*w)FMWZ*`(2{xi~B+==Z&Z4foNZ-_mm4>mFOn zJL<}VFd0aC8;c=#7CI%fRs-qs4{2OPY(*-a@%J9vtU)~zPgT7{&2+bNt|`ObgGqUH zv6>u@{Rx~i0q<@9d5Oy1U5ESCx?j?CWx~HA4rA|t1ONn3Md})|M^){xoJLZZUX<## z7QFV@+OqR3Q>cFamQoIe+T-{{1qOyU_`+yUW%Masr5j(iEV9|I6wzX!=ZQ#AJ8M2e zIie#0Ab|?U4k0D4P^2t{#tHeY;~@m4B$x+{`q%UV_h_;nkFNkwG1fG4Smz+nmKjpr z3qZq=S!0nEY~o%$u?oaPBt2T?dkL88bTY_zv_G)u-x&MJ@ zoB*<<*@8-A1k?o#UYVfA-PK|S+{=A8@3K!i*ynMnJ~>EXrOqAEd6VvY?Re9C`*0lA z^0ZBU@=mTMbh&>~?s*|-nKDo0-^9{9d0xSyrl3TQ^ZC;kwm(>Q!p8itkln z@&G{&6{GGZ_^zJWpzA9?r^7L3_sE>7Zl`&jWD6ajJJ4!Q)B5%2G&!lSJ_YicsJfRg z%$^dhOoe(5Ag0gHfGDVexlDH=r51Pb)h?QLgELm^u(nM=$5ue?Xk$4~CwW$wcD1bsU>C{N)W3z@wlA==DneMh zZa0o*&mea{L-2`Nn)Ul**{2BSs{4Ih zYt0)T9xgNg2Dg1hOr68aMjx7eFTp1cv(X9>%zKEx9jSAjFF~$%ZW<_^bCS7xtCCqA zIZ08^Vs9b~p47EIa&#Ee58|PKy`^bVYQ`>%9SR4l9saVjePjPw$`5U`RKxL6Wkeis z9&4RzU=-Che_W!6OBB14)0=`vC~&y$)~Rcx2ynS@L=kXBoeS5Oe2S+^(Mv{=dmT>= zX7z^w_+@BU-JWIVNbc{A@0U7^uIV%9gqa;gEt0sCNIm4X@QzmnLmAXePSdRoCO~U3 zUJ$m=+-dyxA&*eNl9w>PnndbPAdXqZ@DvhGJ}-(tn5n=No;n>=yM#x#;6)$cAgnaC z1Z0&QI?A5*wRpPmtl-{mMS#4;V>*TQ`s}ylISD9Cf$6+Yd`o(t_~DCN#o{?N)oq9qomIncT4K!j%}u;(1a3gx)Z7-V*tmYFiy~mDz|R9>f{kat^8r#-XDI9B zvEd6-q8YFBGBZo&SKR)dTmo{KaYt)6Z-xKhejmj8)26j*8bTlqo1}) zF;BQ(S3whX&TH=osVuG!JYSzHfP-Rc)|K9uy-RrKBn=br_0#zceQy-C--S%LjVZy? zVs0=v)xQ!z5dFqVNEIhgR1-JA!qEv~dueYZ7ux#G+s9g(D|RSzEH+Wbc_%c<{!Twt znt!b1Tc$a_)@ACX7o_{!V5j*9oGI+X8v$V;dh+hRv1{kuC}4$`m^ER5zKsUL-=Aq) zPXeBWS2OET$$vJIJIrBEDQ&OTx;+0WIIP5>ZDNF$PxpRNJ1QfEyF#3t`28#^7JxYb zdHD%2NgD#*;{Uzc>|kf7e04J{rBZkukjT7lbkK%UnD{hV3(7hSRBQmM2AFe}Ha`5sxMhsB&aLs2cQW#!?h_07x;bt+D}QUZcyioK}B4CBp&B zLgF`S%9KED4==(7s^$(az03j0t303tHqL@mrjM4ldOH-LIP}dz?B;9-)%@8?P&))S zb2-2M3UtP6Rl=aeN%^+mQPfC* z?)|t49R4`-H{N`UyoKP-Y`!Z`T|57$`!&o&S%H4*7ixSG;a{UVrAA$+MF@ z@WBrY30RYA{^fO-g}5s_iWmz@d95uE?b$d?O=bm&lL@x0w1a1li?WX+QE^}VfU8#%P%Oz>YRhKFHFN6MHyUQMxxIN5I=iQ@q z%6jUT(tTX|Qm1^oy!_jS6~BR}G;BMS9yZ%$@#|&6lj|a)iuN?wY4k zeJ5$$zt^&0&gmOK+po=QUVHh8g!5w!=jd&^|DHed`k%FR<7UtE@yc(M68`54K9iJO zq|j|@t0cJe&Ytrfry{+@PwzCHcsW(cdhM|&*=6u$H5O{1y&$r}s_CizOsQQ@T(tDB zPv5mB$V&d)nxFrcmZ-r;9ws2b319ruJ4d*D{zH?@T8!7*=aEx#c*>>QXl zdx6chmTyNa;*gtb?P?2ZFI=Bf{K8Ug$H}K&vmdmbVT8v5&^F+zTiq9COefRe!!;nr z0Wsh*!`n?tw-H+&L2Hww1s62sDNo30gM}G5G3Ph}4{+1f*u;x$uh0fT;JPVF4OVc} zdhy##=kV2H^{;=DrM9t}Y;!~jjE$}!CE@4iAKBM?+GO&Kwq$OV+sI8@1;%Ir*upW( z+>2tjf$sV@X+^KYCgA!k*p^P9mxY$F+A-K>zGNrt1Xf79dqM!G zh3b{YXzA@g79)l|Kmn(qC|sbyUFB3KAOoJchQ}udFf{(iz_}oXgN@Pyf#o}NW*Z$V z(c5*H`6>lE5RbismYc+Ru;4RKRxkg1k{- z%xTfmq}P8g;L^%D`)A6hoSTJ+BAM0(=N&sNP8~LQ<|r=S%<>*y+NykbCRiZB{cHC3 z7Z%Bg;80+62VS#rS8%@8a~FgQR3;<$Al%?$@w%q!3}_cq*9nRV+lGqAh*@Z4T@4lcfh{<{|2rk+DSpHLxAc!KT1V^cj? zeXL#b@9gZa{>KO$FY{5gjk9;+>qD~eKp;oP(LXPPZ9=nl$~;I~xWM|9iX}g)XE<0~ zEbCWI`3yXU`ta4OqQFBrna(@JEMvx7Ck-n@c-m%Z*q5@d1}A_1fH&bF6*2UngCmYs15)C literal 0 HcmV?d00001 diff --git a/website/public/images/blog/manage-plugins-with-renovate/renovate-pr-example.png b/website/public/images/blog/manage-plugins-with-renovate/renovate-pr-example.png new file mode 100644 index 0000000000000000000000000000000000000000..94096e2b1f75c3beb94570e94056da6095c72685 GIT binary patch literal 95470 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 F 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 literal 0 HcmV?d00001 diff --git a/website/public/images/blog/manage-plugins-with-renovate/renovate-pr-page.png b/website/public/images/blog/manage-plugins-with-renovate/renovate-pr-page.png new file mode 100644 index 0000000000000000000000000000000000000000..53a887c1acf7c93d05ef4a659d7859fa3271a002 GIT binary patch literal 18178 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

U)=ag!J$(uP8s&9kBZ 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 Date: Mon, 9 Jan 2023 12:09:55 +0200 Subject: [PATCH 117/221] fix(broken-links): Ignore flaky host (#6385) #### Summary This host is linked from https://www.cloudquery.io/blog/inventory-microsoft-azure-with-cloudquery. It often returns 502 and makes our CI flaky. If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 ++-- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 4 ++-- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 ++-- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 4 ++-- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 ++-- plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 4 ++-- plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/go.sum | 4 ++-- plugins/destination/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 4 ++-- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 ++-- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 4 ++-- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 4 ++-- plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 4 ++-- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- plugins/source/azure/go.mod | 2 +- plugins/source/azure/go.sum | 4 ++-- plugins/source/azuredevops/go.mod | 2 +- plugins/source/azuredevops/go.sum | 4 ++-- plugins/source/cloudflare/go.mod | 2 +- plugins/source/cloudflare/go.sum | 4 ++-- plugins/source/crowdstrike/go.mod | 2 +- plugins/source/crowdstrike/go.sum | 4 ++-- plugins/source/datadog/go.mod | 2 +- plugins/source/datadog/go.sum | 4 ++-- plugins/source/digitalocean/go.mod | 2 +- plugins/source/digitalocean/go.sum | 4 ++-- plugins/source/fastly/go.mod | 2 +- plugins/source/fastly/go.sum | 4 ++-- plugins/source/gandi/go.mod | 2 +- plugins/source/gandi/go.sum | 4 ++-- plugins/source/gcp/go.mod | 2 +- plugins/source/gcp/go.sum | 4 ++-- plugins/source/github/go.mod | 2 +- plugins/source/github/go.sum | 4 ++-- plugins/source/gitlab/go.mod | 2 +- plugins/source/gitlab/go.sum | 4 ++-- plugins/source/heroku/go.mod | 2 +- plugins/source/heroku/go.sum | 4 ++-- plugins/source/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 ++-- plugins/source/okta/go.mod | 2 +- plugins/source/okta/go.sum | 4 ++-- plugins/source/pagerduty/go.mod | 2 +- plugins/source/pagerduty/go.sum | 4 ++-- plugins/source/salesforce/go.mod | 2 +- plugins/source/salesforce/go.sum | 4 ++-- plugins/source/shopify/go.mod | 2 +- plugins/source/shopify/go.sum | 4 ++-- plugins/source/slack/go.mod | 2 +- plugins/source/slack/go.sum | 4 ++-- plugins/source/snyk/go.mod | 2 +- plugins/source/snyk/go.sum | 4 ++-- plugins/source/tailscale/go.mod | 2 +- plugins/source/tailscale/go.sum | 4 ++-- plugins/source/terraform/go.mod | 2 +- plugins/source/terraform/go.sum | 4 ++-- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 ++-- plugins/source/vercel/go.mod | 2 +- plugins/source/vercel/go.sum | 4 ++-- 74 files changed, 111 insertions(+), 111 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 11a0c164ce4e82..0d9c2dbc2018a8 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/getsentry/sentry-go v0.16.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/cli/go.sum b/cli/go.sum index c5712efdb7117d..0b4f97721321cd 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,8 +1,8 @@ github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE= github.com/avast/retry-go/v4 v4.3.1/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 4568991ab1bf43..f87131fd3535b7 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index b6f19ff6312ac8..2799b96492e484 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -52,8 +52,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index 2525c9c1db7941..cf323ff440e0db 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 golang.org/x/sync v0.1.0 google.golang.org/api v0.103.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index ab72c3ab5f2b7b..3e1e514661db37 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 33359e36bcc060..2ffaa2ba9126cc 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 61b5bd56e3851b..8ce24f5c6922cc 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 8fe901e39b1954..db9beeae56bf64 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index b35cee47ad07fa..7adba5dcfba4a6 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index b505dd2c7ad1e7..8fd624377f6122 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 9d5ccc63cd6875..c03c0aaaf5d6c8 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -45,8 +45,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 2a6104ce1269e9..8dd6787232de40 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 go.mongodb.org/mongo-driver v1.11.1 ) diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index c42795c489e238..e6f79e524111db 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 515bf98f94ec9f..076e9c58e32a61 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/neo4j/neo4j-go-driver/v5 v5.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 0b05f66ebcad65..84c38e764263e5 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 1754efaa5eab07..e42258cdc5e984 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v5 v5.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index fa7063219feb33..1a4982f63e41bc 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 8399257a95bf51..76aa583b5f8b38 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/cloudquery/filetypes v1.0.2 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index d182eaf55bdc7c..1830ec916e6a8c 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -80,8 +80,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index b9ac368aca0754..0f5b532bf19ff4 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 github.com/snowflakedb/gosnowflake v1.6.16 ) diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index ab0cb73c0db0dc..5da42129d375d5 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -103,8 +103,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 0dd61a94d73587..10a66bc4ccd43f 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index f850de0dcfe5ba..ccbae980ec3545 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index 82b87695979b21..e8110e49c9ec20 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index 0630ad7bc8f9a2..c3cec0377735fc 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 20d27f838c88b1..2b8f6c28c70835 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/xray v1.15.3 github.com/aws/smithy-go v1.13.5 github.com/basgys/goxml2json v1.1.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 2754ecaba7e1df..c3438047b3f0a6 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -270,8 +270,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azure/go.mod b/plugins/source/azure/go.mod index ff060ce5136dd2..7bb6afae786ca0 100644 --- a/plugins/source/azure/go.mod +++ b/plugins/source/azure/go.mod @@ -96,7 +96,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsesu/armwindowsesu v0.5.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsiot/armwindowsiot v1.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/workloads/armworkloads v0.2.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gorilla/mux v1.8.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/azure/go.sum b/plugins/source/azure/go.sum index 41237e970a4f4b..9d529446fa653b 100644 --- a/plugins/source/azure/go.sum +++ b/plugins/source/azure/go.sum @@ -231,8 +231,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azuredevops/go.mod b/plugins/source/azuredevops/go.mod index da6f49ea26ce50..3e9cb363d6cf10 100644 --- a/plugins/source/azuredevops/go.mod +++ b/plugins/source/azuredevops/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/azuredevops go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/iancoleman/strcase v0.2.0 github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1 diff --git a/plugins/source/azuredevops/go.sum b/plugins/source/azuredevops/go.sum index 08eab2553a2601..769eed794f49c9 100644 --- a/plugins/source/azuredevops/go.sum +++ b/plugins/source/azuredevops/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index f8fb7162f8e569..967eb90c58c627 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudflare/cloudflare-go v0.57.1 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 github.com/thoas/go-funk v0.9.3 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 81cbcd8b4be178..b4f2a47af5acee 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.57.1 h1:c9OhL/WusagBirP+CIJeCqS7OjT9kiWjtJv4lwxp3ZM= github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVHwHqgXJofb1ya210GQ= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/crowdstrike/go.mod b/plugins/source/crowdstrike/go.mod index 8cde84881bbdcf..f94d2b4fdd61cc 100644 --- a/plugins/source/crowdstrike/go.mod +++ b/plugins/source/crowdstrike/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/crowdstrike go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/crowdstrike/gofalcon v0.2.32 github.com/go-openapi/runtime v0.25.0 github.com/golang/mock v1.6.0 diff --git a/plugins/source/crowdstrike/go.sum b/plugins/source/crowdstrike/go.sum index 8206d24318eb75..b33f42dd48eac7 100644 --- a/plugins/source/crowdstrike/go.sum +++ b/plugins/source/crowdstrike/go.sum @@ -74,8 +74,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index c787f0fbdc0259..35505612d76375 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-api-client-go/v2 v2.6.1 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index f1bb0136f9571e..7d755033e0ca55 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index cdd23175761877..b6e571938eb668 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/smithy-go v1.13.5 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/digitalocean/godo v1.93.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index adc814d685670b..0bee10879f7103 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -77,8 +77,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/fastly/go.mod b/plugins/source/fastly/go.mod index 2388bd70f233fd..e9df8d61bb49b4 100644 --- a/plugins/source/fastly/go.mod +++ b/plugins/source/fastly/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/fastly go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/fastly/go-fastly/v7 v7.0.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/fastly/go.sum b/plugins/source/fastly/go.sum index 512dde31cb5720..faa5af7bac63ea 100644 --- a/plugins/source/fastly/go.sum +++ b/plugins/source/fastly/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gandi/go.mod b/plugins/source/gandi/go.mod index 9ba128cee4ccaa..84bef793f4b6b7 100644 --- a/plugins/source/gandi/go.mod +++ b/plugins/source/gandi/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gandi go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gertd/go-pluralize v0.2.1 github.com/go-gandi/go-gandi v0.5.1-0.20221118201059-f69b292fa399 github.com/golang/mock v1.6.0 diff --git a/plugins/source/gandi/go.sum b/plugins/source/gandi/go.sum index 808af58b5ce430..7a5844bf50f768 100644 --- a/plugins/source/gandi/go.sum +++ b/plugins/source/gandi/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gcp/go.mod b/plugins/source/gcp/go.mod index 40bd738d1e0878..4ccdac769040d9 100644 --- a/plugins/source/gcp/go.mod +++ b/plugins/source/gcp/go.mod @@ -34,7 +34,7 @@ require ( cloud.google.com/go/secretmanager v1.9.0 cloud.google.com/go/serviceusage v1.4.0 cloud.google.com/go/storage v1.28.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/googleapis/gax-go/v2 v2.7.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 diff --git a/plugins/source/gcp/go.sum b/plugins/source/gcp/go.sum index 593f35a49ec827..494afa73c3825c 100644 --- a/plugins/source/gcp/go.sum +++ b/plugins/source/gcp/go.sum @@ -110,8 +110,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index e2a2c764cd3d6f..187dc13f6738a6 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/github go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/google/go-github/v48 v48.2.0 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 4270f422cb6189..150f28efbf8ca1 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index 287f71ef10451f..094222a88ed562 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gitlab go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 82c1adf872f98a..74617b4dec6966 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/heroku/go.mod b/plugins/source/heroku/go.mod index 684e4806f8d8ff..1808c744cd5ace 100644 --- a/plugins/source/heroku/go.mod +++ b/plugins/source/heroku/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/heroku go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/go-cmp v0.5.9 github.com/googleapis/gax-go/v2 v2.7.0 github.com/heroku/heroku-go/v5 v5.5.0 diff --git a/plugins/source/heroku/go.sum b/plugins/source/heroku/go.sum index e0c8bbe55e6dca..d092567f612c57 100644 --- a/plugins/source/heroku/go.sum +++ b/plugins/source/heroku/go.sum @@ -49,8 +49,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 585d55a5ecfe86..cabaaddbddfd87 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/k8s go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/google/gnostic v0.6.9 github.com/iancoleman/strcase v0.2.0 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 0a02262058e89d..628db2cab03c6a 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 0356298626f769..3d4f55509a07b3 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/okta go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.1 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 497069d48c1d67..3ab6e40f12373c 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index 86955551fcda17..d5a7cd7833fd24 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/PagerDuty/go-pagerduty v1.6.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 638939e8f1d400..a5a983530c9932 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/salesforce/go.mod b/plugins/source/salesforce/go.mod index cfcce71148dd43..fc15754497ad50 100644 --- a/plugins/source/salesforce/go.mod +++ b/plugins/source/salesforce/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/salesforce go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/salesforce/go.sum b/plugins/source/salesforce/go.sum index c1bb7c8e52d122..f6f180e34bf706 100644 --- a/plugins/source/salesforce/go.sum +++ b/plugins/source/salesforce/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/shopify/go.mod b/plugins/source/shopify/go.mod index 9baa34835bcfa9..cc4e5fc5a28346 100644 --- a/plugins/source/shopify/go.mod +++ b/plugins/source/shopify/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/shopify go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/shopify/go.sum b/plugins/source/shopify/go.sum index a0dbc1cde91e41..0c85cb04404199 100644 --- a/plugins/source/shopify/go.sum +++ b/plugins/source/shopify/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/slack/go.mod b/plugins/source/slack/go.mod index 19f48cb336896e..d2e11708d82607 100644 --- a/plugins/source/slack/go.mod +++ b/plugins/source/slack/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/slack go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/slack/go.sum b/plugins/source/slack/go.sum index a2c4b7f690f30c..603130e66051b6 100644 --- a/plugins/source/slack/go.sum +++ b/plugins/source/slack/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/snyk/go.mod b/plugins/source/snyk/go.mod index 2581f354c73415..781d07fc4a50eb 100644 --- a/plugins/source/snyk/go.mod +++ b/plugins/source/snyk/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/snyk go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/julienschmidt/httprouter v1.3.0 github.com/pavel-snyk/snyk-sdk-go v0.4.1 diff --git a/plugins/source/snyk/go.sum b/plugins/source/snyk/go.sum index c839f59ed62d02..2402e3a4c1d5e4 100644 --- a/plugins/source/snyk/go.sum +++ b/plugins/source/snyk/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cloudquery/snyk-sdk-go v0.1.0 h1:lJ/3EhLwUAdcR/sukSA+EzAnRE1jRRxm8ewLESCNW5Q= github.com/cloudquery/snyk-sdk-go v0.1.0/go.mod h1:LRL1TRuuM925gnyGp54WtS9p8S4yJMd0oS4JpLg+n7Y= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/source/tailscale/go.mod b/plugins/source/tailscale/go.mod index e5c352e4dd7136..c18596088e075f 100644 --- a/plugins/source/tailscale/go.mod +++ b/plugins/source/tailscale/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/tailscale go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/iancoleman/strcase v0.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/tailscale/go.sum b/plugins/source/tailscale/go.sum index ff10932ffdd2d1..89a6981fb7c76c 100644 --- a/plugins/source/tailscale/go.sum +++ b/plugins/source/tailscale/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 3f2bfec474b5a6..6d958e5321a717 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index 1b264c32bb7043..41c64c0c09d4c9 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -78,8 +78,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 562b7f33a4ac83..4f6658432cb47b 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 0630ad7bc8f9a2..c3cec0377735fc 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/vercel/go.mod b/plugins/source/vercel/go.mod index 16067da813c4ad..5a11ab44cfe4ac 100644 --- a/plugins/source/vercel/go.mod +++ b/plugins/source/vercel/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/vercel go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.22.0 + github.com/cloudquery/plugin-sdk v1.23.0 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/vercel/go.sum b/plugins/source/vercel/go.sum index 5d8e236768d35e..649bc420ef5ddb 100644 --- a/plugins/source/vercel/go.sum +++ b/plugins/source/vercel/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.22.0 h1:umevXZgRIr2IoEzRfZnbDw5XDaPcdz4q2gkuPIW3+08= -github.com/cloudquery/plugin-sdk v1.22.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= +github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From 9578ba2030c8398504db2f849edbfe62774e9ea1 Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Mon, 9 Jan 2023 05:40:30 -0500 Subject: [PATCH 123/221] feat(azuredevops): Migrate codegen to transformations (#6472) --- plugins/source/azuredevops/Makefile | 7 +- .../source/azuredevops/client/transformers.go | 34 +++++ plugins/source/azuredevops/codegen/main.go | 18 --- .../azuredevops/codegen/recipes/base.go | 120 ------------------ .../azuredevops/codegen/recipes/core.go | 20 --- .../codegen/recipes/templates/resource.go.tpl | 11 -- .../codegen/recipes/templates/tables.go.tpl | 18 --- .../resources/services/core/projects.go | 62 +-------- 8 files changed, 41 insertions(+), 249 deletions(-) create mode 100644 plugins/source/azuredevops/client/transformers.go delete mode 100644 plugins/source/azuredevops/codegen/main.go delete mode 100644 plugins/source/azuredevops/codegen/recipes/base.go delete mode 100644 plugins/source/azuredevops/codegen/recipes/core.go delete mode 100644 plugins/source/azuredevops/codegen/recipes/templates/resource.go.tpl delete mode 100644 plugins/source/azuredevops/codegen/recipes/templates/tables.go.tpl diff --git a/plugins/source/azuredevops/Makefile b/plugins/source/azuredevops/Makefile index 115164c5243e5e..036a6c95d97fb3 100644 --- a/plugins/source/azuredevops/Makefile +++ b/plugins/source/azuredevops/Makefile @@ -12,10 +12,5 @@ gen-docs: rm -rf ./docs/tables/* go run main.go doc ./docs/tables -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - .PHONY: gen -gen: gen-code gen-docs \ No newline at end of file +gen: gen-docs \ No newline at end of file diff --git a/plugins/source/azuredevops/client/transformers.go b/plugins/source/azuredevops/client/transformers.go new file mode 100644 index 00000000000000..f41adc6904d0a6 --- /dev/null +++ b/plugins/source/azuredevops/client/transformers.go @@ -0,0 +1,34 @@ +package client + +import ( + "reflect" + + "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/google/uuid" +) + +func isUUID(fieldType reflect.Type) bool { + fieldKind := fieldType.Kind() + + if fieldKind == reflect.Ptr { + return isUUID(fieldType.Elem()) + } + + return fieldType == reflect.TypeOf(uuid.UUID{}) +} + +func typeTransformer(field reflect.StructField) (schema.ValueType, error) { + if isUUID(field.Type) { + return schema.TypeUUID, nil + } + return schema.TypeInvalid, nil +} + +func Options() []transformers.StructTransformerOption { + options := []transformers.StructTransformerOption{ + transformers.WithTypeTransformer(typeTransformer), + } + + return options +} diff --git a/plugins/source/azuredevops/codegen/main.go b/plugins/source/azuredevops/codegen/main.go deleted file mode 100644 index d61f2899a33976..00000000000000 --- a/plugins/source/azuredevops/codegen/main.go +++ /dev/null @@ -1,18 +0,0 @@ -package main - -import ( - "log" - - "github.com/cloudquery/cloudquery/plugins/source/azuredevops/codegen/recipes" -) - -func main() { - for _, resource := range recipes.Resources { - if err := resource.Generate(); err != nil { - log.Fatal(err) - } - } - if err := recipes.GenerateTablesList(recipes.Resources); err != nil { - log.Fatal(err) - } -} diff --git a/plugins/source/azuredevops/codegen/recipes/base.go b/plugins/source/azuredevops/codegen/recipes/base.go deleted file mode 100644 index 0412fa25e1750d..00000000000000 --- a/plugins/source/azuredevops/codegen/recipes/base.go +++ /dev/null @@ -1,120 +0,0 @@ -package recipes - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "os" - "path" - "reflect" - "runtime" - "text/template" - - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/google/uuid" - "github.com/iancoleman/strcase" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS -var Resources []*Resource - -type Resource struct { - Service string - SubService string - Struct any - Table *codegen.TableDefinition -} - -func writeTemplateContentToFile(dir string, filePath string, buff bytes.Buffer) error { - outputPath := path.Join(dir, "../..", filePath) - outputDir := path.Dir(outputPath) - if err := os.MkdirAll(outputDir, os.ModePerm); err != nil { - return fmt.Errorf("failed to create directory %s: %w", outputDir, err) - } - - content := buff.Bytes() - formattedContent, err := format.Source(content) - if err != nil { - fmt.Printf("failed to format source: %s: %v\n", filePath, err) - } else { - content = formattedContent - } - - if err := os.WriteFile(outputPath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - return nil -} - -func renderTemplate(name string, filePath string, data any) error { - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - dir := path.Dir(filename) - - tpl, err := template.New(name).Funcs(template.FuncMap{"ToCamel": strcase.ToCamel}).ParseFS(templatesFS, "templates/*.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse azureDevops templates: %w", err) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse sdk template: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, data); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - - return writeTemplateContentToFile(dir, filePath, buff) -} - -func (resource *Resource) generate() error { - return renderTemplate("resource.go.tpl", path.Join("resources", "services", resource.Service, resource.SubService+".go"), resource) -} - -func isUUID(fieldType reflect.Type) bool { - fieldKind := fieldType.Kind() - - if fieldKind == reflect.Ptr { - return isUUID(fieldType.Elem()) - } - - return fieldType == reflect.TypeOf(uuid.UUID{}) -} - -func typeTransformer(field reflect.StructField) (schema.ValueType, error) { - if isUUID(field.Type) { - return schema.TypeUUID, nil - } - - return codegen.DefaultTypeTransformer(field) -} - -func (resource *Resource) Generate() error { - var err error - resource.Table, err = codegen.NewTableFromStruct( - fmt.Sprintf("azuredevops_%s_%s", resource.Service, resource.SubService), - resource.Struct, - codegen.WithTypeTransformer(typeTransformer), - ) - - if err != nil { - return err - } - - resource.Table.Resolver = "fetch" + strcase.ToCamel(resource.SubService) - if err := resource.generate(); err != nil { - return err - } - - return nil -} - -func GenerateTablesList(resources []*Resource) error { - return renderTemplate("tables.go.tpl", path.Join("resources", "plugin", "tables.go"), resources) -} diff --git a/plugins/source/azuredevops/codegen/recipes/core.go b/plugins/source/azuredevops/codegen/recipes/core.go deleted file mode 100644 index 14a52eb99fd919..00000000000000 --- a/plugins/source/azuredevops/codegen/recipes/core.go +++ /dev/null @@ -1,20 +0,0 @@ -package recipes - -import ( - "github.com/microsoft/azure-devops-go-api/azuredevops/v6/core" -) - -func init() { - resources := []*Resource{ - { - SubService: "projects", - Struct: &core.TeamProjectReference{}, - }, - } - - for _, resource := range resources { - resource.Service = "core" - } - - Resources = append(Resources, resources...) -} diff --git a/plugins/source/azuredevops/codegen/recipes/templates/resource.go.tpl b/plugins/source/azuredevops/codegen/recipes/templates/resource.go.tpl deleted file mode 100644 index a9737d4a6671b7..00000000000000 --- a/plugins/source/azuredevops/codegen/recipes/templates/resource.go.tpl +++ /dev/null @@ -1,11 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" -) - -func {{.SubService | ToCamel}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} \ No newline at end of file diff --git a/plugins/source/azuredevops/codegen/recipes/templates/tables.go.tpl b/plugins/source/azuredevops/codegen/recipes/templates/tables.go.tpl deleted file mode 100644 index d63ac30497f762..00000000000000 --- a/plugins/source/azuredevops/codegen/recipes/templates/tables.go.tpl +++ /dev/null @@ -1,18 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package plugin - -import ( - {{- range .}} - "github.com/cloudquery/cloudquery/plugins/source/azuredevops/resources/services/{{.Service}}" - {{- end}} - "github.com/cloudquery/plugin-sdk/schema" -) - -func tables() []*schema.Table { - return []*schema.Table{ - {{- range .}} - {{.Service}}.{{.SubService | ToCamel}}(), - {{- end}} - } -} \ No newline at end of file diff --git a/plugins/source/azuredevops/resources/services/core/projects.go b/plugins/source/azuredevops/resources/services/core/projects.go index 7706ae0edf151a..4834fa67d3af46 100644 --- a/plugins/source/azuredevops/resources/services/core/projects.go +++ b/plugins/source/azuredevops/resources/services/core/projects.go @@ -1,66 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package core import ( + "github.com/cloudquery/cloudquery/plugins/source/azuredevops/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/microsoft/azure-devops-go-api/azuredevops/v6/core" ) func Projects() *schema.Table { return &schema.Table{ - Name: "azuredevops_core_projects", - Resolver: fetchProjects, - Columns: []schema.Column{ - { - Name: "abbreviation", - Type: schema.TypeString, - Resolver: schema.PathResolver("Abbreviation"), - }, - { - Name: "default_team_image_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("DefaultTeamImageUrl"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "id", - Type: schema.TypeUUID, - Resolver: schema.PathResolver("Id"), - }, - { - Name: "last_update_time", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastUpdateTime"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "revision", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Revision"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("Url"), - }, - { - Name: "visibility", - Type: schema.TypeString, - Resolver: schema.PathResolver("Visibility"), - }, - }, + Name: "azuredevops_core_projects", + Resolver: fetchProjects, + Transform: transformers.TransformWithStruct(&core.TeamProjectReference{}, client.Options()...), } } From 57ba8046dab6ab21110326a36ba3b6cf2e9a026e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 12:58:27 +0200 Subject: [PATCH 124/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 to v1.19.0 (#6462) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.18.28` -> `v1.19.0` | --- ### Release Notes

aws/aws-sdk-go-v2 ### [`v1.19.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticloadbalancingv2/v1.18.28...service/elasticloadbalancingv2/v1.19.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/elasticloadbalancingv2/v1.18.28...service/elasticloadbalancingv2/v1.19.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Monday" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2b8f6c28c70835..72dad0733954d3 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticache v1.26.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.0 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 github.com/aws/aws-sdk-go-v2/service/emr v1.22.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index c3438047b3f0a6..aae040e8852391 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -130,8 +130,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0 h1:cBiPqmKWJexeZ98 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.15.0/go.mod h1:txSsTeuqHfPwicYkpg3PoOXFOpERUL5colZaCaaa8D0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0 h1:FFfQypN9iItIrGhbl8em90uXMFBLrCkNC1yJ65+m9Sk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.0/go.mod h1:3OUv9SlYvymsCF3I5NftITc1+B09cF5lg4IsZgQQy1U= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28 h1:Ae7aH1PEbrVSg1fSQy33E/mILWd1Csncz95FMfxYWms= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.28/go.mod h1:ix71C17la8K2MUJrqJzu+i7+aPoQYTAy14hKQbGDB9w= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.0 h1:Fs+mQ2VSOH3YhNJcfImnl7dsKAm/gqw4Q9iqLRIiPWE= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.19.0/go.mod h1:ix71C17la8K2MUJrqJzu+i7+aPoQYTAy14hKQbGDB9w= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0 h1:WvtC9K3UTI6EJSQzITax3/TElN4WGCaOB7Ptocj7AMY= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.18.0/go.mod h1:XBRdG4B+BnZjICBUIVLD4++5TkX19Y28f6+PNhXvWWc= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.14.0 h1:2AqNc84m2pGInkmtfbqxrU3CFfHUdP5Bi3/wvD8HVZM= From c6324f382f040b959819f5a6bcd8a93fd0b4530c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:22:29 +0200 Subject: [PATCH 125/221] fix(deps): Update module github.com/aws/aws-sdk-go-v2/service/cloudwatch to v1.24.0 (#6413) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.23.1` -> `v1.24.0` | --- ### Release Notes
aws/aws-sdk-go-v2 ### [`v1.24.0`](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudwatch/v1.23.1...service/cloudwatch/v1.24.0) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/service/cloudwatch/v1.23.1...service/cloudwatch/v1.24.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Monday" (UTC), 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 72dad0733954d3..2803a72c20e4e4 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -22,7 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.24.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.24.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.14.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index aae040e8852391..ae186e38c2b12c 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -88,8 +88,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0 h1:GMfZiWjkSnGJOTNwa57pZ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.14.0/go.mod h1:PUzxtyO8Pgq2MljHs4G/Zm4Z0+hIuVyZMjtXTC6JEzQ= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0 h1:Hdql8h9SancrQPqJoDcaJQT01zwaSP4gYbe8rmrQRrw= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.22.0/go.mod h1:1Li52ZBEvcubmtUtUFUjamRTQt4EoFzZpHDINdQ4Xso= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1 h1:6VwY6q6RZwxZTTTXjDmS8qbeBKvWwp8ugMKCEBjdgWA= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.23.1/go.mod h1:th8fks2kW4FFCUKUQenuEG9TEzMLVxeL0ckdJn/QVbI= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.24.0 h1:U7hDPPdDP7bptV6wJ5OJkshEw8P/K2k5WCjEYlVajLw= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.24.0/go.mod h1:th8fks2kW4FFCUKUQenuEG9TEzMLVxeL0ckdJn/QVbI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0 h1:Ai+CjJw+5/s3r6k5pggzDuFhWor2U3iwtsrmvN0Hczc= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.18.0/go.mod h1:xHK1ta0bQEa5jL6rahKRJvsibjzDO7NTIs5itzsF4w8= github.com/aws/aws-sdk-go-v2/service/codebuild v1.20.0 h1:7v1hy+4DUc2mLhV4WMzv+YuShj0zbqLW+WMCHqzDPyk= From 577c57d29c32e7e12027ffdb245edc38152f5c91 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:24:59 +0200 Subject: [PATCH 126/221] chore(main): Release plugins-destination-postgresql v2.0.4 (#6520) :robot: I have created a release *beep* *boop* --- ## [2.0.4](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.3...plugins-destination-postgresql-v2.0.4) (2023-01-09) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * **pg:** Dont overwrite _cq_id, _cq_parent_id on conflict ([#6521](https://github.com/cloudquery/cloudquery/issues/6521)) ([d1398a5](https://github.com/cloudquery/cloudquery/commit/d1398a5a081142db57291704c7f1df8479668b9c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/destination/postgresql/CHANGELOG.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 33facb41ea985b..3f21e2e158336d 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -23,7 +23,7 @@ "plugins/source/terraform+FILLER": "0.0.0", "plugins/source/test": "1.3.27", "plugins/source/test+FILLER": "0.0.0", - "plugins/destination/postgresql": "2.0.3", + "plugins/destination/postgresql": "2.0.4", "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "1.3.13", "plugins/destination/test+FILLER": "0.0.0", diff --git a/plugins/destination/postgresql/CHANGELOG.md b/plugins/destination/postgresql/CHANGELOG.md index 3b91101ad9da37..d091d03d8c0eae 100644 --- a/plugins/destination/postgresql/CHANGELOG.md +++ b/plugins/destination/postgresql/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [2.0.4](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.3...plugins-destination-postgresql-v2.0.4) (2023-01-09) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* **pg:** Dont overwrite _cq_id, _cq_parent_id on conflict ([#6521](https://github.com/cloudquery/cloudquery/issues/6521)) ([d1398a5](https://github.com/cloudquery/cloudquery/commit/d1398a5a081142db57291704c7f1df8479668b9c)) + ## [2.0.3](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v2.0.2...plugins-destination-postgresql-v2.0.3) (2023-01-07) From 5378f3be6d9d0ee3eb899244e1c2800326477a53 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:26:45 +0200 Subject: [PATCH 127/221] fix(deps): Update module github.com/cloudquery/filetypes to v1.0.3 (#6523) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/filetypes](https://togithub.com/cloudquery/filetypes) | require | patch | `v1.0.2` -> `v1.0.3` | --- ### Release Notes
cloudquery/filetypes ### [`v1.0.3`](https://togithub.com/cloudquery/filetypes/releases/tag/v1.0.3) [Compare Source](https://togithub.com/cloudquery/filetypes/compare/v1.0.2...v1.0.3) ##### Bug Fixes - **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#​17](https://togithub.com/cloudquery/filetypes/issues/17)) ([d5b0406](https://togithub.com/cloudquery/filetypes/commit/d5b04068a0690b7590056e8a0a68d475184681f6)) - **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#​19](https://togithub.com/cloudquery/filetypes/issues/19)) ([7d798d2](https://togithub.com/cloudquery/filetypes/commit/7d798d2e9ade7aeb4b24b71057bc1a2beb4696f1)) - **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#​20](https://togithub.com/cloudquery/filetypes/issues/20)) ([8542cfe](https://togithub.com/cloudquery/filetypes/commit/8542cfe74596a7c300d9f603e459a1c01f44493a)) - **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#​21](https://togithub.com/cloudquery/filetypes/issues/21)) ([3fdfbc2](https://togithub.com/cloudquery/filetypes/commit/3fdfbc25a5955b0103e0723ad38e4441101fe1a5))
--- ### 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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 ++-- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 ++-- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 4 ++-- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 ++-- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index f87131fd3535b7..5715d0c0e68905 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 - github.com/cloudquery/filetypes v1.0.2 + github.com/cloudquery/filetypes v1.0.3 github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 2799b96492e484..185540a3015d7f 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -50,8 +50,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= -github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= +github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= +github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 2ffaa2ba9126cc..71d27eef4f7634 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/file go 1.19 require ( - github.com/cloudquery/filetypes v1.0.2 + github.com/cloudquery/filetypes v1.0.3 github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 8ce24f5c6922cc..0da89b48bb3459 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= -github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= +github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= +github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index db9beeae56bf64..c9d884971c6ca0 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 - github.com/cloudquery/filetypes v1.0.2 + github.com/cloudquery/filetypes v1.0.3 github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 7adba5dcfba4a6..a0628270753e11 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -51,8 +51,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= -github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= +github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= +github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 8fd624377f6122..c545c281cc0a95 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 - github.com/cloudquery/filetypes v1.0.2 + github.com/cloudquery/filetypes v1.0.3 github.com/cloudquery/plugin-sdk v1.23.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index c03c0aaaf5d6c8..78f4fd0e0516f3 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -43,8 +43,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= -github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= +github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= +github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 76aa583b5f8b38..98a0e54da5e57d 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 - github.com/cloudquery/filetypes v1.0.2 + github.com/cloudquery/filetypes v1.0.3 github.com/cloudquery/plugin-sdk v1.23.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 1830ec916e6a8c..02ab59bdacd6cf 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -78,8 +78,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.2 h1:UxZ6aoZld2EQZzPgE8JIzmn98V6Px0cmK7rsJy+BoFg= -github.com/cloudquery/filetypes v1.0.2/go.mod h1:d9YllN+dlQNrT/+fFLwdjeXXE3a2Mj9kffO9aMwzOrg= +github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= +github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= From 71c84fcee0ae1496f16d290b605bda81316f3087 Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Mon, 9 Jan 2023 06:31:01 -0500 Subject: [PATCH 128/221] feat(github): Migrate codegen to transformations (#6428) #### Summary If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/aws/test/policy_cq_config.yml | 2 +- plugins/source/azure/test/policy_cq_config.yml | 2 +- plugins/source/gcp/test/policy_cq_config.yml | 2 +- plugins/source/k8s/test/policy_cq_config.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/aws/test/policy_cq_config.yml b/plugins/source/aws/test/policy_cq_config.yml index 122e7e10367cb5..df64583a2dda3c 100644 --- a/plugins/source/aws/test/policy_cq_config.yml +++ b/plugins/source/aws/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.3" # latest version of postgresql plugin + version: "v2.0.4" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/azure/test/policy_cq_config.yml b/plugins/source/azure/test/policy_cq_config.yml index e56b02d6f34ec8..8ed7dba49b46f5 100644 --- a/plugins/source/azure/test/policy_cq_config.yml +++ b/plugins/source/azure/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.3" # latest version of postgresql plugin + version: "v2.0.4" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/gcp/test/policy_cq_config.yml b/plugins/source/gcp/test/policy_cq_config.yml index fb6a683958c6b2..d4992bece2eac1 100644 --- a/plugins/source/gcp/test/policy_cq_config.yml +++ b/plugins/source/gcp/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.3" # latest version of postgresql plugin + version: "v2.0.4" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index bc0ccfc5cbd2f5..2b72597a03cc77 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -10,6 +10,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v2.0.3" # latest version of postgresql plugin + version: "v2.0.4" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From 58baafccfe7189f5f3da1790afd2253e719840ba Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Mon, 9 Jan 2023 06:43:18 -0600 Subject: [PATCH 133/221] feat(gcp): Move services/iam to use googleapis/google-cloud-go (#6390) #### Summary Currently, services/iam in the gcp source plugin uses the googleapis/google-api-go-client which does not have support for automatically retrying failed requests. This change replaces all of the API client code in services/iam with the applicable clients from googleapis/google-cloud-go which does support retrying failed requests. Ideally, templates/newapi_list.go.tpl would be modified to clear the CallOptions on the client so we'd only be respecting backoff_delay and backoff_retries. However, this change would modify behavior in multiple other services so I opt'd to save it for a separate PR to keep this one more concise. I also had to modify the associated codegen recipe since GRPC was now being used. Related to #6365, cc: @erezrokah --- .../gcp/docs/tables/gcp_iam_deny_policies.md | 15 ++-- .../source/gcp/docs/tables/gcp_iam_roles.md | 6 +- .../tables/gcp_iam_service_account_keys.md | 10 +-- .../docs/tables/gcp_iam_service_accounts.md | 12 +-- .../resources/services/iam/deny_policies.go | 4 +- .../services/iam/deny_policies_fetch.go | 29 ++++--- .../services/iam/deny_policies_mock_test.go | 46 ++++++------ .../gcp/resources/services/iam/roles.go | 2 +- .../gcp/resources/services/iam/roles_fetch.go | 22 ++++-- .../resources/services/iam/roles_mock_test.go | 46 +++++------- .../services/iam/service_account_keys.go | 2 +- .../iam/service_account_keys_fetch.go | 15 +++- .../services/iam/service_accounts.go | 33 +++++++- .../services/iam/service_accounts_fetch.go | 31 -------- .../iam/service_accounts_mock_test.go | 75 +++++++------------ 15 files changed, 172 insertions(+), 176 deletions(-) delete mode 100644 plugins/source/gcp/resources/services/iam/service_accounts_fetch.go diff --git a/plugins/source/gcp/docs/tables/gcp_iam_deny_policies.md b/plugins/source/gcp/docs/tables/gcp_iam_deny_policies.md index 1fb7684a4ee0ef..ee1e3506da8f10 100644 --- a/plugins/source/gcp/docs/tables/gcp_iam_deny_policies.md +++ b/plugins/source/gcp/docs/tables/gcp_iam_deny_policies.md @@ -13,13 +13,14 @@ The primary key for this table is **_cq_id**. |_cq_id (PK)|UUID| |_cq_parent_id|UUID| |project_id|String| -|annotations|JSON| -|create_time|String| -|delete_time|String| +|name|String| +|uid|String| +|kind|String| |display_name|String| +|annotations|JSON| |etag|String| -|kind|String| -|name|String| +|create_time|Timestamp| +|update_time|Timestamp| +|delete_time|Timestamp| |rules|JSON| -|uid|String| -|update_time|String| \ No newline at end of file +|managing_authority|String| \ No newline at end of file diff --git a/plugins/source/gcp/docs/tables/gcp_iam_roles.md b/plugins/source/gcp/docs/tables/gcp_iam_roles.md index 4def61625cfc83..77cf8c430b948d 100644 --- a/plugins/source/gcp/docs/tables/gcp_iam_roles.md +++ b/plugins/source/gcp/docs/tables/gcp_iam_roles.md @@ -14,9 +14,9 @@ The composite primary key for this table is (**project_id**, **name**). |_cq_parent_id|UUID| |project_id (PK)|String| |name (PK)|String| -|deleted|Bool| +|title|String| |description|String| -|etag|String| |included_permissions|StringArray| |stage|String| -|title|String| \ No newline at end of file +|etag|IntArray| +|deleted|Bool| \ No newline at end of file diff --git a/plugins/source/gcp/docs/tables/gcp_iam_service_account_keys.md b/plugins/source/gcp/docs/tables/gcp_iam_service_account_keys.md index e57fa5737be5dd..e8a53def0ee4f4 100644 --- a/plugins/source/gcp/docs/tables/gcp_iam_service_account_keys.md +++ b/plugins/source/gcp/docs/tables/gcp_iam_service_account_keys.md @@ -18,11 +18,11 @@ This table depends on [gcp_iam_service_accounts](gcp_iam_service_accounts.md). |_cq_parent_id|UUID| |project_id|String| |service_account_unique_id (PK)|String| -|disabled|Bool| +|name|String| |key_algorithm|String| +|public_key_data|IntArray| +|valid_after_time|Timestamp| +|valid_before_time|Timestamp| |key_origin|String| |key_type|String| -|name|String| -|public_key_data|String| -|valid_after_time|String| -|valid_before_time|String| \ No newline at end of file +|disabled|Bool| \ No newline at end of file diff --git a/plugins/source/gcp/docs/tables/gcp_iam_service_accounts.md b/plugins/source/gcp/docs/tables/gcp_iam_service_accounts.md index e1127fa5273039..12f644a87e4afd 100644 --- a/plugins/source/gcp/docs/tables/gcp_iam_service_accounts.md +++ b/plugins/source/gcp/docs/tables/gcp_iam_service_accounts.md @@ -19,10 +19,10 @@ The following tables depend on gcp_iam_service_accounts: |_cq_parent_id|UUID| |project_id|String| |unique_id (PK)|String| -|description|String| -|disabled|Bool| -|display_name|String| -|email|String| -|etag|String| |name|String| -|oauth2_client_id|String| \ No newline at end of file +|email|String| +|display_name|String| +|etag|IntArray| +|description|String| +|oauth2_client_id|String| +|disabled|Bool| \ No newline at end of file diff --git a/plugins/source/gcp/resources/services/iam/deny_policies.go b/plugins/source/gcp/resources/services/iam/deny_policies.go index 70cf07d54fd91d..02ad60197e678b 100644 --- a/plugins/source/gcp/resources/services/iam/deny_policies.go +++ b/plugins/source/gcp/resources/services/iam/deny_policies.go @@ -4,7 +4,7 @@ import ( "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/transformers" "github.com/cloudquery/plugins/source/gcp/client" - pb "google.golang.org/api/iam/v2beta" + pb "google.golang.org/genproto/googleapis/iam/v2" ) func DenyPolicies() *schema.Table { @@ -13,7 +13,7 @@ func DenyPolicies() *schema.Table { Description: `https://cloud.google.com/iam/docs/reference/rest/v2beta/policies#Policy`, Resolver: fetchDenyPolicies, Multiplex: client.ProjectMultiplexEnabledServices("iam.googleapis.com"), - Transform: transformers.TransformWithStruct(&pb.GoogleIamV2betaPolicy{}, client.Options()...), + Transform: transformers.TransformWithStruct(&pb.Policy{}, client.Options()...), Columns: []schema.Column{ { Name: "project_id", diff --git a/plugins/source/gcp/resources/services/iam/deny_policies_fetch.go b/plugins/source/gcp/resources/services/iam/deny_policies_fetch.go index c69c67e8db0359..0b3ab53193a0f2 100644 --- a/plugins/source/gcp/resources/services/iam/deny_policies_fetch.go +++ b/plugins/source/gcp/resources/services/iam/deny_policies_fetch.go @@ -6,31 +6,40 @@ import ( "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugins/source/gcp/client" - iam "google.golang.org/api/iam/v2beta" + + policies "cloud.google.com/go/iam/apiv2" + "google.golang.org/api/iterator" + policiespb "google.golang.org/genproto/googleapis/iam/v2" ) func fetchDenyPolicies(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, res chan<- any) error { c := meta.(*client.Client) - nextPageToken := "" - iamClient, err := iam.NewService(ctx, c.ClientOptions...) + iamClient, err := policies.NewPoliciesClient(ctx, c.ClientOptions...) if err != nil { return err } + iamClient.CallOptions = &policies.PoliciesCallOptions{} + // See https://cloud.google.com/iam/docs/reference/rest/v2beta/policies#Policy for the format of the parent parent := fmt.Sprintf("policies/cloudresourcemanager.googleapis.com%%2Fprojects%%2F%s/denypolicies", c.ProjectId) + req := &policiespb.ListPoliciesRequest{ + Parent: parent, + PageSize: 1000, + } + + it := iamClient.ListPolicies(ctx, req, c.CallOptions...) for { - // Not using PageSize here as IAM ignores it and uses 1000 anyway - output, err := iamClient.Policies.ListPolicies(parent).PageToken(nextPageToken).Do() + policy, err := it.Next() + if err == iterator.Done { + break + } if err != nil { return err } - res <- output.Policies - if output.NextPageToken == "" { - break - } - nextPageToken = output.NextPageToken + res <- []*policiespb.Policy{policy} } + return nil } diff --git a/plugins/source/gcp/resources/services/iam/deny_policies_mock_test.go b/plugins/source/gcp/resources/services/iam/deny_policies_mock_test.go index 125221178c93cb..d7ebae10323cee 100644 --- a/plugins/source/gcp/resources/services/iam/deny_policies_mock_test.go +++ b/plugins/source/gcp/resources/services/iam/deny_policies_mock_test.go @@ -1,40 +1,36 @@ package iam import ( - "encoding/json" - "net/http" + "context" + "fmt" "testing" "github.com/cloudquery/plugin-sdk/faker" "github.com/cloudquery/plugins/source/gcp/client" - "github.com/julienschmidt/httprouter" + "google.golang.org/grpc" - iam "google.golang.org/api/iam/v2beta" + pb "google.golang.org/genproto/googleapis/iam/v2" ) -func createDenyPolicies(mux *httprouter.Router) error { - var item iam.GoogleIamV2betaPolicy - if err := faker.FakeObject(&item); err != nil { - return err - } - - mux.GET("/*filepath", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - resp := &iam.GoogleIamV2betaListPoliciesResponse{ - Policies: []*iam.GoogleIamV2betaPolicy{&item}, - } - b, err := json.Marshal(resp) - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - }) +func createDenyPolicies(gsrv *grpc.Server) error { + fakeServer := &fakeDenyPoliciesServer{} + pb.RegisterPoliciesServer(gsrv, fakeServer) return nil } +type fakeDenyPoliciesServer struct { + pb.UnimplementedPoliciesServer +} + +func (*fakeDenyPoliciesServer) ListPolicies(context.Context, *pb.ListPoliciesRequest) (*pb.ListPoliciesResponse, error) { + resp := pb.ListPoliciesResponse{} + if err := faker.FakeObject(&resp); err != nil { + return nil, fmt.Errorf("failed to fake data: %w", err) + } + resp.NextPageToken = "" + return &resp, nil +} + func TestDenyPolicies(t *testing.T) { - client.MockTestRestHelper(t, DenyPolicies(), createDenyPolicies, client.TestOptions{}) + client.MockTestGrpcHelper(t, DenyPolicies(), createDenyPolicies, client.TestOptions{}) } diff --git a/plugins/source/gcp/resources/services/iam/roles.go b/plugins/source/gcp/resources/services/iam/roles.go index b21d007516f834..06110e13c05774 100644 --- a/plugins/source/gcp/resources/services/iam/roles.go +++ b/plugins/source/gcp/resources/services/iam/roles.go @@ -1,10 +1,10 @@ package iam import ( + pb "cloud.google.com/go/iam/admin/apiv1/adminpb" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/transformers" "github.com/cloudquery/plugins/source/gcp/client" - pb "google.golang.org/api/iam/v1" ) func Roles() *schema.Table { diff --git a/plugins/source/gcp/resources/services/iam/roles_fetch.go b/plugins/source/gcp/resources/services/iam/roles_fetch.go index 3b257961f8b34d..47e41a8850b520 100644 --- a/plugins/source/gcp/resources/services/iam/roles_fetch.go +++ b/plugins/source/gcp/resources/services/iam/roles_fetch.go @@ -2,30 +2,40 @@ package iam import ( "context" + "fmt" + iamadmin "cloud.google.com/go/iam/admin/apiv1" + iampb "cloud.google.com/go/iam/admin/apiv1/adminpb" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugins/source/gcp/client" - "google.golang.org/api/iam/v1" ) func fetchRoles(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, res chan<- any) error { c := meta.(*client.Client) nextPageToken := "" - iamClient, err := iam.NewService(ctx, c.ClientOptions...) + + iamClient, err := iamadmin.NewIamClient(ctx, c.ClientOptions...) if err != nil { return err } + iamClient.CallOptions = &iamadmin.IamCallOptions{} + for { - output, err := iamClient.Projects.Roles.List("projects/" + c.ProjectId).PageSize(1000).PageToken(nextPageToken).Do() + req := &iampb.ListRolesRequest{ + PageSize: 1000, + PageToken: nextPageToken, + Parent: fmt.Sprintf("projects/%s", c.ProjectId), + } + resp, err := iamClient.ListRoles(ctx, req, c.CallOptions...) if err != nil { return err } - res <- output.Roles + res <- resp.Roles - if output.NextPageToken == "" { + if resp.NextPageToken == "" { break } - nextPageToken = output.NextPageToken + nextPageToken = resp.NextPageToken } return nil } diff --git a/plugins/source/gcp/resources/services/iam/roles_mock_test.go b/plugins/source/gcp/resources/services/iam/roles_mock_test.go index 519a575bc6dacf..2f39bf62122fea 100644 --- a/plugins/source/gcp/resources/services/iam/roles_mock_test.go +++ b/plugins/source/gcp/resources/services/iam/roles_mock_test.go @@ -1,44 +1,36 @@ package iam import ( - "encoding/json" - "net/http" + "context" + "fmt" "testing" "github.com/cloudquery/plugin-sdk/faker" "github.com/cloudquery/plugins/source/gcp/client" - "github.com/julienschmidt/httprouter" + "google.golang.org/grpc" - "google.golang.org/api/iam/v1" + pb "cloud.google.com/go/iam/admin/apiv1/adminpb" ) -type MockRolesResult struct { - Roles []*iam.Role `json:"roles,omitempty"` +func createRoles(gsrv *grpc.Server) error { + fakeServer := &fakeRolesServer{} + pb.RegisterIAMServer(gsrv, fakeServer) + return nil } -func createRoles(mux *httprouter.Router) error { - var item iam.Role - if err := faker.FakeObject(&item); err != nil { - return err - } +type fakeRolesServer struct { + pb.UnimplementedIAMServer +} - mux.GET("/*filepath", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - resp := &MockRolesResult{ - Roles: []*iam.Role{&item}, - } - b, err := json.Marshal(resp) - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - }) - return nil +func (*fakeRolesServer) ListRoles(context.Context, *pb.ListRolesRequest) (*pb.ListRolesResponse, error) { + resp := pb.ListRolesResponse{} + if err := faker.FakeObject(&resp); err != nil { + return nil, fmt.Errorf("failed to fake data: %w", err) + } + resp.NextPageToken = "" + return &resp, nil } func TestRoles(t *testing.T) { - client.MockTestRestHelper(t, Roles(), createRoles, client.TestOptions{}) + client.MockTestGrpcHelper(t, Roles(), createRoles, client.TestOptions{}) } diff --git a/plugins/source/gcp/resources/services/iam/service_account_keys.go b/plugins/source/gcp/resources/services/iam/service_account_keys.go index 77d2c6af2c7a46..3f21700751b137 100644 --- a/plugins/source/gcp/resources/services/iam/service_account_keys.go +++ b/plugins/source/gcp/resources/services/iam/service_account_keys.go @@ -1,10 +1,10 @@ package iam import ( + pb "cloud.google.com/go/iam/admin/apiv1/adminpb" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/transformers" "github.com/cloudquery/plugins/source/gcp/client" - pb "google.golang.org/api/iam/v1" ) func ServiceAccountKeys() *schema.Table { diff --git a/plugins/source/gcp/resources/services/iam/service_account_keys_fetch.go b/plugins/source/gcp/resources/services/iam/service_account_keys_fetch.go index 539e2dad4702a5..2e14708165f8df 100644 --- a/plugins/source/gcp/resources/services/iam/service_account_keys_fetch.go +++ b/plugins/source/gcp/resources/services/iam/service_account_keys_fetch.go @@ -3,19 +3,26 @@ package iam import ( "context" + iamadmin "cloud.google.com/go/iam/admin/apiv1" + iampb "cloud.google.com/go/iam/admin/apiv1/adminpb" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugins/source/gcp/client" - "google.golang.org/api/iam/v1" ) func fetchServiceAccountKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { c := meta.(*client.Client) - p := parent.Item.(*iam.ServiceAccount) - iamClient, err := iam.NewService(ctx, c.ClientOptions...) + p := parent.Item.(*iampb.ServiceAccount) + iamClient, err := iamadmin.NewIamClient(ctx, c.ClientOptions...) if err != nil { return err } - output, err := iamClient.Projects.ServiceAccounts.Keys.List(p.Name).Context(ctx).Do() + iamClient.CallOptions = &iamadmin.IamCallOptions{} + + req := &iampb.ListServiceAccountKeysRequest{ + Name: p.Name, + } + + output, err := iamClient.ListServiceAccountKeys(ctx, req, c.CallOptions...) if err != nil { return err } diff --git a/plugins/source/gcp/resources/services/iam/service_accounts.go b/plugins/source/gcp/resources/services/iam/service_accounts.go index b1d24458aab5ad..fdd5eaaa39fdab 100644 --- a/plugins/source/gcp/resources/services/iam/service_accounts.go +++ b/plugins/source/gcp/resources/services/iam/service_accounts.go @@ -1,10 +1,17 @@ package iam import ( + "context" + + "google.golang.org/api/iterator" + + pb "cloud.google.com/go/iam/admin/apiv1/adminpb" + "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/transformers" "github.com/cloudquery/plugins/source/gcp/client" - pb "google.golang.org/api/iam/v1" + + admin "cloud.google.com/go/iam/admin/apiv1" ) func ServiceAccounts() *schema.Table { @@ -34,3 +41,27 @@ func ServiceAccounts() *schema.Table { }, } } + +func fetchServiceAccounts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { + c := meta.(*client.Client) + req := &pb.ListServiceAccountsRequest{ + Name: "projects/" + c.ProjectId, + } + gcpClient, err := admin.NewIamClient(ctx, c.ClientOptions...) + if err != nil { + return err + } + it := gcpClient.ListServiceAccounts(ctx, req, c.CallOptions...) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + return err + } + + res <- resp + } + return nil +} diff --git a/plugins/source/gcp/resources/services/iam/service_accounts_fetch.go b/plugins/source/gcp/resources/services/iam/service_accounts_fetch.go deleted file mode 100644 index fad024631b64f2..00000000000000 --- a/plugins/source/gcp/resources/services/iam/service_accounts_fetch.go +++ /dev/null @@ -1,31 +0,0 @@ -package iam - -import ( - "context" - - "github.com/cloudquery/plugin-sdk/schema" - "github.com/cloudquery/plugins/source/gcp/client" - "google.golang.org/api/iam/v1" -) - -func fetchServiceAccounts(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, res chan<- any) error { - c := meta.(*client.Client) - nextPageToken := "" - iamClient, err := iam.NewService(ctx, c.ClientOptions...) - if err != nil { - return err - } - for { - output, err := iamClient.Projects.ServiceAccounts.List("projects/" + c.ProjectId).PageToken(nextPageToken).PageSize(100).Do() - if err != nil { - return err - } - res <- output.Accounts - - if output.NextPageToken == "" { - break - } - nextPageToken = output.NextPageToken - } - return nil -} diff --git a/plugins/source/gcp/resources/services/iam/service_accounts_mock_test.go b/plugins/source/gcp/resources/services/iam/service_accounts_mock_test.go index 5de995f42e6d78..102c4b5202c18c 100644 --- a/plugins/source/gcp/resources/services/iam/service_accounts_mock_test.go +++ b/plugins/source/gcp/resources/services/iam/service_accounts_mock_test.go @@ -1,63 +1,44 @@ package iam import ( - "encoding/json" - "net/http" + "context" + "fmt" "testing" - "time" "github.com/cloudquery/plugin-sdk/faker" "github.com/cloudquery/plugins/source/gcp/client" - "github.com/julienschmidt/httprouter" + "google.golang.org/grpc" - "google.golang.org/api/iam/v1" + pb "cloud.google.com/go/iam/admin/apiv1/adminpb" ) -func createServiceAccounts(mux *httprouter.Router) error { - var item iam.ServiceAccount - if err := faker.FakeObject(&item); err != nil { - return err - } - item.Name = "test" - mux.GET("/v1/projects/testProject/serviceAccounts", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - resp := &iam.ListServiceAccountsResponse{ - Accounts: []*iam.ServiceAccount{&item}, - } - b, err := json.Marshal(resp) - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - }) - - var key iam.ServiceAccountKey - if err := faker.FakeObject(&key); err != nil { - return err +func createServiceAccounts(gsrv *grpc.Server) error { + fakeServer := &fakeServiceAccountsServer{} + pb.RegisterIAMServer(gsrv, fakeServer) + return nil +} + +type fakeServiceAccountsServer struct { + pb.UnimplementedIAMServer +} + +func (*fakeServiceAccountsServer) ListServiceAccounts(context.Context, *pb.ListServiceAccountsRequest) (*pb.ListServiceAccountsResponse, error) { + resp := pb.ListServiceAccountsResponse{} + if err := faker.FakeObject(&resp); err != nil { + return nil, fmt.Errorf("failed to fake data: %w", err) } - key.ValidAfterTime = time.Now().Format(time.RFC3339) - key.ValidBeforeTime = time.Now().Format(time.RFC3339) - mux.GET("/v1/test/keys", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - resp := &iam.ListServiceAccountKeysResponse{ - Keys: []*iam.ServiceAccountKey{&key}, - } - b, err := json.Marshal(resp) - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - }) + resp.NextPageToken = "" + return &resp, nil +} - return nil +func (*fakeServiceAccountsServer) ListServiceAccountKeys(context.Context, *pb.ListServiceAccountKeysRequest) (*pb.ListServiceAccountKeysResponse, error) { + resp := pb.ListServiceAccountKeysResponse{} + if err := faker.FakeObject(&resp); err != nil { + return nil, fmt.Errorf("failed to fake data: %w", err) + } + return &resp, nil } func TestServiceAccounts(t *testing.T) { - client.MockTestRestHelper(t, ServiceAccounts(), createServiceAccounts, client.TestOptions{}) + client.MockTestGrpcHelper(t, ServiceAccounts(), createServiceAccounts, client.TestOptions{}) } From c43dad947240072dad6ef35f70b57fe8666fa9fb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:12:56 +0200 Subject: [PATCH 134/221] chore(main): Release plugins-source-gcp v6.0.0 (#6526) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [6.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.5.0...plugins-source-gcp-v6.0.0) (2023-01-09) ### ⚠ BREAKING CHANGES * **gcp-resources:** `gcp_iam_roles` column `etag` type changed from `String` to `IntArray` * **gcp-resources:** `gcp_iam_service_account_keys` column `public_key_data` type changed from `String` to `IntArray` and columns `valid_after_time, valid_before_time` type changed from `String` to `Timestamp` * **gcp-resources:** `gcp_iam_service_accounts` column `etag` type changed from `String` to `IntArray` ### Features * **gcp-resources:** Move `gcp_iam_deny_policies` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) * **gcp-resources:** Move `gcp_iam_roles` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) * **gcp-resources:** Move `gcp_iam_service_account_keys` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) * **gcp-resources:** Move `gcp_iam_service_accounts` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) * **gcp:** Remove codegen ([#6384](https://github.com/cloudquery/cloudquery/issues/6384)) ([b55b535](https://github.com/cloudquery/cloudquery/commit/b55b5359e711e5893131d47f60aad2434c0aafaf)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/gcp/CHANGELOG.md | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3f21e2e158336d..427c9cf6e373ce 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -9,7 +9,7 @@ "plugins/source/cloudflare+FILLER": "0.0.0", "plugins/source/digitalocean": "4.0.2", "plugins/source/digitalocean+FILLER": "0.0.0", - "plugins/source/gcp": "5.5.0", + "plugins/source/gcp": "6.0.0", "plugins/source/gcp+FILLER": "0.0.0", "plugins/source/github": "2.0.0", "plugins/source/github+FILLER": "0.0.0", diff --git a/plugins/source/gcp/CHANGELOG.md b/plugins/source/gcp/CHANGELOG.md index ee515d9bede378..5dd47183416983 100644 --- a/plugins/source/gcp/CHANGELOG.md +++ b/plugins/source/gcp/CHANGELOG.md @@ -5,6 +5,30 @@ All notable changes to this provider will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.5.0...plugins-source-gcp-v6.0.0) (2023-01-09) + + +### ⚠ BREAKING CHANGES + +* **gcp-resources:** `gcp_iam_roles` column `etag` type changed from `String` to `IntArray` +* **gcp-resources:** `gcp_iam_service_account_keys` column `public_key_data` type changed from `String` to `IntArray` and columns `valid_after_time, valid_before_time` type changed from `String` to `Timestamp` +* **gcp-resources:** `gcp_iam_service_accounts` column `etag` type changed from `String` to `IntArray` + +### Features + +* **gcp-resources:** Move `gcp_iam_deny_policies` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) +* **gcp-resources:** Move `gcp_iam_roles` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) +* **gcp-resources:** Move `gcp_iam_service_account_keys` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) +* **gcp-resources:** Move `gcp_iam_service_accounts` to use `googleapis/google-cloud-go` ([58baafc](https://github.com/cloudquery/cloudquery/commit/58baafccfe7189f5f3da1790afd2253e719840ba)) +* **gcp:** Remove codegen ([#6384](https://github.com/cloudquery/cloudquery/issues/6384)) ([b55b535](https://github.com/cloudquery/cloudquery/commit/b55b5359e711e5893131d47f60aad2434c0aafaf)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) + ## [5.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v5.4.0...plugins-source-gcp-v5.5.0) (2023-01-05) From 4cbeb84947716f9be2f282c567e32ffcd28bd832 Mon Sep 17 00:00:00 2001 From: bbernays Date: Mon, 9 Jan 2023 08:23:32 -0500 Subject: [PATCH 135/221] feat(gcp): Improve Error messages for Rate Limited (#6392) #### Summary When large orgs use `enabled_services` they may well hit rate limits. This pr helps with documentation and gives the user a specific error message when it occurs If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/azblob/go.mod | 4 ++-- plugins/destination/azblob/go.sum | 8 ++++---- plugins/destination/file/go.mod | 4 ++-- plugins/destination/file/go.sum | 8 ++++---- plugins/destination/gcs/go.mod | 4 ++-- plugins/destination/gcs/go.sum | 8 ++++---- plugins/destination/kafka/go.mod | 4 ++-- plugins/destination/kafka/go.sum | 8 ++++---- plugins/destination/s3/go.mod | 4 ++-- plugins/destination/s3/go.sum | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 5715d0c0e68905..d6450ef68800de 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -5,8 +5,8 @@ go 1.19 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 - github.com/cloudquery/filetypes v1.0.3 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/filetypes v1.0.4 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 185540a3015d7f..d13ae563812baf 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -50,10 +50,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= -github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/filetypes v1.0.4 h1:m7yAXxwdKH3JgvXJHaylTZhjN22WfkPk+kY84MxK0bE= +github.com/cloudquery/filetypes v1.0.4/go.mod h1:enlU/oIhZfi1F7vuHbm2sTlOWzRueaTMwy7qAEzktwA= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 71d27eef4f7634..48fe7b259cb22c 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -3,8 +3,8 @@ module github.com/cloudquery/cloudquery/plugins/destination/file go 1.19 require ( - github.com/cloudquery/filetypes v1.0.3 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/filetypes v1.0.4 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 0da89b48bb3459..6a349605e55322 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -40,10 +40,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= -github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/filetypes v1.0.4 h1:m7yAXxwdKH3JgvXJHaylTZhjN22WfkPk+kY84MxK0bE= +github.com/cloudquery/filetypes v1.0.4/go.mod h1:enlU/oIhZfi1F7vuHbm2sTlOWzRueaTMwy7qAEzktwA= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index c9d884971c6ca0..d11f9d900e2981 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( cloud.google.com/go/storage v1.27.0 - github.com/cloudquery/filetypes v1.0.3 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/filetypes v1.0.4 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index a0628270753e11..1b1d8a1b8123f8 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -51,10 +51,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= -github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/filetypes v1.0.4 h1:m7yAXxwdKH3JgvXJHaylTZhjN22WfkPk+kY84MxK0bE= +github.com/cloudquery/filetypes v1.0.4/go.mod h1:enlU/oIhZfi1F7vuHbm2sTlOWzRueaTMwy7qAEzktwA= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index c545c281cc0a95..300647da9d82fe 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/Shopify/sarama v1.37.2 - github.com/cloudquery/filetypes v1.0.3 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/filetypes v1.0.4 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 78f4fd0e0516f3..4ea2548fb1add4 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -43,10 +43,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= -github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/filetypes v1.0.4 h1:m7yAXxwdKH3JgvXJHaylTZhjN22WfkPk+kY84MxK0bE= +github.com/cloudquery/filetypes v1.0.4/go.mod h1:enlU/oIhZfi1F7vuHbm2sTlOWzRueaTMwy7qAEzktwA= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 98a0e54da5e57d..678b76f38ff3f9 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -7,8 +7,8 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 - github.com/cloudquery/filetypes v1.0.3 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/filetypes v1.0.4 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 02ab59bdacd6cf..1e04ef4f92334f 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -78,10 +78,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/filetypes v1.0.3 h1:kvz935851jEKRr3gcHjqbgBuJfPN0Pxv1lcXTCr2bE8= -github.com/cloudquery/filetypes v1.0.3/go.mod h1:8rCCqnaGmT88hcpXXxnmec2bYd0iIolzCR93J/FU/t4= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/filetypes v1.0.4 h1:m7yAXxwdKH3JgvXJHaylTZhjN22WfkPk+kY84MxK0bE= +github.com/cloudquery/filetypes v1.0.4/go.mod h1:enlU/oIhZfi1F7vuHbm2sTlOWzRueaTMwy7qAEzktwA= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From d5484c3c2d1e9cfb73e7ce5392d2b9f21dd19ffd Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Tue, 10 Jan 2023 11:18:05 +0000 Subject: [PATCH 172/221] chore(fastly): Use codegen/interfaces package for generating service interfaces (#6546) Restores some code for generating service interfaces, but it's now in a library (`cloudquery/codegen`) and part of the `make gen-mocks` step. Also updates to latest SDK (but no user-facing changes) --- plugins/source/fastly/Makefile | 3 ++- plugins/source/fastly/client/client.go | 3 ++- plugins/source/fastly/client/testing.go | 2 +- plugins/source/fastly/codegen/main.go | 30 +++++++++++++++++++++++++ plugins/source/fastly/go.mod | 4 ++-- plugins/source/fastly/go.sum | 8 +++---- 6 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 plugins/source/fastly/codegen/main.go diff --git a/plugins/source/fastly/Makefile b/plugins/source/fastly/Makefile index 0348dd14a926dd..aa4adb2a62c369 100644 --- a/plugins/source/fastly/Makefile +++ b/plugins/source/fastly/Makefile @@ -17,9 +17,10 @@ lint: lint-fix: golangci-lint run --fix --config ../../.golangci.yml - .PHONY: gen-mocks gen-mocks: install-tools + rm -rf ./client/services/* + go run codegen/main.go rm -rf ./client/mocks/* go generate ./client/... diff --git a/plugins/source/fastly/client/client.go b/plugins/source/fastly/client/client.go index f002183c6a26dd..3f8b7910bc09a6 100644 --- a/plugins/source/fastly/client/client.go +++ b/plugins/source/fastly/client/client.go @@ -6,6 +6,7 @@ import ( "time" "github.com/cloudquery/cloudquery/plugins/source/fastly/client/services" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/fastly/go-fastly/v7/fastly" @@ -56,7 +57,7 @@ func (c *Client) withServiceAndRegion(service *fastly.Service, region string) sc } } -func Configure(ctx context.Context, logger zerolog.Logger, sourceSpec specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, sourceSpec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var config Spec err := sourceSpec.UnmarshalSpec(&config) if err != nil { diff --git a/plugins/source/fastly/client/testing.go b/plugins/source/fastly/client/testing.go index 6caea2d045b996..e1d827f2bb2845 100644 --- a/plugins/source/fastly/client/testing.go +++ b/plugins/source/fastly/client/testing.go @@ -28,7 +28,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, l := zerolog.New(zerolog.NewTestWriter(t)).Output( zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var s []*fastly.Service if opts.Service != nil { s = []*fastly.Service{opts.Service} diff --git a/plugins/source/fastly/codegen/main.go b/plugins/source/fastly/codegen/main.go new file mode 100644 index 00000000000000..2c47b70d8188ab --- /dev/null +++ b/plugins/source/fastly/codegen/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "path" + "reflect" + "runtime" + + "github.com/cloudquery/codegen/interfaces" + "github.com/fastly/go-fastly/v7/fastly" +) + +// Generate the service interfaces under in client/services for use with mockgen. +func main() { + _, filename, _, ok := runtime.Caller(0) + if !ok { + panic("failed to get caller information") + } + err := interfaces.Generate( + []any{&fastly.Client{}}, + path.Join(path.Dir(filename), "../client/services"), + interfaces.WithIncludeFunc(include), + ) + if err != nil { + panic(err) + } +} + +func include(m reflect.Method) bool { + return interfaces.MethodHasAnyPrefix(m, []string{"Get", "List", "NewGet", "NewList"}) +} diff --git a/plugins/source/fastly/go.mod b/plugins/source/fastly/go.mod index e9df8d61bb49b4..398cf8a9814299 100644 --- a/plugins/source/fastly/go.mod +++ b/plugins/source/fastly/go.mod @@ -3,9 +3,9 @@ module github.com/cloudquery/cloudquery/plugins/source/fastly go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/codegen v0.1.1 + github.com/cloudquery/plugin-sdk v1.24.0 github.com/fastly/go-fastly/v7 v7.0.0 - github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 github.com/thoas/go-funk v0.9.3 diff --git a/plugins/source/fastly/go.sum b/plugins/source/fastly/go.sum index faa5af7bac63ea..1186b281e01844 100644 --- a/plugins/source/fastly/go.sum +++ b/plugins/source/fastly/go.sum @@ -40,8 +40,10 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/codegen v0.1.1 h1:zIPNMeNAlUdLwP4gpb8BsfOfAxyLYOBxBNSG+nZpSx4= +github.com/cloudquery/codegen v0.1.1/go.mod h1:oJxzUuOC79fP36vBPU1BJ7n+jgQemS33y/mbgNq6vfM= +github.com/cloudquery/plugin-sdk v1.24.0 h1:vgi3RImpSlnhacg/zbrpsbUEsYpG51UB5KVkNhpX1cs= +github.com/cloudquery/plugin-sdk v1.24.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -59,8 +61,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fastly/go-fastly/v7 v7.0.0 h1:Qz6AHosQtSbp8u3aQyGruXNFF/yAqvvjaUCNvTM1XS4= github.com/fastly/go-fastly/v7 v7.0.0/go.mod h1:WdssHSSIe41/a5juIJagw8MCTA9m7xQ1TVLRcBQQuS8= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= From fe040b6992b0f580d79d9e160192c2abcbd7c889 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 11:23:18 +0000 Subject: [PATCH 173/221] fix(vercel): Remove codegen, upgrade SDK (#6564) --- plugins/source/vercel/Makefile | 7 +- plugins/source/vercel/client/client.go | 3 +- plugins/source/vercel/client/testing.go | 2 +- plugins/source/vercel/client/transformers.go | 24 +++ plugins/source/vercel/codegen/main.go | 123 -------------- .../vercel/codegen/recipes/deployments.go | 32 ---- .../source/vercel/codegen/recipes/domains.go | 32 ---- .../source/vercel/codegen/recipes/projects.go | 32 ---- .../source/vercel/codegen/recipes/recipes.go | 159 ------------------ .../source/vercel/codegen/recipes/teams.go | 30 ---- .../vercel/codegen/templates/resource.go.tpl | 14 -- .../vercel/docs/tables/vercel_domains.md | 2 +- .../vercel/docs/tables/vercel_projects.md | 2 +- .../vercel/docs/tables/vercel_team_members.md | 2 +- plugins/source/vercel/go.mod | 2 +- plugins/source/vercel/go.sum | 2 + .../services/deployment/deployment_checks.go | 60 +------ .../services/deployment/deployments.go | 65 +------ .../services/domain/domain_records.go | 55 +----- .../resources/services/domain/domains.go | 105 +----------- .../services/project/project_envs.go | 75 +-------- .../resources/services/project/projects.go | 125 +------------- .../resources/services/team/team_members.go | 65 +------ .../vercel/resources/services/team/teams.go | 50 +----- 24 files changed, 64 insertions(+), 1004 deletions(-) create mode 100644 plugins/source/vercel/client/transformers.go delete mode 100644 plugins/source/vercel/codegen/main.go delete mode 100644 plugins/source/vercel/codegen/recipes/deployments.go delete mode 100644 plugins/source/vercel/codegen/recipes/domains.go delete mode 100644 plugins/source/vercel/codegen/recipes/projects.go delete mode 100644 plugins/source/vercel/codegen/recipes/recipes.go delete mode 100644 plugins/source/vercel/codegen/recipes/teams.go delete mode 100644 plugins/source/vercel/codegen/templates/resource.go.tpl diff --git a/plugins/source/vercel/Makefile b/plugins/source/vercel/Makefile index aa2307ab0fb4eb..9a50b5e47eca19 100644 --- a/plugins/source/vercel/Makefile +++ b/plugins/source/vercel/Makefile @@ -13,11 +13,6 @@ gen-docs: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - # All gen targets .PHONY: gen -gen: gen-code gen-docs +gen: gen-docs diff --git a/plugins/source/vercel/client/client.go b/plugins/source/vercel/client/client.go index d03b5139dc5e90..816dec80654117 100644 --- a/plugins/source/vercel/client/client.go +++ b/plugins/source/vercel/client/client.go @@ -9,6 +9,7 @@ import ( "time" "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -57,7 +58,7 @@ func (c *Client) WithTeamID(teamID string) schema.ClientMeta { } } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { veSpec := &Spec{} if err := s.UnmarshalSpec(veSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal vercel spec: %w", err) diff --git a/plugins/source/vercel/client/testing.go b/plugins/source/vercel/client/testing.go index 82e9d09dd0b008..ac9a19fd4b6128 100644 --- a/plugins/source/vercel/client/testing.go +++ b/plugins/source/vercel/client/testing.go @@ -72,7 +72,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createServices func(*mux. zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var veSpec Spec if err := spec.UnmarshalSpec(&veSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal vercel spec: %w", err) diff --git a/plugins/source/vercel/client/transformers.go b/plugins/source/vercel/client/transformers.go new file mode 100644 index 00000000000000..d2a4a9f3eab4cf --- /dev/null +++ b/plugins/source/vercel/client/transformers.go @@ -0,0 +1,24 @@ +package client + +import ( + "reflect" + + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" + "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" +) + +func SharedTransformers() []transformers.StructTransformerOption { + return []transformers.StructTransformerOption{ + transformers.WithTypeTransformer(typeTransformer), + } +} + +func typeTransformer(field reflect.StructField) (schema.ValueType, error) { + switch field.Type { + case reflect.TypeOf(vercel.MilliTime{}), reflect.TypeOf(&vercel.MilliTime{}): + return schema.TypeTimestamp, nil + default: + return schema.TypeInvalid, nil + } +} diff --git a/plugins/source/vercel/codegen/main.go b/plugins/source/vercel/codegen/main.go deleted file mode 100644 index 7e824debae73d8..00000000000000 --- a/plugins/source/vercel/codegen/main.go +++ /dev/null @@ -1,123 +0,0 @@ -package main - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "log" - "os" - "path" - "reflect" - "runtime" - "strings" - "text/template" - - "github.com/cloudquery/cloudquery/plugins/source/vercel/codegen/recipes" - "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func main() { - var resources []*recipes.Resource - resources = append(resources, recipes.DomainResources()...) - resources = append(resources, recipes.TeamResources()...) - resources = append(resources, recipes.ProjectResources()...) - resources = append(resources, recipes.DeploymentResources()...) - - for _, r := range resources { - r.Infer() - } - if err := recipes.SetParentChildRelationships(resources); err != nil { - log.Fatal(err) - } - for _, r := range resources { - r.GenerateNames() - - _, filename, _, ok := runtime.Caller(0) - if !ok { - log.Fatal("Failed to get caller information") - } - codegenDir := path.Join(path.Dir(filename), "..", "resources", "services") - - generateTable(codegenDir, *r) - } -} - -func milliTimeTransformer(field reflect.StructField) (schema.ValueType, error) { - milliTime := vercel.MilliTime{} - switch field.Type { - case reflect.TypeOf(milliTime), reflect.TypeOf(&milliTime): - return schema.TypeTimestamp, nil - default: - return schema.TypeInvalid, nil - } -} - -func generateTable(basedir string, r recipes.Resource) { - var err error - - r.TableName = "vercel_" + r.TableName - - log.Println("Generating table", r.TableName) - opts := []codegen.TableOption{ - codegen.WithSkipFields(r.SkipFields), - codegen.WithExtraColumns(r.ExtraColumns), - codegen.WithPKColumns(r.PKColumns...), - codegen.WithTypeTransformer(milliTimeTransformer), - } - if r.UnwrapEmbeddedStructs { - opts = append(opts, codegen.WithUnwrapAllEmbeddedStructs()) - } - r.Table, err = codegen.NewTableFromStruct(r.TableName, r.DataStruct, opts...) - - if err != nil { - log.Fatal(err) - } - - r.Table.Resolver = r.ResolverFuncName - r.Table.Multiplex = r.Multiplex - r.ImportClient = strings.HasPrefix(r.Multiplex, "client.") - r.Table.Relations = r.Relations - r.Table.PreResourceResolver = r.PreResourceResolver - r.Table.PostResourceResolver = r.PostResourceResolver - - for _, c := range r.Table.Columns { - if strings.HasPrefix(c.Resolver, "client.") { - r.ImportClient = true - } - } - - mainTemplate := r.Template + ".go.tpl" - tpl, err := template.New(mainTemplate).ParseFS(templatesFS, "templates/"+mainTemplate) - if err != nil { - log.Fatal(fmt.Errorf("failed to parse vercel templates: %w", err)) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - log.Fatal(fmt.Errorf("failed to parse recipes template: %w", err)) - } - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - log.Fatal(fmt.Errorf("failed to execute template: %w", err)) - } - - pkgPath := path.Join(basedir, r.Service) - if err := os.Mkdir(pkgPath, 0755); err != nil && !os.IsExist(err) { - log.Fatal(err) - } - - filePath := path.Join(pkgPath, r.Filename) - content, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Println(buff.String()) - log.Fatal(fmt.Errorf("failed to format code for %s: %w", filePath, err)) - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - log.Fatal(fmt.Errorf("failed to write file %s: %w", filePath, err)) - } -} diff --git a/plugins/source/vercel/codegen/recipes/deployments.go b/plugins/source/vercel/codegen/recipes/deployments.go deleted file mode 100644 index 6cf7719007d6b4..00000000000000 --- a/plugins/source/vercel/codegen/recipes/deployments.go +++ /dev/null @@ -1,32 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DeploymentResources() []*Resource { - return []*Resource{ - { - DataStruct: &vercel.Deployment{}, - Service: "deployment", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"uid"}, - Relations: []string{"DeploymentChecks()"}, - }, - { - DataStruct: &vercel.DeploymentCheck{}, - Service: "deployment", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"deployment_id", "id"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "deployment_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("uid")`, - }, - }, - }, - } -} diff --git a/plugins/source/vercel/codegen/recipes/domains.go b/plugins/source/vercel/codegen/recipes/domains.go deleted file mode 100644 index 43189ece5fe9a7..00000000000000 --- a/plugins/source/vercel/codegen/recipes/domains.go +++ /dev/null @@ -1,32 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func DomainResources() []*Resource { - return []*Resource{ - { - DataStruct: &vercel.Domain{}, - Service: "domain", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"id"}, - Relations: []string{"DomainRecords()"}, - }, - { - DataStruct: &vercel.DomainRecord{}, - Service: "domain", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"domain_name", "id"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "domain_name", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("name")`, - }, - }, - }, - } -} diff --git a/plugins/source/vercel/codegen/recipes/projects.go b/plugins/source/vercel/codegen/recipes/projects.go deleted file mode 100644 index 69e52e7c1d86ea..00000000000000 --- a/plugins/source/vercel/codegen/recipes/projects.go +++ /dev/null @@ -1,32 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func ProjectResources() []*Resource { - return []*Resource{ - { - DataStruct: &vercel.Project{}, - Service: "project", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"id"}, - Relations: []string{"ProjectEnvs()"}, - }, - { - DataStruct: &vercel.ProjectEnv{}, - Service: "project", - Multiplex: "client.TeamMultiplex", - PKColumns: []string{"project_id", "id"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "project_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }, - }, - } -} diff --git a/plugins/source/vercel/codegen/recipes/recipes.go b/plugins/source/vercel/codegen/recipes/recipes.go deleted file mode 100644 index b6781a1965f748..00000000000000 --- a/plugins/source/vercel/codegen/recipes/recipes.go +++ /dev/null @@ -1,159 +0,0 @@ -package recipes - -import ( - "fmt" - "log" - "reflect" - "strings" - - "github.com/cloudquery/plugin-sdk/caser" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/gertd/go-pluralize" -) - -type Resource struct { - // Table is the table definition that will be used to generate the cloudquery table - Table *codegen.TableDefinition - // DataStruct that will be used to generate the cloudquery table - DataStruct any - // SkipFields fields in go struct to skip when generating the table from the go struct - SkipFields []string - Template string - Multiplex string - - ExtraColumns []codegen.ColumnDefinition - PKColumns []string - - PreResourceResolver string - PostResourceResolver string - Relations []string - UnwrapEmbeddedStructs bool - - SkipSubserviceName bool // Skip name of the subservice in auto generated table names (including relations) - - // These are inferred with reflection but can be overridden - Service string // Inferred from DataStruct package, pluralized - SubService string // Inferred from DataStruct name, singular - TableName string // singular Service + plural SubService - - // These are auto calculated - ImportClient bool // true if the resource/column resolvers use the client package - Filename string // Calculated from TableName - TableFuncName string // Calculated from TableName - ResolverFuncName string // Calculated from TableFuncName - - //used for generating better table names - parent *Resource - children []*Resource -} - -var ( - pluralizeClient *pluralize.Client - csr *caser.Caser -) - -func init() { - pluralizeClient = pluralize.NewClient() - csr = caser.New() -} - -func (r *Resource) Infer() { - // Set defaults and/or infer fields - if r.Template == "" { - r.Template = "resource" - } - - ds := reflect.TypeOf(r.DataStruct) - if ds.Kind() == reflect.Ptr { - ds = ds.Elem() - } - - if r.Service == "" { - log.Fatalf("Service is required for %s", r.SubService) - } - if r.SubService == "" { - r.SubService = csr.ToSnake(pluralizeClient.Singular(ds.Name())) - } -} - -func (r *Resource) GenerateNames() { - if r.TableName == "" { - // Table names are always in [...] format. Add everything in singular form and pluralize the last word later - - const sep = "_" - nParts := strings.Split(pluralizeClient.Singular(r.Service), sep) - p := r.parent - for p != nil { - nParts = appendNoRepeat(nParts, strings.Split(pluralizeClient.Singular(p.SubService), sep)...) - p = p.parent - } - nParts = appendNoRepeat(nParts, strings.Split(pluralizeClient.Singular(r.SubService), sep)...) - nParts[len(nParts)-1] = pluralizeClient.Plural(nParts[len(nParts)-1]) - - if r.TableName == "" { - if len(nParts) == 0 { - log.Fatalf("Could not generate table name for %s.%s", r.Service, r.SubService) - } - - r.TableName = strings.Join(nParts, sep) - } - } - - r.Filename = csr.ToSnake(r.TableName) + ".go" - r.TableFuncName = csr.ToPascal(r.TableName) - r.ResolverFuncName = "fetch" + r.TableFuncName -} - -// SetParentChildRelationships calculates and sets the parent and children fields on resources. -func SetParentChildRelationships(resources []*Resource) error { - m := map[string]*Resource{} - for _, r := range resources { - var key string - if r.TableName != "" { - key = r.TableName - } else { - key = r.Service + "_" + pluralizeClient.Plural(r.SubService) - } - //log.Printf("%s.%s => %s", r.Service, r.SubService, key) - m[key] = r - } - for _, r := range resources { - for _, ch := range r.Relations { - snakeChild := csr.ToSnake(strings.TrimSuffix(ch, "()")) - name := strings.TrimPrefix(snakeChild, r.Service+"_"+r.SubService+"_") - v, ok := m[r.Service+"_"+name] - if !ok { - v, ok = m[name] - } - if !ok { - return fmt.Errorf("child not found for %s.%s: %s missing", r.Service, r.SubService, name) - } - v.parent = r - } - } - return nil -} - -func appendNoRepeat(parts []string, addition ...string) []string { - // foo + bar = foo_bar - // foo + foo_bar = foo_bar - // foo_bar + bar_baz = foo_bar_baz - // foo_bar + baz_bax = foo_bar_baz_bax - // foo_bar_baz + bar_baz_bax = foo_bar_baz_bax - - for i := len(addition); i > 0; i-- { - // ever-increasing from long form to short: foo_bar_baz, foo_bar, foo - if sliceEndsWith(parts, addition[:i]) { - return append(parts, addition[i:]...) - } - } - return append(parts, addition...) -} - -func sliceEndsWith(haystack, needle []string) bool { - ln, lh := len(needle), len(haystack) - if ln > lh { - return false - } - return reflect.DeepEqual(needle, haystack[lh-ln:]) -} diff --git a/plugins/source/vercel/codegen/recipes/teams.go b/plugins/source/vercel/codegen/recipes/teams.go deleted file mode 100644 index 788805c78a8fda..00000000000000 --- a/plugins/source/vercel/codegen/recipes/teams.go +++ /dev/null @@ -1,30 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" -) - -func TeamResources() []*Resource { - return []*Resource{ - { - DataStruct: &vercel.Team{}, - Service: "team", - PKColumns: []string{"id"}, - Relations: []string{"TeamMembers()"}, - }, - { - DataStruct: &vercel.TeamMember{}, - Service: "team", - PKColumns: []string{"team_id", "uid"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "team_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }, - }, - } -} diff --git a/plugins/source/vercel/codegen/templates/resource.go.tpl b/plugins/source/vercel/codegen/templates/resource.go.tpl deleted file mode 100644 index 7e5b0ef0d03626..00000000000000 --- a/plugins/source/vercel/codegen/templates/resource.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" -{{- if .ImportClient}} - "github.com/cloudquery/cloudquery/plugins/source/vercel/client" -{{- end}} -) - -func {{.TableFuncName}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} diff --git a/plugins/source/vercel/docs/tables/vercel_domains.md b/plugins/source/vercel/docs/tables/vercel_domains.md index c3e596dde723f9..7d75dbf6440338 100644 --- a/plugins/source/vercel/docs/tables/vercel_domains.md +++ b/plugins/source/vercel/docs/tables/vercel_domains.md @@ -15,12 +15,12 @@ The following tables depend on vercel_domains: |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |bought_at|Timestamp| |cdn_enabled|Bool| |config_verified_at|Timestamp| |created_at|Timestamp| |expires_at|Timestamp| -|id (PK)|String| |intended_nameservers|StringArray| |custom_nameservers|StringArray| |name|String| diff --git a/plugins/source/vercel/docs/tables/vercel_projects.md b/plugins/source/vercel/docs/tables/vercel_projects.md index a95945e4e414bf..a58c1b9f2e2e67 100644 --- a/plugins/source/vercel/docs/tables/vercel_projects.md +++ b/plugins/source/vercel/docs/tables/vercel_projects.md @@ -15,6 +15,7 @@ The following tables depend on vercel_projects: |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |account_id|String| |auto_expose_system_envs|Bool| |build_command|String| @@ -25,7 +26,6 @@ The following tables depend on vercel_projects: |env|JSON| |framework|String| |git_fork_protection|Bool| -|id (PK)|String| |install_command|String| |name|String| |node_version|String| diff --git a/plugins/source/vercel/docs/tables/vercel_team_members.md b/plugins/source/vercel/docs/tables/vercel_team_members.md index 7f1b8a4b53ae07..a53a659192257d 100644 --- a/plugins/source/vercel/docs/tables/vercel_team_members.md +++ b/plugins/source/vercel/docs/tables/vercel_team_members.md @@ -15,6 +15,7 @@ This table depends on [vercel_teams](vercel_teams.md). |_cq_id|UUID| |_cq_parent_id|UUID| |team_id (PK)|String| +|uid (PK)|String| |avatar|String| |confirmed|Bool| |email|String| @@ -22,7 +23,6 @@ This table depends on [vercel_teams](vercel_teams.md). |gitlab|JSON| |bitbucket|JSON| |role|String| -|uid (PK)|String| |username|String| |name|String| |created_at|Timestamp| diff --git a/plugins/source/vercel/go.mod b/plugins/source/vercel/go.mod index 5a11ab44cfe4ac..a7ed06b5e64452 100644 --- a/plugins/source/vercel/go.mod +++ b/plugins/source/vercel/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/vercel go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/vercel/go.sum b/plugins/source/vercel/go.sum index 649bc420ef5ddb..4df3cae30184f9 100644 --- a/plugins/source/vercel/go.sum +++ b/plugins/source/vercel/go.sum @@ -42,6 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/vercel/resources/services/deployment/deployment_checks.go b/plugins/source/vercel/resources/services/deployment/deployment_checks.go index e311b708d1b9ca..24538052fbf546 100644 --- a/plugins/source/vercel/resources/services/deployment/deployment_checks.go +++ b/plugins/source/vercel/resources/services/deployment/deployment_checks.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package deployment import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DeploymentChecks() *schema.Table { return &schema.Table{ Name: "vercel_deployment_checks", Resolver: fetchDeploymentChecks, + Transform: transformers.TransformWithStruct(&vercel.DeploymentCheck{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ { @@ -29,61 +30,6 @@ func DeploymentChecks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "completed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletedAt"), - }, - { - Name: "conclusion", - Type: schema.TypeString, - Resolver: schema.PathResolver("Conclusion"), - }, - { - Name: "details_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("DetailsURL"), - }, - { - Name: "integration_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("IntegrationID"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "path", - Type: schema.TypeString, - Resolver: schema.PathResolver("Path"), - }, - { - Name: "rererequestable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Rerequestable"), - }, - { - Name: "started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/vercel/resources/services/deployment/deployments.go b/plugins/source/vercel/resources/services/deployment/deployments.go index 423b9004a8ec31..5440dbbea8821a 100644 --- a/plugins/source/vercel/resources/services/deployment/deployments.go +++ b/plugins/source/vercel/resources/services/deployment/deployments.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package deployment import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Deployments() *schema.Table { return &schema.Table{ Name: "vercel_deployments", Resolver: fetchDeployments, + Transform: transformers.TransformWithStruct(&vercel.Deployment{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ { @@ -21,66 +22,6 @@ func Deployments() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, - { - Name: "source", - Type: schema.TypeString, - Resolver: schema.PathResolver("Source"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "inspector_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("InspectorURL"), - }, - { - Name: "is_rollback_candidate", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IsRollbackCandidate"), - }, - { - Name: "ready", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Ready"), - }, - { - Name: "checks_state", - Type: schema.TypeString, - Resolver: schema.PathResolver("ChecksState"), - }, - { - Name: "checks_conclusion", - Type: schema.TypeString, - Resolver: schema.PathResolver("ChecksConclusion"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "building_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("BuildingAt"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/vercel/resources/services/domain/domain_records.go b/plugins/source/vercel/resources/services/domain/domain_records.go index 185454d6288b57..f766dfc5d7b8ce 100644 --- a/plugins/source/vercel/resources/services/domain/domain_records.go +++ b/plugins/source/vercel/resources/services/domain/domain_records.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package domain import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func DomainRecords() *schema.Table { return &schema.Table{ Name: "vercel_domain_records", Resolver: fetchDomainRecords, + Transform: transformers.TransformWithStruct(&vercel.DomainRecord{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ { @@ -29,56 +30,6 @@ func DomainRecords() *schema.Table { PrimaryKey: true, }, }, - { - Name: "slug", - Type: schema.TypeString, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, - { - Name: "mx_priority", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MxPriority"), - }, - { - Name: "priority", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Priority"), - }, - { - Name: "creator", - Type: schema.TypeString, - Resolver: schema.PathResolver("Creator"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "ttl", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TTL"), - }, }, } } diff --git a/plugins/source/vercel/resources/services/domain/domains.go b/plugins/source/vercel/resources/services/domain/domains.go index 9dfadb56f90601..c14f4a26575823 100644 --- a/plugins/source/vercel/resources/services/domain/domains.go +++ b/plugins/source/vercel/resources/services/domain/domains.go @@ -1,43 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package domain import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Domains() *schema.Table { return &schema.Table{ Name: "vercel_domains", Resolver: fetchDomains, + Transform: transformers.TransformWithStruct(&vercel.Domain{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ - { - Name: "bought_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("BoughtAt"), - }, - { - Name: "cdn_enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CdnEnabled"), - }, - { - Name: "config_verified_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ConfigVerifiedAt"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "expires_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpiresAt"), - }, { Name: "id", Type: schema.TypeString, @@ -46,81 +22,6 @@ func Domains() *schema.Table { PrimaryKey: true, }, }, - { - Name: "intended_nameservers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("IntendedNameservers"), - }, - { - Name: "custom_nameservers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CustomNameservers"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "nameservers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Nameservers"), - }, - { - Name: "ns_verified_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NsVerifiedAt"), - }, - { - Name: "ordered_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("OrderedAt"), - }, - { - Name: "renew", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Renew"), - }, - { - Name: "service_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServiceType"), - }, - { - Name: "transfer_started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TransferStartedAt"), - }, - { - Name: "transferred_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TransferredAt"), - }, - { - Name: "txt_verified_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TxtVerifiedAt"), - }, - { - Name: "verification_record", - Type: schema.TypeString, - Resolver: schema.PathResolver("VerificationRecord"), - }, - { - Name: "verified", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Verified"), - }, - { - Name: "zone", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Zone"), - }, - { - Name: "creator", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Creator"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/vercel/resources/services/project/project_envs.go b/plugins/source/vercel/resources/services/project/project_envs.go index 4cf3d59dcb185e..c0cf0d2f95c095 100644 --- a/plugins/source/vercel/resources/services/project/project_envs.go +++ b/plugins/source/vercel/resources/services/project/project_envs.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package project import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ProjectEnvs() *schema.Table { return &schema.Table{ Name: "vercel_project_envs", Resolver: fetchProjectEnvs, + Transform: transformers.TransformWithStruct(&vercel.ProjectEnv{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ { @@ -29,76 +30,6 @@ func ProjectEnvs() *schema.Table { PrimaryKey: true, }, }, - { - Name: "target", - Type: schema.TypeString, - Resolver: schema.PathResolver("Target"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "key", - Type: schema.TypeString, - Resolver: schema.PathResolver("Key"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, - { - Name: "configuration_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ConfigurationId"), - }, - { - Name: "git_branch", - Type: schema.TypeString, - Resolver: schema.PathResolver("GitBranch"), - }, - { - Name: "edge_config_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("EdgeConfigId"), - }, - { - Name: "edge_config_token_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("EdgeConfigTokenId"), - }, - { - Name: "decrypted", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Decrypted"), - }, - { - Name: "system", - Type: schema.TypeBool, - Resolver: schema.PathResolver("System"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "updated_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("UpdatedBy"), - }, }, } } diff --git a/plugins/source/vercel/resources/services/project/projects.go b/plugins/source/vercel/resources/services/project/projects.go index 978204dab93ffa..bd40de95b131d2 100644 --- a/plugins/source/vercel/resources/services/project/projects.go +++ b/plugins/source/vercel/resources/services/project/projects.go @@ -1,68 +1,19 @@ -// Code generated by codegen; DO NOT EDIT. - package project import ( "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Projects() *schema.Table { return &schema.Table{ Name: "vercel_projects", Resolver: fetchProjects, + Transform: transformers.TransformWithStruct(&vercel.Project{}, client.SharedTransformers()...), Multiplex: client.TeamMultiplex, Columns: []schema.Column{ - { - Name: "account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AccountID"), - }, - { - Name: "auto_expose_system_envs", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AutoExposeSystemEnvs"), - }, - { - Name: "build_command", - Type: schema.TypeString, - Resolver: schema.PathResolver("BuildCommand"), - }, - { - Name: "command_for_ignoring_build_step", - Type: schema.TypeString, - Resolver: schema.PathResolver("CommandForIgnoringBuildStep"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "dev_command", - Type: schema.TypeString, - Resolver: schema.PathResolver("DevCommand"), - }, - { - Name: "directory_listing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DirectoryListing"), - }, - { - Name: "env", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Env"), - }, - { - Name: "framework", - Type: schema.TypeString, - Resolver: schema.PathResolver("Framework"), - }, - { - Name: "git_fork_protection", - Type: schema.TypeBool, - Resolver: schema.PathResolver("GitForkProtection"), - }, { Name: "id", Type: schema.TypeString, @@ -71,76 +22,6 @@ func Projects() *schema.Table { PrimaryKey: true, }, }, - { - Name: "install_command", - Type: schema.TypeString, - Resolver: schema.PathResolver("InstallCommand"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "node_version", - Type: schema.TypeString, - Resolver: schema.PathResolver("NodeVersion"), - }, - { - Name: "output_directory", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputDirectory"), - }, - { - Name: "public_source", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PublicSource"), - }, - { - Name: "root_directory", - Type: schema.TypeString, - Resolver: schema.PathResolver("RootDirectory"), - }, - { - Name: "serverless_function_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("ServerlessFunctionRegion"), - }, - { - Name: "source_files_outside_root_directory", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SourceFilesOutsideRootDirectory"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "live", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Live"), - }, - { - Name: "latest_deployments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LatestDeployments"), - }, - { - Name: "transfer_started_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TransferStartedAt"), - }, - { - Name: "transfer_completed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("TransferCompletedAt"), - }, - { - Name: "transferred_from_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TransferredFromAccountID"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/vercel/resources/services/team/team_members.go b/plugins/source/vercel/resources/services/team/team_members.go index 1d04c279d66552..570e4d5cf58440 100644 --- a/plugins/source/vercel/resources/services/team/team_members.go +++ b/plugins/source/vercel/resources/services/team/team_members.go @@ -1,15 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package team import ( + "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func TeamMembers() *schema.Table { return &schema.Table{ - Name: "vercel_team_members", - Resolver: fetchTeamMembers, + Name: "vercel_team_members", + Resolver: fetchTeamMembers, + Transform: transformers.TransformWithStruct(&vercel.TeamMember{}, client.SharedTransformers()...), Columns: []schema.Column{ { Name: "team_id", @@ -19,41 +21,6 @@ func TeamMembers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "avatar", - Type: schema.TypeString, - Resolver: schema.PathResolver("Avatar"), - }, - { - Name: "confirmed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Confirmed"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "github", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Github"), - }, - { - Name: "gitlab", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Gitlab"), - }, - { - Name: "bitbucket", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Bitbucket"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, { Name: "uid", Type: schema.TypeString, @@ -62,26 +29,6 @@ func TeamMembers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "username", - Type: schema.TypeString, - Resolver: schema.PathResolver("Username"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "access_requested_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AccessRequestedAt"), - }, }, } } diff --git a/plugins/source/vercel/resources/services/team/teams.go b/plugins/source/vercel/resources/services/team/teams.go index 2f6c98049029f5..8c9b26e63b7121 100644 --- a/plugins/source/vercel/resources/services/team/teams.go +++ b/plugins/source/vercel/resources/services/team/teams.go @@ -1,15 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package team import ( + "github.com/cloudquery/cloudquery/plugins/source/vercel/client" + "github.com/cloudquery/cloudquery/plugins/source/vercel/internal/vercel" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Teams() *schema.Table { return &schema.Table{ - Name: "vercel_teams", - Resolver: fetchTeams, + Name: "vercel_teams", + Resolver: fetchTeams, + Transform: transformers.TransformWithStruct(&vercel.Team{}, client.SharedTransformers()...), Columns: []schema.Column{ { Name: "id", @@ -19,46 +21,6 @@ func Teams() *schema.Table { PrimaryKey: true, }, }, - { - Name: "slug", - Type: schema.TypeString, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "avatar", - Type: schema.TypeString, - Resolver: schema.PathResolver("Avatar"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "creator_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatorID"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "profiles", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Profiles"), - }, - { - Name: "staging_prefix", - Type: schema.TypeString, - Resolver: schema.PathResolver("StagingPrefix"), - }, }, Relations: []*schema.Table{ From 804be3a90d6f15d3e6c662c0eb7afa88a9596180 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 13:42:22 +0200 Subject: [PATCH 174/221] chore(main): Release plugins-source-aws v9.2.0 (#6328) :robot: I have created a release *beep* *boop* --- ## [9.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-aws-v9.1.1...plugins-source-aws-v9.2.0) (2023-01-10) ### Features * **aws:** KMS Key policies ([#6562](https://github.com/cloudquery/cloudquery/issues/6562)) ([d8571aa](https://github.com/cloudquery/cloudquery/commit/d8571aa0172de38ef0ac063738b0fbab7c32fbf7)), closes [#6559](https://github.com/cloudquery/cloudquery/issues/6559) * Move AWS to use built-in transformations (no codegen) ([#6337](https://github.com/cloudquery/cloudquery/issues/6337)) ([926d278](https://github.com/cloudquery/cloudquery/commit/926d2788a2108097288519709d951ce5dc47a1c3)) ### Bug Fixes * **aws:** Enable Partial Resolution of Lambda ([#6391](https://github.com/cloudquery/cloudquery/issues/6391)) ([e96a410](https://github.com/cloudquery/cloudquery/commit/e96a410394568145d80cddf73c16b59fe83f408d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/config to v1.18.8 ([#6393](https://github.com/cloudquery/cloudquery/issues/6393)) ([ffba44f](https://github.com/cloudquery/cloudquery/commit/ffba44f1318eb401d2b7ce2fa91c155d8925d90d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.47 ([#6395](https://github.com/cloudquery/cloudquery/issues/6395)) ([71ec9b9](https://github.com/cloudquery/cloudquery/commit/71ec9b99328ae4b7b0739a0c22258a805b586948)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/accessanalyzer to v1.19.0 ([#6396](https://github.com/cloudquery/cloudquery/issues/6396)) ([f19a34c](https://github.com/cloudquery/cloudquery/commit/f19a34cc0fa7897379d3d7e80432b26a0ad73f9e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/account to v1.8.0 ([#6397](https://github.com/cloudquery/cloudquery/issues/6397)) ([98a7681](https://github.com/cloudquery/cloudquery/commit/98a76815f1d1b98dd2278dfc0d57b775345ea46a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/acm to v1.17.0 ([#6398](https://github.com/cloudquery/cloudquery/issues/6398)) ([f59f6bd](https://github.com/cloudquery/cloudquery/commit/f59f6bda99e6fce0209d106db7b6389d9ec21700)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/amp to v1.16.0 ([#6399](https://github.com/cloudquery/cloudquery/issues/6399)) ([128ae76](https://github.com/cloudquery/cloudquery/commit/128ae76a9cd921c9b63e9a02c9d5261077e814b8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigateway to v1.16.0 ([#6400](https://github.com/cloudquery/cloudquery/issues/6400)) ([4570f15](https://github.com/cloudquery/cloudquery/commit/4570f15b08f46c6a2b3e8b258bb17abb2a8b688f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigatewayv2 to v1.13.0 ([#6401](https://github.com/cloudquery/cloudquery/issues/6401)) ([ca3b156](https://github.com/cloudquery/cloudquery/commit/ca3b1565fe5800637c03dfe892b56fea36418451)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.16.0 ([#6360](https://github.com/cloudquery/cloudquery/issues/6360)) ([afa651e](https://github.com/cloudquery/cloudquery/commit/afa651e3357170e3f4a19149c0ecadde0c4a0cca)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.17.0 ([#6402](https://github.com/cloudquery/cloudquery/issues/6402)) ([5c239ed](https://github.com/cloudquery/cloudquery/commit/5c239ed5b1294aa1356e45fcc74382eaad970a0c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apprunner to v1.16.0 ([#6403](https://github.com/cloudquery/cloudquery/issues/6403)) ([a312c4b](https://github.com/cloudquery/cloudquery/commit/a312c4b03bca32f9c158e08d4c19984859a0a546)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appstream to v1.19.0 ([#6404](https://github.com/cloudquery/cloudquery/issues/6404)) ([1cd08e1](https://github.com/cloudquery/cloudquery/commit/1cd08e1591674c78ce3f688bd8b601ba4994cd96)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appsync to v1.18.0 ([#6405](https://github.com/cloudquery/cloudquery/issues/6405)) ([76d4df5](https://github.com/cloudquery/cloudquery/commit/76d4df52517fcac585b9759045b3a1f650e6af7c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/athena to v1.22.0 ([#6406](https://github.com/cloudquery/cloudquery/issues/6406)) ([815a0f9](https://github.com/cloudquery/cloudquery/commit/815a0f9a5cff400f4e8cc23ba53584b115817bac)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/autoscaling to v1.26.0 ([#6407](https://github.com/cloudquery/cloudquery/issues/6407)) ([26e995c](https://github.com/cloudquery/cloudquery/commit/26e995cbdbe73a7e42926b62e4f85e9689cf67a8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/backup to v1.19.0 ([#6408](https://github.com/cloudquery/cloudquery/issues/6408)) ([01accc8](https://github.com/cloudquery/cloudquery/commit/01accc866a6f3020883ac50edf7bf979a73149df)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudformation to v1.25.0 ([#6409](https://github.com/cloudquery/cloudquery/issues/6409)) ([89ffac6](https://github.com/cloudquery/cloudquery/commit/89ffac690b18edb055cc892ab341907d7c8b27d4)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudfront to v1.24.0 ([#6410](https://github.com/cloudquery/cloudquery/issues/6410)) ([74a96fb](https://github.com/cloudquery/cloudquery/commit/74a96fb2e34202369d357b51c8d44aa130e2ad95)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 to v1.14.0 ([#6411](https://github.com/cloudquery/cloudquery/issues/6411)) ([d12e25c](https://github.com/cloudquery/cloudquery/commit/d12e25cadf8e37d9a33269241c4a5ed14c04be83)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudtrail to v1.22.0 ([#6412](https://github.com/cloudquery/cloudquery/issues/6412)) ([c1765b8](https://github.com/cloudquery/cloudquery/commit/c1765b859c644487b035ca52077f9764ccf80a2a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatch to v1.24.0 ([#6413](https://github.com/cloudquery/cloudquery/issues/6413)) ([c6324f3](https://github.com/cloudquery/cloudquery/commit/c6324f382f040b959819f5a6bcd8a93fd0b4530c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.17.4 ([#6359](https://github.com/cloudquery/cloudquery/issues/6359)) ([8ca9085](https://github.com/cloudquery/cloudquery/commit/8ca9085225f996bd3fc77f4bff4c76790d68ad3b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.18.0 ([#6414](https://github.com/cloudquery/cloudquery/issues/6414)) ([35b62ac](https://github.com/cloudquery/cloudquery/commit/35b62acbc10ee60318260e06a3ef74445ec14772)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codebuild to v1.20.0 ([#6444](https://github.com/cloudquery/cloudquery/issues/6444)) ([b91ca03](https://github.com/cloudquery/cloudquery/commit/b91ca037c14a6e228ef0e95d54757757f505b747)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codepipeline to v1.14.0 ([#6445](https://github.com/cloudquery/cloudquery/issues/6445)) ([bb7d3f2](https://github.com/cloudquery/cloudquery/commit/bb7d3f29aef0ff6b8307664f2546cf9f497b3e6a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentity to v1.15.0 ([#6446](https://github.com/cloudquery/cloudquery/issues/6446)) ([c93c305](https://github.com/cloudquery/cloudquery/commit/c93c3059e570dbace6a6cf18f0f48b8dcfcff449)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider to v1.22.0 ([#6447](https://github.com/cloudquery/cloudquery/issues/6447)) ([4ffbfd5](https://github.com/cloudquery/cloudquery/commit/4ffbfd52267bb6386527d8f23df671b2752cbbde)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/configservice to v1.29.0 ([#6448](https://github.com/cloudquery/cloudquery/issues/6448)) ([2433cbe](https://github.com/cloudquery/cloudquery/commit/2433cbe134d1f5041eb7cfb7e08dbfa783f47f6a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice to v1.23.0 ([#6449](https://github.com/cloudquery/cloudquery/issues/6449)) ([9c2bb7c](https://github.com/cloudquery/cloudquery/commit/9c2bb7c22a0cb5c8fd38708c311386bc6e36f19f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dax to v1.12.0 ([#6450](https://github.com/cloudquery/cloudquery/issues/6450)) ([da537c6](https://github.com/cloudquery/cloudquery/commit/da537c6d28a10e4334ca42a2180bae763159146b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/directconnect to v1.18.0 ([#6451](https://github.com/cloudquery/cloudquery/issues/6451)) ([89e34fe](https://github.com/cloudquery/cloudquery/commit/89e34fe8db2ffb40b6b1a6373e13db28346b3f6e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/docdb to v1.20.0 ([#6452](https://github.com/cloudquery/cloudquery/issues/6452)) ([472536a](https://github.com/cloudquery/cloudquery/commit/472536a5a39c2d9176adbe3db2ca2f4b192ff2df)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.18.0 ([#6453](https://github.com/cloudquery/cloudquery/issues/6453)) ([561db49](https://github.com/cloudquery/cloudquery/commit/561db492f96428cc50e6e8dbaa5afb1ee5f8eadf)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecr to v1.18.0 ([#6454](https://github.com/cloudquery/cloudquery/issues/6454)) ([ecdbe98](https://github.com/cloudquery/cloudquery/commit/ecdbe985cc0834d3bc60708b48ef9769dd9a2a52)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecrpublic to v1.14.0 ([#6455](https://github.com/cloudquery/cloudquery/issues/6455)) ([7984da9](https://github.com/cloudquery/cloudquery/commit/7984da97223ad938d141c0be2aac09557cc89bcd)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecs to v1.23.0 ([#6456](https://github.com/cloudquery/cloudquery/issues/6456)) ([94b8b4c](https://github.com/cloudquery/cloudquery/commit/94b8b4c4dfc0c1c8bab2e05d5db59d1793193753)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/efs to v1.19.0 ([#6457](https://github.com/cloudquery/cloudquery/issues/6457)) ([a56841a](https://github.com/cloudquery/cloudquery/commit/a56841ae4b07aa42f20ccd556d54f2e7824f97aa)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eks to v1.27.0 ([#6458](https://github.com/cloudquery/cloudquery/issues/6458)) ([4a74a54](https://github.com/cloudquery/cloudquery/commit/4a74a54e138f5271727281fbaeb5afaa5ff38303)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticache to v1.26.0 ([#6459](https://github.com/cloudquery/cloudquery/issues/6459)) ([5c70e45](https://github.com/cloudquery/cloudquery/commit/5c70e455c721bab217ca7ef5bc4b9e58de25fb60)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk to v1.15.0 ([#6460](https://github.com/cloudquery/cloudquery/issues/6460)) ([3333cfb](https://github.com/cloudquery/cloudquery/commit/3333cfb377deebedd278632540987f1c9988b281)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing to v1.15.0 ([#6461](https://github.com/cloudquery/cloudquery/issues/6461)) ([d72d213](https://github.com/cloudquery/cloudquery/commit/d72d213e3daabf1ac4520866136bcb5990fb7531)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 to v1.19.0 ([#6462](https://github.com/cloudquery/cloudquery/issues/6462)) ([57ba804](https://github.com/cloudquery/cloudquery/commit/57ba8046dab6ab21110326a36ba3b6cf2e9a026e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice to v1.18.0 ([#6463](https://github.com/cloudquery/cloudquery/issues/6463)) ([e282e84](https://github.com/cloudquery/cloudquery/commit/e282e8476eea9345fd7a41a72ee4eaaa2f26351a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elastictranscoder to v1.14.0 ([#6464](https://github.com/cloudquery/cloudquery/issues/6464)) ([163a581](https://github.com/cloudquery/cloudquery/commit/163a58103ff3a5454c83e82fca0685ecd9ee2192)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/emr to v1.22.0 ([#6465](https://github.com/cloudquery/cloudquery/issues/6465)) ([f149f08](https://github.com/cloudquery/cloudquery/commit/f149f084163145ec03023122161e39899f2ab763)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eventbridge to v1.17.0 ([#6473](https://github.com/cloudquery/cloudquery/issues/6473)) ([188848f](https://github.com/cloudquery/cloudquery/commit/188848f482ef1f0657fd78203dfa279709bff53b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/firehose to v1.16.0 ([#6474](https://github.com/cloudquery/cloudquery/issues/6474)) ([de60adb](https://github.com/cloudquery/cloudquery/commit/de60adb2c5ffa8eea22e202089d25f01bff373b6)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/frauddetector to v1.21.0 ([#6475](https://github.com/cloudquery/cloudquery/issues/6475)) ([19b154a](https://github.com/cloudquery/cloudquery/commit/19b154ac1da2e3792a8a25a4f6c11f4fb9dabc86)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/fsx to v1.28.0 ([#6476](https://github.com/cloudquery/cloudquery/issues/6476)) ([7b39554](https://github.com/cloudquery/cloudquery/commit/7b39554e05b53e7ae54679c19f36e71d45fcb3c8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glacier to v1.14.0 ([#6477](https://github.com/cloudquery/cloudquery/issues/6477)) ([8d0887f](https://github.com/cloudquery/cloudquery/commit/8d0887fb4a1d48b0e7b5b8e8b1732f7aa57a7142)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glue to v1.39.0 ([#6478](https://github.com/cloudquery/cloudquery/issues/6478)) ([4001267](https://github.com/cloudquery/cloudquery/commit/4001267f92b58fbd6069a170a6173b80f8d53417)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/guardduty to v1.17.0 ([#6479](https://github.com/cloudquery/cloudquery/issues/6479)) ([651dfe4](https://github.com/cloudquery/cloudquery/commit/651dfe437778b2e3df663a33c4787fba5b0ab61d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iam to v1.19.0 ([#6480](https://github.com/cloudquery/cloudquery/issues/6480)) ([30cf79d](https://github.com/cloudquery/cloudquery/commit/30cf79d234d86dc3ab36350ebcbdca9696174d03)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/identitystore to v1.16.0 ([#6481](https://github.com/cloudquery/cloudquery/issues/6481)) ([c7dd4a6](https://github.com/cloudquery/cloudquery/commit/c7dd4a64734ad60be65a9c31d823d311f53ddd7e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector to v1.13.0 ([#6482](https://github.com/cloudquery/cloudquery/issues/6482)) ([e628a51](https://github.com/cloudquery/cloudquery/commit/e628a51e8912222ec5a6a44b1dc117768cce30d5)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector2 to v1.11.0 ([#6483](https://github.com/cloudquery/cloudquery/issues/6483)) ([fe8fd70](https://github.com/cloudquery/cloudquery/commit/fe8fd70ca0f1782f734f1e45730ca09384b86664)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iot to v1.33.0 ([#6484](https://github.com/cloudquery/cloudquery/issues/6484)) ([d66ca25](https://github.com/cloudquery/cloudquery/commit/d66ca2585ac6a61a963e80d4b3e5fc0b59713260)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kafka to v1.19.0 ([#6485](https://github.com/cloudquery/cloudquery/issues/6485)) ([acb2683](https://github.com/cloudquery/cloudquery/commit/acb26838a6d09ce9581224964de386e56caae3a9)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kinesis to v1.17.0 ([#6486](https://github.com/cloudquery/cloudquery/issues/6486)) ([31b551f](https://github.com/cloudquery/cloudquery/commit/31b551f89e3e48e8e669e2ae960205d06d5fba4b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kms to v1.20.0 ([#6487](https://github.com/cloudquery/cloudquery/issues/6487)) ([5a8b81d](https://github.com/cloudquery/cloudquery/commit/5a8b81da157189a9ec92522b06992b20b969bc6c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lambda to v1.27.0 ([#6488](https://github.com/cloudquery/cloudquery/issues/6488)) ([de83eda](https://github.com/cloudquery/cloudquery/commit/de83edafcafd92df94ad9dc23967ffc0f278d3c8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lightsail to v1.25.0 ([#6489](https://github.com/cloudquery/cloudquery/issues/6489)) ([99ce478](https://github.com/cloudquery/cloudquery/commit/99ce47890a9d303537eb833e60a95fa1f63495cc)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mq to v1.14.0 ([#6490](https://github.com/cloudquery/cloudquery/issues/6490)) ([d5b465c](https://github.com/cloudquery/cloudquery/commit/d5b465cf656c706fdf588657f6e31fd2dbe40021)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mwaa to v1.14.0 ([#6491](https://github.com/cloudquery/cloudquery/issues/6491)) ([c565b0a](https://github.com/cloudquery/cloudquery/commit/c565b0aa691019c1a11058b062fa2d2a30bceb7c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/neptune to v1.19.0 ([#6492](https://github.com/cloudquery/cloudquery/issues/6492)) ([d373abd](https://github.com/cloudquery/cloudquery/commit/d373abd5031631885e6c59a904f11459a337b156)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/organizations to v1.18.0 ([#6495](https://github.com/cloudquery/cloudquery/issues/6495)) ([bbb2457](https://github.com/cloudquery/cloudquery/commit/bbb2457db330818f24496719f4bceb32384bc9cb)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/qldb to v1.15.0 ([#6496](https://github.com/cloudquery/cloudquery/issues/6496)) ([5f01dcf](https://github.com/cloudquery/cloudquery/commit/5f01dcfaf5b4c07f05905e9b25adea9482270379)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/quicksight to v1.29.0 ([#6497](https://github.com/cloudquery/cloudquery/issues/6497)) ([6c6788c](https://github.com/cloudquery/cloudquery/commit/6c6788c677dc7632f01dd029c155c8c7ce18c622)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ram to v1.17.0 ([#6498](https://github.com/cloudquery/cloudquery/issues/6498)) ([306bcc5](https://github.com/cloudquery/cloudquery/commit/306bcc5d81b2b86014ab5b2cf08d59f9951c2426)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/rds to v1.39.0 ([#6499](https://github.com/cloudquery/cloudquery/issues/6499)) ([ed4cd10](https://github.com/cloudquery/cloudquery/commit/ed4cd10e81c576f1c03c6c77400db17a673db843)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/redshift to v1.27.0 ([#6500](https://github.com/cloudquery/cloudquery/issues/6500)) ([4c82e8b](https://github.com/cloudquery/cloudquery/commit/4c82e8be4121cd1e9c6025ee5e1c55021ca35ca8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/resourcegroups to v1.13.0 ([#6501](https://github.com/cloudquery/cloudquery/issues/6501)) ([9efd121](https://github.com/cloudquery/cloudquery/commit/9efd1217a33b38944f91e64f0e3cfc50c3ce2d82)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53 to v1.26.0 ([#6502](https://github.com/cloudquery/cloudquery/issues/6502)) ([135dc6b](https://github.com/cloudquery/cloudquery/commit/135dc6b79f07e6af16aa44f18c19b8b585e2152f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53domains to v1.14.0 ([#6503](https://github.com/cloudquery/cloudquery/issues/6503)) ([ba2aa9e](https://github.com/cloudquery/cloudquery/commit/ba2aa9e975664b4249c093c329a7c5f9d2884bae)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/s3control to v1.29.0 ([#6505](https://github.com/cloudquery/cloudquery/issues/6505)) ([47fa203](https://github.com/cloudquery/cloudquery/commit/47fa203c1be135d6e06ca6a39c580a502d24e29f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sagemaker to v1.62.0 ([#6506](https://github.com/cloudquery/cloudquery/issues/6506)) ([57207cf](https://github.com/cloudquery/cloudquery/commit/57207cfd05228f8e257764cabee6b6f14b01d1c1)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/scheduler to v1.1.0 ([#6507](https://github.com/cloudquery/cloudquery/issues/6507)) ([a56a3e0](https://github.com/cloudquery/cloudquery/commit/a56a3e0b885b913d0cee5bc17e01350e967cf866)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/secretsmanager to v1.18.0 ([#6508](https://github.com/cloudquery/cloudquery/issues/6508)) ([83f6116](https://github.com/cloudquery/cloudquery/commit/83f6116fa8e4e355502a07850def33304059d08a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalog to v1.16.0 ([#6509](https://github.com/cloudquery/cloudquery/issues/6509)) ([1e69f8d](https://github.com/cloudquery/cloudquery/commit/1e69f8dd2ea31117bbe0bd3ff2056eab849ccd67)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry to v1.16.0 ([#6510](https://github.com/cloudquery/cloudquery/issues/6510)) ([6a7f928](https://github.com/cloudquery/cloudquery/commit/6a7f928051691ca17e219af069d2422ed373cc33)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicequotas to v1.14.0 ([#6511](https://github.com/cloudquery/cloudquery/issues/6511)) ([d12e3b8](https://github.com/cloudquery/cloudquery/commit/d12e3b8a86b6d838935b0c0404e1041445ab5249)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ses to v1.15.0 ([#6512](https://github.com/cloudquery/cloudquery/issues/6512)) ([4f8863c](https://github.com/cloudquery/cloudquery/commit/4f8863cd922df654ef4860897ee22f8437192539)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sesv2 to v1.16.0 ([#6513](https://github.com/cloudquery/cloudquery/issues/6513)) ([a4987ae](https://github.com/cloudquery/cloudquery/commit/a4987ae191b9f5e660d29ca4a99f1469dd9e1fe7)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sfn to v1.17.0 ([#6514](https://github.com/cloudquery/cloudquery/issues/6514)) ([c8e7d9c](https://github.com/cloudquery/cloudquery/commit/c8e7d9cc72fd6ab71dc8916ef6ddc8902bf5b92b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ssm to v1.34.0 ([#6361](https://github.com/cloudquery/cloudquery/issues/6361)) ([2413dba](https://github.com/cloudquery/cloudquery/commit/2413dba0ba477e5ba958c4c97e7d330275ea4323)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * Update endpoints ([#6327](https://github.com/cloudquery/cloudquery/issues/6327)) ([11d6973](https://github.com/cloudquery/cloudquery/commit/11d6973618a135c00f6232b3462a6f82cb501380)) * Update endpoints ([#6440](https://github.com/cloudquery/cloudquery/issues/6440)) ([499f421](https://github.com/cloudquery/cloudquery/commit/499f421fa96b2d3c63f0679b32e00f98cc0da4b3)) * Update endpoints ([#6558](https://github.com/cloudquery/cloudquery/issues/6558)) ([45c4753](https://github.com/cloudquery/cloudquery/commit/45c4753d3d81a799a46a6fdf8782c043b5666c77)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/aws/CHANGELOG.md | 107 ++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 605212ea153830..b52c9117294675 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,7 +1,7 @@ { "cli": "2.0.31", "cli+FILLER": "0.0.0", - "plugins/source/aws": "9.1.1", + "plugins/source/aws": "9.2.0", "plugins/source/aws+FILLER": "0.0.0", "plugins/source/azure": "3.1.0", "plugins/source/azure+FILLER": "0.0.0", diff --git a/plugins/source/aws/CHANGELOG.md b/plugins/source/aws/CHANGELOG.md index 0608522a934b20..8cedda96c30313 100644 --- a/plugins/source/aws/CHANGELOG.md +++ b/plugins/source/aws/CHANGELOG.md @@ -6,6 +6,113 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [9.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-aws-v9.1.1...plugins-source-aws-v9.2.0) (2023-01-10) + + +### Features + +* **aws:** KMS Key policies ([#6562](https://github.com/cloudquery/cloudquery/issues/6562)) ([d8571aa](https://github.com/cloudquery/cloudquery/commit/d8571aa0172de38ef0ac063738b0fbab7c32fbf7)), closes [#6559](https://github.com/cloudquery/cloudquery/issues/6559) +* Move AWS to use built-in transformations (no codegen) ([#6337](https://github.com/cloudquery/cloudquery/issues/6337)) ([926d278](https://github.com/cloudquery/cloudquery/commit/926d2788a2108097288519709d951ce5dc47a1c3)) + + +### Bug Fixes + +* **aws:** Enable Partial Resolution of Lambda ([#6391](https://github.com/cloudquery/cloudquery/issues/6391)) ([e96a410](https://github.com/cloudquery/cloudquery/commit/e96a410394568145d80cddf73c16b59fe83f408d)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/config to v1.18.8 ([#6393](https://github.com/cloudquery/cloudquery/issues/6393)) ([ffba44f](https://github.com/cloudquery/cloudquery/commit/ffba44f1318eb401d2b7ce2fa91c155d8925d90d)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.47 ([#6395](https://github.com/cloudquery/cloudquery/issues/6395)) ([71ec9b9](https://github.com/cloudquery/cloudquery/commit/71ec9b99328ae4b7b0739a0c22258a805b586948)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/accessanalyzer to v1.19.0 ([#6396](https://github.com/cloudquery/cloudquery/issues/6396)) ([f19a34c](https://github.com/cloudquery/cloudquery/commit/f19a34cc0fa7897379d3d7e80432b26a0ad73f9e)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/account to v1.8.0 ([#6397](https://github.com/cloudquery/cloudquery/issues/6397)) ([98a7681](https://github.com/cloudquery/cloudquery/commit/98a76815f1d1b98dd2278dfc0d57b775345ea46a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/acm to v1.17.0 ([#6398](https://github.com/cloudquery/cloudquery/issues/6398)) ([f59f6bd](https://github.com/cloudquery/cloudquery/commit/f59f6bda99e6fce0209d106db7b6389d9ec21700)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/amp to v1.16.0 ([#6399](https://github.com/cloudquery/cloudquery/issues/6399)) ([128ae76](https://github.com/cloudquery/cloudquery/commit/128ae76a9cd921c9b63e9a02c9d5261077e814b8)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigateway to v1.16.0 ([#6400](https://github.com/cloudquery/cloudquery/issues/6400)) ([4570f15](https://github.com/cloudquery/cloudquery/commit/4570f15b08f46c6a2b3e8b258bb17abb2a8b688f)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigatewayv2 to v1.13.0 ([#6401](https://github.com/cloudquery/cloudquery/issues/6401)) ([ca3b156](https://github.com/cloudquery/cloudquery/commit/ca3b1565fe5800637c03dfe892b56fea36418451)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.16.0 ([#6360](https://github.com/cloudquery/cloudquery/issues/6360)) ([afa651e](https://github.com/cloudquery/cloudquery/commit/afa651e3357170e3f4a19149c0ecadde0c4a0cca)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.17.0 ([#6402](https://github.com/cloudquery/cloudquery/issues/6402)) ([5c239ed](https://github.com/cloudquery/cloudquery/commit/5c239ed5b1294aa1356e45fcc74382eaad970a0c)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apprunner to v1.16.0 ([#6403](https://github.com/cloudquery/cloudquery/issues/6403)) ([a312c4b](https://github.com/cloudquery/cloudquery/commit/a312c4b03bca32f9c158e08d4c19984859a0a546)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appstream to v1.19.0 ([#6404](https://github.com/cloudquery/cloudquery/issues/6404)) ([1cd08e1](https://github.com/cloudquery/cloudquery/commit/1cd08e1591674c78ce3f688bd8b601ba4994cd96)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appsync to v1.18.0 ([#6405](https://github.com/cloudquery/cloudquery/issues/6405)) ([76d4df5](https://github.com/cloudquery/cloudquery/commit/76d4df52517fcac585b9759045b3a1f650e6af7c)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/athena to v1.22.0 ([#6406](https://github.com/cloudquery/cloudquery/issues/6406)) ([815a0f9](https://github.com/cloudquery/cloudquery/commit/815a0f9a5cff400f4e8cc23ba53584b115817bac)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/autoscaling to v1.26.0 ([#6407](https://github.com/cloudquery/cloudquery/issues/6407)) ([26e995c](https://github.com/cloudquery/cloudquery/commit/26e995cbdbe73a7e42926b62e4f85e9689cf67a8)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/backup to v1.19.0 ([#6408](https://github.com/cloudquery/cloudquery/issues/6408)) ([01accc8](https://github.com/cloudquery/cloudquery/commit/01accc866a6f3020883ac50edf7bf979a73149df)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudformation to v1.25.0 ([#6409](https://github.com/cloudquery/cloudquery/issues/6409)) ([89ffac6](https://github.com/cloudquery/cloudquery/commit/89ffac690b18edb055cc892ab341907d7c8b27d4)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudfront to v1.24.0 ([#6410](https://github.com/cloudquery/cloudquery/issues/6410)) ([74a96fb](https://github.com/cloudquery/cloudquery/commit/74a96fb2e34202369d357b51c8d44aa130e2ad95)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 to v1.14.0 ([#6411](https://github.com/cloudquery/cloudquery/issues/6411)) ([d12e25c](https://github.com/cloudquery/cloudquery/commit/d12e25cadf8e37d9a33269241c4a5ed14c04be83)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudtrail to v1.22.0 ([#6412](https://github.com/cloudquery/cloudquery/issues/6412)) ([c1765b8](https://github.com/cloudquery/cloudquery/commit/c1765b859c644487b035ca52077f9764ccf80a2a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatch to v1.24.0 ([#6413](https://github.com/cloudquery/cloudquery/issues/6413)) ([c6324f3](https://github.com/cloudquery/cloudquery/commit/c6324f382f040b959819f5a6bcd8a93fd0b4530c)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.17.4 ([#6359](https://github.com/cloudquery/cloudquery/issues/6359)) ([8ca9085](https://github.com/cloudquery/cloudquery/commit/8ca9085225f996bd3fc77f4bff4c76790d68ad3b)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.18.0 ([#6414](https://github.com/cloudquery/cloudquery/issues/6414)) ([35b62ac](https://github.com/cloudquery/cloudquery/commit/35b62acbc10ee60318260e06a3ef74445ec14772)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codebuild to v1.20.0 ([#6444](https://github.com/cloudquery/cloudquery/issues/6444)) ([b91ca03](https://github.com/cloudquery/cloudquery/commit/b91ca037c14a6e228ef0e95d54757757f505b747)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codepipeline to v1.14.0 ([#6445](https://github.com/cloudquery/cloudquery/issues/6445)) ([bb7d3f2](https://github.com/cloudquery/cloudquery/commit/bb7d3f29aef0ff6b8307664f2546cf9f497b3e6a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentity to v1.15.0 ([#6446](https://github.com/cloudquery/cloudquery/issues/6446)) ([c93c305](https://github.com/cloudquery/cloudquery/commit/c93c3059e570dbace6a6cf18f0f48b8dcfcff449)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider to v1.22.0 ([#6447](https://github.com/cloudquery/cloudquery/issues/6447)) ([4ffbfd5](https://github.com/cloudquery/cloudquery/commit/4ffbfd52267bb6386527d8f23df671b2752cbbde)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/configservice to v1.29.0 ([#6448](https://github.com/cloudquery/cloudquery/issues/6448)) ([2433cbe](https://github.com/cloudquery/cloudquery/commit/2433cbe134d1f5041eb7cfb7e08dbfa783f47f6a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice to v1.23.0 ([#6449](https://github.com/cloudquery/cloudquery/issues/6449)) ([9c2bb7c](https://github.com/cloudquery/cloudquery/commit/9c2bb7c22a0cb5c8fd38708c311386bc6e36f19f)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dax to v1.12.0 ([#6450](https://github.com/cloudquery/cloudquery/issues/6450)) ([da537c6](https://github.com/cloudquery/cloudquery/commit/da537c6d28a10e4334ca42a2180bae763159146b)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/directconnect to v1.18.0 ([#6451](https://github.com/cloudquery/cloudquery/issues/6451)) ([89e34fe](https://github.com/cloudquery/cloudquery/commit/89e34fe8db2ffb40b6b1a6373e13db28346b3f6e)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/docdb to v1.20.0 ([#6452](https://github.com/cloudquery/cloudquery/issues/6452)) ([472536a](https://github.com/cloudquery/cloudquery/commit/472536a5a39c2d9176adbe3db2ca2f4b192ff2df)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.18.0 ([#6453](https://github.com/cloudquery/cloudquery/issues/6453)) ([561db49](https://github.com/cloudquery/cloudquery/commit/561db492f96428cc50e6e8dbaa5afb1ee5f8eadf)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecr to v1.18.0 ([#6454](https://github.com/cloudquery/cloudquery/issues/6454)) ([ecdbe98](https://github.com/cloudquery/cloudquery/commit/ecdbe985cc0834d3bc60708b48ef9769dd9a2a52)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecrpublic to v1.14.0 ([#6455](https://github.com/cloudquery/cloudquery/issues/6455)) ([7984da9](https://github.com/cloudquery/cloudquery/commit/7984da97223ad938d141c0be2aac09557cc89bcd)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecs to v1.23.0 ([#6456](https://github.com/cloudquery/cloudquery/issues/6456)) ([94b8b4c](https://github.com/cloudquery/cloudquery/commit/94b8b4c4dfc0c1c8bab2e05d5db59d1793193753)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/efs to v1.19.0 ([#6457](https://github.com/cloudquery/cloudquery/issues/6457)) ([a56841a](https://github.com/cloudquery/cloudquery/commit/a56841ae4b07aa42f20ccd556d54f2e7824f97aa)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eks to v1.27.0 ([#6458](https://github.com/cloudquery/cloudquery/issues/6458)) ([4a74a54](https://github.com/cloudquery/cloudquery/commit/4a74a54e138f5271727281fbaeb5afaa5ff38303)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticache to v1.26.0 ([#6459](https://github.com/cloudquery/cloudquery/issues/6459)) ([5c70e45](https://github.com/cloudquery/cloudquery/commit/5c70e455c721bab217ca7ef5bc4b9e58de25fb60)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk to v1.15.0 ([#6460](https://github.com/cloudquery/cloudquery/issues/6460)) ([3333cfb](https://github.com/cloudquery/cloudquery/commit/3333cfb377deebedd278632540987f1c9988b281)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing to v1.15.0 ([#6461](https://github.com/cloudquery/cloudquery/issues/6461)) ([d72d213](https://github.com/cloudquery/cloudquery/commit/d72d213e3daabf1ac4520866136bcb5990fb7531)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 to v1.19.0 ([#6462](https://github.com/cloudquery/cloudquery/issues/6462)) ([57ba804](https://github.com/cloudquery/cloudquery/commit/57ba8046dab6ab21110326a36ba3b6cf2e9a026e)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice to v1.18.0 ([#6463](https://github.com/cloudquery/cloudquery/issues/6463)) ([e282e84](https://github.com/cloudquery/cloudquery/commit/e282e8476eea9345fd7a41a72ee4eaaa2f26351a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elastictranscoder to v1.14.0 ([#6464](https://github.com/cloudquery/cloudquery/issues/6464)) ([163a581](https://github.com/cloudquery/cloudquery/commit/163a58103ff3a5454c83e82fca0685ecd9ee2192)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/emr to v1.22.0 ([#6465](https://github.com/cloudquery/cloudquery/issues/6465)) ([f149f08](https://github.com/cloudquery/cloudquery/commit/f149f084163145ec03023122161e39899f2ab763)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eventbridge to v1.17.0 ([#6473](https://github.com/cloudquery/cloudquery/issues/6473)) ([188848f](https://github.com/cloudquery/cloudquery/commit/188848f482ef1f0657fd78203dfa279709bff53b)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/firehose to v1.16.0 ([#6474](https://github.com/cloudquery/cloudquery/issues/6474)) ([de60adb](https://github.com/cloudquery/cloudquery/commit/de60adb2c5ffa8eea22e202089d25f01bff373b6)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/frauddetector to v1.21.0 ([#6475](https://github.com/cloudquery/cloudquery/issues/6475)) ([19b154a](https://github.com/cloudquery/cloudquery/commit/19b154ac1da2e3792a8a25a4f6c11f4fb9dabc86)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/fsx to v1.28.0 ([#6476](https://github.com/cloudquery/cloudquery/issues/6476)) ([7b39554](https://github.com/cloudquery/cloudquery/commit/7b39554e05b53e7ae54679c19f36e71d45fcb3c8)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glacier to v1.14.0 ([#6477](https://github.com/cloudquery/cloudquery/issues/6477)) ([8d0887f](https://github.com/cloudquery/cloudquery/commit/8d0887fb4a1d48b0e7b5b8e8b1732f7aa57a7142)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glue to v1.39.0 ([#6478](https://github.com/cloudquery/cloudquery/issues/6478)) ([4001267](https://github.com/cloudquery/cloudquery/commit/4001267f92b58fbd6069a170a6173b80f8d53417)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/guardduty to v1.17.0 ([#6479](https://github.com/cloudquery/cloudquery/issues/6479)) ([651dfe4](https://github.com/cloudquery/cloudquery/commit/651dfe437778b2e3df663a33c4787fba5b0ab61d)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iam to v1.19.0 ([#6480](https://github.com/cloudquery/cloudquery/issues/6480)) ([30cf79d](https://github.com/cloudquery/cloudquery/commit/30cf79d234d86dc3ab36350ebcbdca9696174d03)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/identitystore to v1.16.0 ([#6481](https://github.com/cloudquery/cloudquery/issues/6481)) ([c7dd4a6](https://github.com/cloudquery/cloudquery/commit/c7dd4a64734ad60be65a9c31d823d311f53ddd7e)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector to v1.13.0 ([#6482](https://github.com/cloudquery/cloudquery/issues/6482)) ([e628a51](https://github.com/cloudquery/cloudquery/commit/e628a51e8912222ec5a6a44b1dc117768cce30d5)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector2 to v1.11.0 ([#6483](https://github.com/cloudquery/cloudquery/issues/6483)) ([fe8fd70](https://github.com/cloudquery/cloudquery/commit/fe8fd70ca0f1782f734f1e45730ca09384b86664)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iot to v1.33.0 ([#6484](https://github.com/cloudquery/cloudquery/issues/6484)) ([d66ca25](https://github.com/cloudquery/cloudquery/commit/d66ca2585ac6a61a963e80d4b3e5fc0b59713260)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kafka to v1.19.0 ([#6485](https://github.com/cloudquery/cloudquery/issues/6485)) ([acb2683](https://github.com/cloudquery/cloudquery/commit/acb26838a6d09ce9581224964de386e56caae3a9)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kinesis to v1.17.0 ([#6486](https://github.com/cloudquery/cloudquery/issues/6486)) ([31b551f](https://github.com/cloudquery/cloudquery/commit/31b551f89e3e48e8e669e2ae960205d06d5fba4b)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kms to v1.20.0 ([#6487](https://github.com/cloudquery/cloudquery/issues/6487)) ([5a8b81d](https://github.com/cloudquery/cloudquery/commit/5a8b81da157189a9ec92522b06992b20b969bc6c)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lambda to v1.27.0 ([#6488](https://github.com/cloudquery/cloudquery/issues/6488)) ([de83eda](https://github.com/cloudquery/cloudquery/commit/de83edafcafd92df94ad9dc23967ffc0f278d3c8)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lightsail to v1.25.0 ([#6489](https://github.com/cloudquery/cloudquery/issues/6489)) ([99ce478](https://github.com/cloudquery/cloudquery/commit/99ce47890a9d303537eb833e60a95fa1f63495cc)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mq to v1.14.0 ([#6490](https://github.com/cloudquery/cloudquery/issues/6490)) ([d5b465c](https://github.com/cloudquery/cloudquery/commit/d5b465cf656c706fdf588657f6e31fd2dbe40021)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mwaa to v1.14.0 ([#6491](https://github.com/cloudquery/cloudquery/issues/6491)) ([c565b0a](https://github.com/cloudquery/cloudquery/commit/c565b0aa691019c1a11058b062fa2d2a30bceb7c)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/neptune to v1.19.0 ([#6492](https://github.com/cloudquery/cloudquery/issues/6492)) ([d373abd](https://github.com/cloudquery/cloudquery/commit/d373abd5031631885e6c59a904f11459a337b156)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/organizations to v1.18.0 ([#6495](https://github.com/cloudquery/cloudquery/issues/6495)) ([bbb2457](https://github.com/cloudquery/cloudquery/commit/bbb2457db330818f24496719f4bceb32384bc9cb)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/qldb to v1.15.0 ([#6496](https://github.com/cloudquery/cloudquery/issues/6496)) ([5f01dcf](https://github.com/cloudquery/cloudquery/commit/5f01dcfaf5b4c07f05905e9b25adea9482270379)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/quicksight to v1.29.0 ([#6497](https://github.com/cloudquery/cloudquery/issues/6497)) ([6c6788c](https://github.com/cloudquery/cloudquery/commit/6c6788c677dc7632f01dd029c155c8c7ce18c622)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ram to v1.17.0 ([#6498](https://github.com/cloudquery/cloudquery/issues/6498)) ([306bcc5](https://github.com/cloudquery/cloudquery/commit/306bcc5d81b2b86014ab5b2cf08d59f9951c2426)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/rds to v1.39.0 ([#6499](https://github.com/cloudquery/cloudquery/issues/6499)) ([ed4cd10](https://github.com/cloudquery/cloudquery/commit/ed4cd10e81c576f1c03c6c77400db17a673db843)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/redshift to v1.27.0 ([#6500](https://github.com/cloudquery/cloudquery/issues/6500)) ([4c82e8b](https://github.com/cloudquery/cloudquery/commit/4c82e8be4121cd1e9c6025ee5e1c55021ca35ca8)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/resourcegroups to v1.13.0 ([#6501](https://github.com/cloudquery/cloudquery/issues/6501)) ([9efd121](https://github.com/cloudquery/cloudquery/commit/9efd1217a33b38944f91e64f0e3cfc50c3ce2d82)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53 to v1.26.0 ([#6502](https://github.com/cloudquery/cloudquery/issues/6502)) ([135dc6b](https://github.com/cloudquery/cloudquery/commit/135dc6b79f07e6af16aa44f18c19b8b585e2152f)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53domains to v1.14.0 ([#6503](https://github.com/cloudquery/cloudquery/issues/6503)) ([ba2aa9e](https://github.com/cloudquery/cloudquery/commit/ba2aa9e975664b4249c093c329a7c5f9d2884bae)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/s3control to v1.29.0 ([#6505](https://github.com/cloudquery/cloudquery/issues/6505)) ([47fa203](https://github.com/cloudquery/cloudquery/commit/47fa203c1be135d6e06ca6a39c580a502d24e29f)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sagemaker to v1.62.0 ([#6506](https://github.com/cloudquery/cloudquery/issues/6506)) ([57207cf](https://github.com/cloudquery/cloudquery/commit/57207cfd05228f8e257764cabee6b6f14b01d1c1)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/scheduler to v1.1.0 ([#6507](https://github.com/cloudquery/cloudquery/issues/6507)) ([a56a3e0](https://github.com/cloudquery/cloudquery/commit/a56a3e0b885b913d0cee5bc17e01350e967cf866)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/secretsmanager to v1.18.0 ([#6508](https://github.com/cloudquery/cloudquery/issues/6508)) ([83f6116](https://github.com/cloudquery/cloudquery/commit/83f6116fa8e4e355502a07850def33304059d08a)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalog to v1.16.0 ([#6509](https://github.com/cloudquery/cloudquery/issues/6509)) ([1e69f8d](https://github.com/cloudquery/cloudquery/commit/1e69f8dd2ea31117bbe0bd3ff2056eab849ccd67)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry to v1.16.0 ([#6510](https://github.com/cloudquery/cloudquery/issues/6510)) ([6a7f928](https://github.com/cloudquery/cloudquery/commit/6a7f928051691ca17e219af069d2422ed373cc33)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicequotas to v1.14.0 ([#6511](https://github.com/cloudquery/cloudquery/issues/6511)) ([d12e3b8](https://github.com/cloudquery/cloudquery/commit/d12e3b8a86b6d838935b0c0404e1041445ab5249)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ses to v1.15.0 ([#6512](https://github.com/cloudquery/cloudquery/issues/6512)) ([4f8863c](https://github.com/cloudquery/cloudquery/commit/4f8863cd922df654ef4860897ee22f8437192539)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sesv2 to v1.16.0 ([#6513](https://github.com/cloudquery/cloudquery/issues/6513)) ([a4987ae](https://github.com/cloudquery/cloudquery/commit/a4987ae191b9f5e660d29ca4a99f1469dd9e1fe7)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sfn to v1.17.0 ([#6514](https://github.com/cloudquery/cloudquery/issues/6514)) ([c8e7d9c](https://github.com/cloudquery/cloudquery/commit/c8e7d9cc72fd6ab71dc8916ef6ddc8902bf5b92b)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ssm to v1.34.0 ([#6361](https://github.com/cloudquery/cloudquery/issues/6361)) ([2413dba](https://github.com/cloudquery/cloudquery/commit/2413dba0ba477e5ba958c4c97e7d330275ea4323)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* Update endpoints ([#6327](https://github.com/cloudquery/cloudquery/issues/6327)) ([11d6973](https://github.com/cloudquery/cloudquery/commit/11d6973618a135c00f6232b3462a6f82cb501380)) +* Update endpoints ([#6440](https://github.com/cloudquery/cloudquery/issues/6440)) ([499f421](https://github.com/cloudquery/cloudquery/commit/499f421fa96b2d3c63f0679b32e00f98cc0da4b3)) +* Update endpoints ([#6558](https://github.com/cloudquery/cloudquery/issues/6558)) ([45c4753](https://github.com/cloudquery/cloudquery/commit/45c4753d3d81a799a46a6fdf8782c043b5666c77)) + ## [9.1.1](https://github.com/cloudquery/cloudquery/compare/plugins-source-aws-v9.1.0...plugins-source-aws-v9.1.1) (2023-01-03) From d089745836f4d6a3e862ea7a98e57fd5054fa970 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 13:43:25 +0200 Subject: [PATCH 175/221] chore: Update plugin `source-gcp` version to v6.1.1 (#6566) Updates the `source-gcp` plugin latest version to v6.1.1 Co-authored-by: cq-bot --- website/versions/source-gcp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gcp.json b/website/versions/source-gcp.json index 5b6667970fda4e..ec1728944172ff 100644 --- a/website/versions/source-gcp.json +++ b/website/versions/source-gcp.json @@ -1 +1 @@ -{ "latest": "plugins-source-gcp-v6.1.0" } +{ "latest": "plugins-source-gcp-v6.1.1" } From 31405aec106a1ea9eef7a05fc46cb5f6dfabebce Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 11:59:40 +0000 Subject: [PATCH 176/221] fix(deps): Update module github.com/cloudquery/plugin-sdk to v1.24.1 (#6563) Maybe a better title is needed. --- plugins/source/aws/client/client.go | 3 ++- plugins/source/aws/client/helpers.go | 6 +++--- plugins/source/aws/client/testing.go | 2 +- .../aws/docs/tables/aws_amp_rule_groups_namespaces.md | 2 +- .../source/aws/docs/tables/aws_iam_virtual_mfa_devices.md | 4 ++-- plugins/source/aws/go.mod | 2 +- plugins/source/aws/go.sum | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/source/aws/client/client.go b/plugins/source/aws/client/client.go index c3ed4e2a75ad7c..081d30c02904a1 100644 --- a/plugins/source/aws/client/client.go +++ b/plugins/source/aws/client/client.go @@ -19,6 +19,7 @@ import ( "github.com/aws/smithy-go" "github.com/aws/smithy-go/logging" "github.com/cloudquery/cloudquery/plugins/source/aws/client/services" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -312,7 +313,7 @@ func configureAwsClient(ctx context.Context, logger zerolog.Logger, awsConfig *S return awsCfg, err } -func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var awsConfig Spec err := spec.UnmarshalSpec(&awsConfig) if err != nil { diff --git a/plugins/source/aws/client/helpers.go b/plugins/source/aws/client/helpers.go index b75911f7b1b3dd..d2f2d1a694d09d 100644 --- a/plugins/source/aws/client/helpers.go +++ b/plugins/source/aws/client/helpers.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/smithy-go" - "github.com/cloudquery/plugin-sdk/codegen" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) type AWSService string @@ -400,7 +400,7 @@ func Sleep(ctx context.Context, dur time.Duration) error { func CreateTrimPrefixTransformer(prefixes ...string) func(field reflect.StructField) (string, error) { return func(field reflect.StructField) (string, error) { - name, err := codegen.DefaultNameTransformer(field) + name, err := transformers.DefaultNameTransformer(field) if err != nil { return "", err } @@ -415,7 +415,7 @@ func CreateTrimPrefixTransformer(prefixes ...string) func(field reflect.StructFi func CreateReplaceTransformer(replace map[string]string) func(field reflect.StructField) (string, error) { return func(field reflect.StructField) (string, error) { - name, err := codegen.DefaultNameTransformer(field) + name, err := transformers.DefaultNameTransformer(field) if err != nil { return "", err } diff --git a/plugins/source/aws/client/testing.go b/plugins/source/aws/client/testing.go index 80af6252114730..a69d874032aea0 100644 --- a/plugins/source/aws/client/testing.go +++ b/plugins/source/aws/client/testing.go @@ -26,7 +26,7 @@ func AwsMockTestHelper(t *testing.T, table *schema.Table, builder func(*testing. zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var awsSpec Spec if err := spec.UnmarshalSpec(&awsSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal aws spec: %w", err) diff --git a/plugins/source/aws/docs/tables/aws_amp_rule_groups_namespaces.md b/plugins/source/aws/docs/tables/aws_amp_rule_groups_namespaces.md index d3ddf2ab083fa3..9fbf0b89225b8e 100644 --- a/plugins/source/aws/docs/tables/aws_amp_rule_groups_namespaces.md +++ b/plugins/source/aws/docs/tables/aws_amp_rule_groups_namespaces.md @@ -21,7 +21,7 @@ This table depends on [aws_amp_workspaces](aws_amp_workspaces.md). |workspace_arn|String| |arn (PK)|String| |created_at|Timestamp| -|data|IntArray| +|data|ByteArray| |modified_at|Timestamp| |name|String| |status|JSON| diff --git a/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md b/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md index 61bea676a3808f..c9d1b5efb5408c 100644 --- a/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md +++ b/plugins/source/aws/docs/tables/aws_iam_virtual_mfa_devices.md @@ -15,7 +15,7 @@ The primary key for this table is **serial_number**. |account_id|String| |serial_number (PK)|String| |tags|JSON| -|base32_string_seed|IntArray| +|base32_string_seed|ByteArray| |enable_date|Timestamp| -|qr_code_png|IntArray| +|qr_code_png|ByteArray| |user|JSON| \ No newline at end of file diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 2803a72c20e4e4..ac0db686d6e999 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/xray v1.15.3 github.com/aws/smithy-go v1.13.5 github.com/basgys/goxml2json v1.1.0 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index ae186e38c2b12c..461337f4b2d423 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -270,8 +270,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= From c7000958ae5365da9cb6267ebd5dc389a12214a9 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:01:26 +0000 Subject: [PATCH 177/221] fix(heroku): Remove codegen, upgrade SDK (#6567) --- plugins/source/heroku/Makefile | 6 +- plugins/source/heroku/client/client.go | 3 +- plugins/source/heroku/client/testing.go | 2 +- plugins/source/heroku/codegen/main.go | 122 ------ .../source/heroku/codegen/recipes/recipes.go | 374 ------------------ .../templates/relational_resource_list.go.tpl | 53 --- .../relational_resource_list_mock_test.go.tpl | 58 --- .../codegen/templates/resource_list.go.tpl | 35 -- .../templates/resource_list_mock_test.go.tpl | 44 --- .../docs/tables/heroku_account_features.md | 2 +- .../docs/tables/heroku_add_on_attachments.md | 2 +- .../heroku_add_on_region_capabilities.md | 2 +- .../docs/tables/heroku_add_on_services.md | 2 +- .../heroku_add_on_webhook_deliveries.md | 2 +- .../tables/heroku_add_on_webhook_events.md | 2 +- .../docs/tables/heroku_add_on_webhooks.md | 2 +- .../heroku/docs/tables/heroku_add_ons.md | 2 +- .../heroku/docs/tables/heroku_app_features.md | 2 +- .../docs/tables/heroku_app_transfers.md | 2 +- .../tables/heroku_app_webhook_deliveries.md | 2 +- .../docs/tables/heroku_app_webhook_events.md | 2 +- .../heroku/docs/tables/heroku_app_webhooks.md | 2 +- .../source/heroku/docs/tables/heroku_apps.md | 2 +- .../heroku/docs/tables/heroku_builds.md | 2 +- .../docs/tables/heroku_collaborators.md | 2 +- .../heroku/docs/tables/heroku_credits.md | 2 +- .../heroku/docs/tables/heroku_domains.md | 2 +- .../heroku/docs/tables/heroku_dyno_sizes.md | 2 +- .../source/heroku/docs/tables/heroku_dynos.md | 2 +- .../heroku_enterprise_account_members.md | 2 +- .../docs/tables/heroku_enterprise_accounts.md | 2 +- .../heroku/docs/tables/heroku_formations.md | 2 +- .../docs/tables/heroku_inbound_rulesets.md | 2 +- .../heroku/docs/tables/heroku_invoices.md | 2 +- .../source/heroku/docs/tables/heroku_keys.md | 2 +- .../heroku/docs/tables/heroku_log_drains.md | 2 +- .../tables/heroku_oauth_authorizations.md | 2 +- .../docs/tables/heroku_oauth_clients.md | 2 +- .../docs/tables/heroku_outbound_rulesets.md | 2 +- .../docs/tables/heroku_pipeline_builds.md | 2 +- .../docs/tables/heroku_pipeline_couplings.md | 2 +- .../tables/heroku_pipeline_deployments.md | 2 +- .../docs/tables/heroku_pipeline_releases.md | 2 +- .../heroku/docs/tables/heroku_pipelines.md | 2 +- .../heroku/docs/tables/heroku_regions.md | 2 +- .../heroku/docs/tables/heroku_releases.md | 2 +- .../heroku/docs/tables/heroku_review_apps.md | 2 +- .../docs/tables/heroku_space_app_accesses.md | 2 +- .../heroku/docs/tables/heroku_spaces.md | 2 +- .../heroku/docs/tables/heroku_stacks.md | 2 +- .../docs/tables/heroku_team_features.md | 2 +- .../docs/tables/heroku_team_invitations.md | 2 +- .../docs/tables/heroku_team_invoices.md | 2 +- .../heroku/docs/tables/heroku_team_members.md | 2 +- .../heroku/docs/tables/heroku_team_spaces.md | 2 +- .../source/heroku/docs/tables/heroku_teams.md | 2 +- plugins/source/heroku/go.mod | 4 +- plugins/source/heroku/go.sum | 8 +- .../resources/services/account_feature.go | 52 +-- .../services/account_feature_mock_test.go | 2 - .../heroku/resources/services/add_on.go | 72 +--- .../resources/services/add_on_attachment.go | 47 +-- .../services/add_on_attachment_mock_test.go | 2 - .../resources/services/add_on_config.go | 22 +- .../services/add_on_config_mock_test.go | 2 - .../resources/services/add_on_mock_test.go | 2 - .../services/add_on_region_capability.go | 22 +- .../add_on_region_capability_mock_test.go | 2 - .../resources/services/add_on_service.go | 47 +-- .../services/add_on_service_mock_test.go | 2 - .../resources/services/add_on_webhook.go | 34 +- .../services/add_on_webhook_delivery.go | 49 +-- .../add_on_webhook_delivery_mock_test.go | 2 - .../services/add_on_webhook_event.go | 29 +- .../add_on_webhook_event_mock_test.go | 2 - .../services/add_on_webhook_mock_test.go | 2 - .../source/heroku/resources/services/app.go | 107 +---- .../heroku/resources/services/app_feature.go | 54 +-- .../services/app_feature_mock_test.go | 2 - .../resources/services/app_mock_test.go | 2 - .../heroku/resources/services/app_transfer.go | 37 +- .../services/app_transfer_mock_test.go | 2 - .../heroku/resources/services/app_webhook.go | 39 +- .../services/app_webhook_delivery.go | 49 +-- .../app_webhook_delivery_mock_test.go | 2 - .../resources/services/app_webhook_event.go | 29 +- .../services/app_webhook_event_mock_test.go | 2 - .../services/app_webhook_mock_test.go | 2 - .../source/heroku/resources/services/build.go | 64 +-- .../resources/services/build_mock_test.go | 2 - .../services/buildpack_installation.go | 22 +- .../buildpack_installation_mock_test.go | 2 - .../heroku/resources/services/collaborator.go | 39 +- .../services/collaborator_mock_test.go | 2 - .../heroku/resources/services/credit.go | 37 +- .../resources/services/credit_mock_test.go | 2 - .../heroku/resources/services/domain.go | 59 +-- .../resources/services/domain_mock_test.go | 2 - .../source/heroku/resources/services/dyno.go | 59 +-- .../resources/services/dyno_mock_test.go | 2 - .../heroku/resources/services/dyno_size.go | 42 +- .../resources/services/dyno_size_mock_test.go | 2 - .../resources/services/enterprise_account.go | 37 +- .../services/enterprise_account_member.go | 34 +- .../enterprise_account_member_mock_test.go | 2 - .../services/enterprise_account_mock_test.go | 2 - .../heroku/resources/services/formation.go | 44 +-- .../resources/services/formation_mock_test.go | 2 - .../resources/services/inbound_ruleset.go | 29 +- .../services/inbound_ruleset_mock_test.go | 2 - .../heroku/resources/services/invoice.go | 52 +-- .../resources/services/invoice_mock_test.go | 2 - .../source/heroku/resources/services/key.go | 37 +- .../resources/services/key_mock_test.go | 2 - .../heroku/resources/services/log_drain.go | 34 +- .../resources/services/log_drain_mock_test.go | 2 - .../services/o_auth_authorization.go | 47 +-- .../o_auth_authorization_mock_test.go | 2 - .../resources/services/o_auth_client.go | 37 +- .../services/o_auth_client_mock_test.go | 2 - .../resources/services/outbound_ruleset.go | 29 +- .../services/outbound_ruleset_mock_test.go | 2 - .../heroku/resources/services/peering.go | 52 +-- .../resources/services/peering_mock_test.go | 2 - .../resources/services/permission_entity.go | 29 +- .../services/permission_entity_mock_test.go | 2 - .../heroku/resources/services/pipeline.go | 27 +- .../resources/services/pipeline_build.go | 64 +-- .../services/pipeline_build_mock_test.go | 2 - .../resources/services/pipeline_coupling.go | 32 +- .../services/pipeline_coupling_mock_test.go | 2 - .../resources/services/pipeline_deployment.go | 64 +-- .../services/pipeline_deployment_mock_test.go | 2 - .../resources/services/pipeline_mock_test.go | 2 - .../resources/services/pipeline_release.go | 64 +-- .../services/pipeline_release_mock_test.go | 2 - .../heroku/resources/services/region.go | 47 +-- .../resources/services/region_mock_test.go | 2 - .../heroku/resources/services/release.go | 64 +-- .../resources/services/release_mock_test.go | 2 - .../heroku/resources/services/review_app.go | 74 +--- .../services/review_app_mock_test.go | 2 - .../source/heroku/resources/services/space.go | 57 +-- .../resources/services/space_app_access.go | 34 +- .../services/space_app_access_mock_test.go | 2 - .../resources/services/space_mock_test.go | 2 - .../source/heroku/resources/services/stack.go | 32 +- .../resources/services/stack_mock_test.go | 2 - .../source/heroku/resources/services/team.go | 62 +-- .../resources/services/team_app_permission.go | 20 +- .../services/team_app_permission_mock_test.go | 2 - .../heroku/resources/services/team_feature.go | 54 +-- .../services/team_feature_mock_test.go | 2 - .../resources/services/team_invitation.go | 39 +- .../services/team_invitation_mock_test.go | 2 - .../heroku/resources/services/team_invoice.go | 84 +--- .../services/team_invoice_mock_test.go | 2 - .../heroku/resources/services/team_member.go | 49 +-- .../services/team_member_mock_test.go | 2 - .../resources/services/team_mock_test.go | 2 - .../heroku/resources/services/team_space.go | 59 +-- .../services/team_space_mock_test.go | 2 - .../resources/services/vpn_connection.go | 49 +-- .../services/vpn_connection_mock_test.go | 2 - 164 files changed, 302 insertions(+), 3054 deletions(-) delete mode 100644 plugins/source/heroku/codegen/main.go delete mode 100644 plugins/source/heroku/codegen/recipes/recipes.go delete mode 100644 plugins/source/heroku/codegen/templates/relational_resource_list.go.tpl delete mode 100644 plugins/source/heroku/codegen/templates/relational_resource_list_mock_test.go.tpl delete mode 100644 plugins/source/heroku/codegen/templates/resource_list.go.tpl delete mode 100644 plugins/source/heroku/codegen/templates/resource_list_mock_test.go.tpl diff --git a/plugins/source/heroku/Makefile b/plugins/source/heroku/Makefile index bc013e2da5cfb6..3112c3291e0d34 100644 --- a/plugins/source/heroku/Makefile +++ b/plugins/source/heroku/Makefile @@ -24,10 +24,6 @@ gen-docs: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - go run codegen/main.go - # All gen targets .PHONY: gen -gen: gen-code gen-docs \ No newline at end of file +gen: gen-docs \ No newline at end of file diff --git a/plugins/source/heroku/client/client.go b/plugins/source/heroku/client/client.go index 199ef1eecd8818..8c50696938e6d9 100644 --- a/plugins/source/heroku/client/client.go +++ b/plugins/source/heroku/client/client.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" heroku "github.com/heroku/heroku-go/v5" @@ -27,7 +28,7 @@ func (c *Client) ID() string { return c.spec.Name } -func Configure(ctx context.Context, l zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, l zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var herokuSpec Spec if err := s.UnmarshalSpec(&herokuSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal heroku spec: %w", err) diff --git a/plugins/source/heroku/client/testing.go b/plugins/source/heroku/client/testing.go index e2ca09df40d478..c0e134adcacdd1 100644 --- a/plugins/source/heroku/client/testing.go +++ b/plugins/source/heroku/client/testing.go @@ -26,7 +26,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createService func() (*he zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { svc, err := createService() if err != nil { return nil, fmt.Errorf("failed to createService %w", err) diff --git a/plugins/source/heroku/codegen/main.go b/plugins/source/heroku/codegen/main.go deleted file mode 100644 index bdcd0cbc6b1b76..00000000000000 --- a/plugins/source/heroku/codegen/main.go +++ /dev/null @@ -1,122 +0,0 @@ -package main - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "log" - "os" - "path" - "runtime" - "text/template" - - "github.com/cloudquery/cloudquery/plugins/source/heroku/codegen/recipes" - sdkgen "github.com/cloudquery/plugin-sdk/codegen" - "github.com/iancoleman/strcase" - "github.com/jinzhu/inflection" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func main() { - clearServicesDirectory() - - resources := recipes.All() - for _, r := range resources { - generateResource(r, false) - generateResource(r, true) - } -} - -func clearServicesDirectory() { - _, filename, _, ok := runtime.Caller(0) - if !ok { - log.Fatal("Failed to get caller information") - } - dir := path.Dir(filename) - filePath := path.Join(dir, "../resources/services") - err := clearDirectory(filePath) - if err != nil { - log.Fatal(fmt.Errorf("failed to clear services directory: %w", err)) - } -} - -func clearDirectory(dir string) error { - entry, err := os.ReadDir(dir) - if err != nil { - return err - } - for _, e := range entry { - if e.IsDir() { - continue - } - err = os.Remove(path.Join(dir, e.Name())) - if err != nil { - return err - } - } - return nil -} - -func generateResource(r recipes.Resource, mock bool) { - var err error - _, filename, _, ok := runtime.Caller(0) - if !ok { - log.Fatal("Failed to get caller information") - } - dir := path.Dir(filename) - - tableName := fmt.Sprintf("heroku_%s", strcase.ToSnake(inflection.Plural(r.HerokuStructName))) - if r.TableName != "" { - tableName = r.TableName - } - r.Table, err = sdkgen.NewTableFromStruct(tableName, r.HerokuStruct) - if err != nil { - log.Fatal(err) - } - for i := range r.Table.Columns { - if r.Table.Columns[i].Name == r.PrimaryKey { - r.Table.Columns[i].Options.PrimaryKey = true - } - } - - r.Table.Resolver = "fetch" + inflection.Plural(r.HerokuStructName) - r.Table.Description = fmt.Sprintf("https://devcenter.heroku.com/articles/platform-api-reference#%s", strcase.ToKebab(r.HerokuStructName)) - mainTemplate := r.Template + ".go.tpl" - if mock { - mainTemplate = r.Template + "_mock_test.go.tpl" - } - tpl, err := template.New(mainTemplate).Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToSnake": strcase.ToSnake, - "Pluralize": inflection.Plural, - }).ParseFS(templatesFS, "templates/"+mainTemplate) - if err != nil { - log.Fatal(fmt.Errorf("failed to parse gcp templates: %w", err)) - } - tpl, err = tpl.ParseFS(sdkgen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - log.Fatal(fmt.Errorf("failed to parse recipes template: %w", err)) - } - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - log.Fatal(fmt.Errorf("failed to execute template: %w", err)) - } - filePath := path.Join(dir, "../resources/services") - fileName := strcase.ToSnake(r.HerokuStructName) - if mock { - filePath = path.Join(filePath, fileName+"_mock_test.go") - } else { - filePath = path.Join(filePath, fileName+".go") - } - content, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Println(buff.String()) - log.Fatal(fmt.Errorf("failed to format code for %s: %w", filePath, err)) - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - log.Fatal(fmt.Errorf("failed to write file %s: %w", filePath, err)) - } -} diff --git a/plugins/source/heroku/codegen/recipes/recipes.go b/plugins/source/heroku/codegen/recipes/recipes.go deleted file mode 100644 index a4b3d87a713f0e..00000000000000 --- a/plugins/source/heroku/codegen/recipes/recipes.go +++ /dev/null @@ -1,374 +0,0 @@ -package recipes - -import ( - "reflect" - - "github.com/cloudquery/plugin-sdk/codegen" - heroku "github.com/heroku/heroku-go/v5" -) - -type Resource struct { - // Table is the table definition that will be used to generate the cloudquery table - Table *codegen.TableDefinition - // TableName can be used to override the default generated table name - TableName string - // HerokuStruct that will be used to generate the cloudquery table - HerokuStruct any - // HerokuStructName is the name of the HerokuStruct because it can't be inferred by reflection - HerokuStructName string - // HerokuPrimaryStructName is the primary struct that will be listed first, then used as an ID in additional list calls - // (applies only to relational resources) - HerokuPrimaryStruct any - // HerokuPrimaryStructName is the name of the primary struct - // (applies only to relational resources) - HerokuPrimaryStructName string - // SkipListParams indicates whether to skip passing nil as params argument, or not - SkipListParams bool - // Template is the template to use to generate the resource - Template string - // SkipFields fields in go struct to skip when generating the table from the go struct - SkipFields []string - PrimaryKey string -} - -var listResources = []Resource{ - { - HerokuStruct: &heroku.AccountFeature{}, - }, - { - HerokuStruct: &heroku.AddOn{}, - }, - { - HerokuStruct: &heroku.AddOnAttachment{}, - }, - { - HerokuStruct: &heroku.AddOnConfig{}, - HerokuPrimaryStruct: &heroku.AddOn{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.AddOnRegionCapability{}, - }, - { - HerokuStruct: &heroku.AddOnService{}, - }, - { - HerokuStruct: &heroku.AddOnWebhook{}, - HerokuPrimaryStruct: &heroku.AddOn{}, - Template: "relational_resource_list", - }, - { - TableName: "heroku_add_on_webhook_deliveries", - HerokuStruct: &heroku.AddOnWebhookDeliveryInfoResult{}, - HerokuStructName: "AddOnWebhookDelivery", - HerokuPrimaryStruct: &heroku.AddOn{}, - Template: "relational_resource_list", - }, - { - TableName: "heroku_add_on_webhook_events", - HerokuStruct: &heroku.AddOnWebhookEventInfoResult{}, - HerokuStructName: "AddOnWebhookEvent", - HerokuPrimaryStruct: &heroku.AddOn{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.App{}, - }, - { - HerokuStruct: &heroku.AppFeature{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.AppTransfer{}, - }, - { - TableName: "heroku_app_webhooks", - HerokuStruct: &heroku.AppWebhookInfoResult{}, - HerokuStructName: "AppWebhook", - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.AppWebhookDelivery{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.AppWebhookEvent{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Build{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.BuildpackInstallation{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Collaborator{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Credit{}, - }, - { - HerokuStruct: &heroku.Domain{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Dyno{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.DynoSize{}, - }, - { - HerokuStruct: &heroku.EnterpriseAccount{}, - }, - { - HerokuStruct: &heroku.EnterpriseAccountMember{}, - HerokuPrimaryStruct: &heroku.EnterpriseAccount{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Formation{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.InboundRuleset{}, - HerokuPrimaryStruct: &heroku.Space{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Invoice{}, - }, - { - HerokuStruct: &heroku.Key{}, - }, - { - HerokuStruct: &heroku.LogDrain{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - TableName: "heroku_oauth_authorizations", - HerokuStruct: &heroku.OAuthAuthorization{}, - }, - { - TableName: "heroku_oauth_clients", - HerokuStruct: &heroku.OAuthClient{}, - }, - { - HerokuStruct: &heroku.OutboundRuleset{}, - HerokuPrimaryStruct: &heroku.Space{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Peering{}, - HerokuPrimaryStruct: &heroku.Space{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.PermissionEntity{}, - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Pipeline{}, - }, - { - TableName: "heroku_pipeline_builds", - HerokuStruct: &heroku.PipelineBuildListResult{{}}[0], - HerokuStructName: "PipelineBuild", - HerokuPrimaryStruct: &heroku.Pipeline{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.PipelineCoupling{}, - }, - { - TableName: "heroku_pipeline_deployments", - HerokuStruct: &heroku.PipelineDeploymentListResult{{}}[0], - HerokuStructName: "PipelineDeployment", - HerokuPrimaryStruct: &heroku.Pipeline{}, - Template: "relational_resource_list", - }, - { - TableName: "heroku_pipeline_releases", - HerokuStruct: &heroku.PipelineReleaseListResult{{}}[0], - HerokuStructName: "PipelineRelease", - HerokuPrimaryStruct: &heroku.Pipeline{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Region{}, - }, - { - HerokuStruct: &heroku.Release{}, - HerokuPrimaryStruct: &heroku.App{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.ReviewApp{}, - HerokuPrimaryStruct: &heroku.Pipeline{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Space{}, - }, - { - HerokuStruct: &heroku.SpaceAppAccess{}, - HerokuPrimaryStruct: &heroku.Space{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.Stack{}, - }, - { - HerokuStruct: &heroku.Team{}, - }, - { - HerokuStruct: &heroku.TeamAppPermission{}, - }, - { - HerokuStruct: &heroku.TeamFeature{}, - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.TeamInvitation{}, - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.TeamInvoice{}, - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.TeamMember{}, - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - TableName: "heroku_team_spaces", - HerokuStruct: &heroku.TeamSpaceListResult{{}}[0], - HerokuStructName: "TeamSpace", - HerokuPrimaryStruct: &heroku.Team{}, - Template: "relational_resource_list", - }, - { - HerokuStruct: &heroku.VPNConnection{}, - HerokuPrimaryStruct: &heroku.Space{}, - Template: "relational_resource_list", - }, - - // TODO: Add support for Archive - //{ - // HerokuStruct: &heroku.Archive{}, - // HerokuPrimaryStruct: &heroku.EnterpriseAccount{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for AuditTrailEvent. - // Its list call returns only a single item, which is probably - // a bug in the Heroku SDK. - //{ - // HerokuStruct: &heroku.AuditTrailEvent{}, - // HerokuPrimaryStruct: &heroku.EnterpriseAccount{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for PipelinePromotion - // Note: PipelinePromotion doesn't have a corresponding List call - //{ - // HerokuStruct: &heroku.PipelinePromotionTarget{}, - // HerokuPrimaryStruct: &heroku.PipelinePromotion{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for SniEndpoint - //{ - // HerokuStruct: &heroku.SniEndpoint{}, - // HerokuPrimaryStruct: &heroku.App{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for SSLEndpoint - //{ - // HerokuStruct: &heroku.SSLEndpoint{}, - // HerokuPrimaryStruct: &heroku.App{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for TeamApp - // NOTE: TeamApp only has TeamAppListByTeam - //{ - // HerokuStruct: &heroku.TeamApp{}, - //}, - // TODO: Add support for TeamAppCollaborator - //{ - // HerokuStruct: &heroku.TeamAppCollaborator{}, - // HerokuPrimaryStruct: &heroku.TeamApp{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for TeamPreferences - //{ - // HerokuStruct: &heroku.TeamPreferences{}, - // HerokuPrimaryStruct: &heroku.Team{}, - // Template: "relational_resource_list", - // SkipListParams: true, - //}, - // TODO: Add support for TestCase - //{ - // HerokuStruct: &heroku.TestCase{}, - // HerokuPrimaryStruct: &heroku.TestRun{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for TestNode - //{ - // HerokuStruct: &heroku.TestNode{}, - // HerokuPrimaryStruct: &heroku.TestRun{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for TestRun - //{ - // HerokuStruct: &heroku.TestRun{}, - // HerokuPrimaryStruct: &heroku.Pipeline{}, - // Template: "relational_resource_list", - //}, - // TODO: Add support for UserPreferences - // Note: no API function exists to list accounts, so preferences would - // only be for current user - //{ - // HerokuStruct: &heroku.UserPreferences{}, - // HerokuPrimaryStruct: &heroku.Account{}, - // Template: "relational_resource_list", - //}, -} - -func All() []Resource { - resources := listResources - // add all shared and default properties - for i, r := range resources { - if r.Template == "" { - r.Template = "resource_list" - } - if len(r.HerokuStructName) == 0 { - r.HerokuStructName = reflect.TypeOf(r.HerokuStruct).Elem().Name() - } - if r.HerokuPrimaryStruct != nil { - r.HerokuPrimaryStructName = reflect.TypeOf(r.HerokuPrimaryStruct).Elem().Name() - } - r.SkipFields = []string{} - if r.PrimaryKey == "" { - r.PrimaryKey = "id" - } - resources[i] = r - } - return resources -} diff --git a/plugins/source/heroku/codegen/templates/relational_resource_list.go.tpl b/plugins/source/heroku/codegen/templates/relational_resource_list.go.tpl deleted file mode 100644 index 6abce64a4c4db6..00000000000000 --- a/plugins/source/heroku/codegen/templates/relational_resource_list.go.tpl +++ /dev/null @@ -1,53 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package services - -import ( - "context" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/cloudquery/cloudquery/plugins/source/heroku/client" - "github.com/pkg/errors" - heroku "github.com/heroku/heroku-go/v5" -) - -func {{.HerokuStructName | Pluralize }}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} - - -func fetch{{.HerokuStructName | Pluralize }}(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { - c := meta.(*client.Client) - nextRange := &heroku.ListRange{ - Field: "id", - Max: 1000, - } - items := make([]heroku.{{.HerokuPrimaryStructName}}, 0, 10) - // Roundtripper middleware in client/pagination.go - // sets the nextRange value after each request - for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) - v, err := c.Heroku.{{.HerokuPrimaryStructName}}List(ctxWithRange, nextRange) - if err != nil { - return errors.WithStack(err) - } - items = append(items, v...) - } - - for _, it := range items { - nextRange = &heroku.ListRange{ - Field: "id", - Max: 1000, - } - // Roundtripper middleware in client/pagination.go - // sets the nextRange value after each request - for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) - v, err := c.Heroku.{{.HerokuStructName}}List(ctxWithRange, it.ID{{if not .SkipListParams}}, nextRange{{end}}) - if err != nil { - return errors.WithStack(err) - } - res <- v - } - } - return nil -} diff --git a/plugins/source/heroku/codegen/templates/relational_resource_list_mock_test.go.tpl b/plugins/source/heroku/codegen/templates/relational_resource_list_mock_test.go.tpl deleted file mode 100644 index 38629716d5992c..00000000000000 --- a/plugins/source/heroku/codegen/templates/relational_resource_list_mock_test.go.tpl +++ /dev/null @@ -1,58 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package services - -import ( - "encoding/json" - "net/http" - "net/http/httptest" - "testing" - - "github.com/cloudquery/plugin-sdk/faker" - "github.com/cloudquery/cloudquery/plugins/source/heroku/client" - "github.com/julienschmidt/httprouter" - heroku "github.com/heroku/heroku-go/v5" -) - -func create{{.HerokuStructName | Pluralize }}() (*heroku.Service, error) { - primaryItems := make(heroku.{{.HerokuPrimaryStructName}}ListResult, 1) - if err := faker.FakeObject(&primaryItems); err != nil { - return nil, err - } - items := make(heroku.{{.HerokuStructName}}ListResult, 1) - if err := faker.FakeObject(&items); err != nil { - return nil, err - } - mux := httprouter.New() - calls := 0 - mux.GET("/*any", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - var b []byte - var err error - if calls == 0 { - // return primary items on first call - b, err = json.Marshal(primaryItems) - } else { - // return secondary items on subsequent calls - b, err = json.Marshal(items) - } - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - calls++ - }) - ts := httptest.NewServer(mux) - c := *heroku.DefaultClient - c.Transport = client.NewPaginator(ts.Client().Transport) - s := heroku.NewService(&c) - s.URL = ts.URL - return s, nil -} - -func Test{{.HerokuStructName}}(t *testing.T) { - client.MockTestHelper(t, {{.HerokuStructName | Pluralize}}(), create{{.HerokuStructName | Pluralize }}, client.TestOptions{}) -} diff --git a/plugins/source/heroku/codegen/templates/resource_list.go.tpl b/plugins/source/heroku/codegen/templates/resource_list.go.tpl deleted file mode 100644 index a4e87f88a64c77..00000000000000 --- a/plugins/source/heroku/codegen/templates/resource_list.go.tpl +++ /dev/null @@ -1,35 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package services - -import ( - "context" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/cloudquery/cloudquery/plugins/source/heroku/client" - "github.com/pkg/errors" - heroku "github.com/heroku/heroku-go/v5" -) - -func {{.HerokuStructName | Pluralize }}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} - - -func fetch{{.HerokuStructName | Pluralize }}(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { - c := meta.(*client.Client) - nextRange := &heroku.ListRange{ - Field: "id", - Max: 1000, - } - // Roundtripper middleware in client/pagination.go - // sets the nextRange value after each request - for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) - v, err := c.Heroku.{{.HerokuStructName}}List(ctxWithRange, nextRange) - if err != nil { - return errors.WithStack(err) - } - res <- v - } - return nil -} diff --git a/plugins/source/heroku/codegen/templates/resource_list_mock_test.go.tpl b/plugins/source/heroku/codegen/templates/resource_list_mock_test.go.tpl deleted file mode 100644 index 79044240f1c55e..00000000000000 --- a/plugins/source/heroku/codegen/templates/resource_list_mock_test.go.tpl +++ /dev/null @@ -1,44 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package services - -import ( - "encoding/json" - "net/http" - "net/http/httptest" - "testing" - - "github.com/cloudquery/plugin-sdk/faker" - "github.com/cloudquery/cloudquery/plugins/source/heroku/client" - "github.com/julienschmidt/httprouter" - heroku "github.com/heroku/heroku-go/v5" -) - -func create{{.HerokuStructName | Pluralize }}() (*heroku.Service, error) { - items := make(heroku.{{.HerokuStructName}}ListResult, 1) - if err := faker.FakeObject(&items); err != nil { - return nil, err - } - mux := httprouter.New() - mux.GET("/*any", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { - b, err := json.Marshal(items) - if err != nil { - http.Error(w, "unable to marshal request: "+err.Error(), http.StatusBadRequest) - return - } - if _, err := w.Write(b); err != nil { - http.Error(w, "failed to write", http.StatusBadRequest) - return - } - }) - ts := httptest.NewServer(mux) - c := *heroku.DefaultClient - c.Transport = client.NewPaginator(ts.Client().Transport) - s := heroku.NewService(&c) - s.URL = ts.URL - return s, nil -} - -func Test{{.HerokuStructName}}(t *testing.T) { - client.MockTestHelper(t, {{.HerokuStructName | Pluralize}}(), create{{.HerokuStructName | Pluralize }}, client.TestOptions{}) -} diff --git a/plugins/source/heroku/docs/tables/heroku_account_features.md b/plugins/source/heroku/docs/tables/heroku_account_features.md index c8f08a78c7bb63..7f42c52bbc3c00 100644 --- a/plugins/source/heroku/docs/tables/heroku_account_features.md +++ b/plugins/source/heroku/docs/tables/heroku_account_features.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |description|String| |display_name|String| |doc_url|String| |enabled|Bool| |feedback_email|String| -|id (PK)|String| |name|String| |state|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_attachments.md b/plugins/source/heroku/docs/tables/heroku_add_on_attachments.md index f51c80fa5c90c0..3bdde2ea65473d 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_attachments.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_attachments.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addon|JSON| |app|JSON| |created_at|Timestamp| -|id (PK)|String| |log_input_url|String| |name|String| |namespace|String| diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_region_capabilities.md b/plugins/source/heroku/docs/tables/heroku_add_on_region_capabilities.md index ea0e90722fb0cf..5780423cc4ace3 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_region_capabilities.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_region_capabilities.md @@ -12,7 +12,7 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|addon_service|JSON| |id (PK)|String| +|addon_service|JSON| |region|JSON| |supports_private_networking|Bool| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_services.md b/plugins/source/heroku/docs/tables/heroku_add_on_services.md index 8698b94879c042..4303953e4b3509 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_services.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_services.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |cli_plugin_name|String| |created_at|Timestamp| |human_name|String| -|id (PK)|String| |name|String| |state|String| |supports_multiple_installations|Bool| diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_webhook_deliveries.md b/plugins/source/heroku/docs/tables/heroku_add_on_webhook_deliveries.md index fa4115c9ab82ba..5f080d314c34ac 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_webhook_deliveries.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_webhook_deliveries.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |event|JSON| -|id (PK)|String| |last_attempt|JSON| |next_attempt_at|Timestamp| |num_attempts|Int| diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_webhook_events.md b/plugins/source/heroku/docs/tables/heroku_add_on_webhook_events.md index 3c7fae4fb67353..507b9e10e65e23 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_webhook_events.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_webhook_events.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |include|String| |payload|JSON| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_add_on_webhooks.md b/plugins/source/heroku/docs/tables/heroku_add_on_webhooks.md index c9e19687db4185..49ba5b1a1978ac 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_on_webhooks.md +++ b/plugins/source/heroku/docs/tables/heroku_add_on_webhooks.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |include|StringArray| |level|String| |updated_at|Timestamp| diff --git a/plugins/source/heroku/docs/tables/heroku_add_ons.md b/plugins/source/heroku/docs/tables/heroku_add_ons.md index de7d7209f6186a..e19681d2fa1e1d 100644 --- a/plugins/source/heroku/docs/tables/heroku_add_ons.md +++ b/plugins/source/heroku/docs/tables/heroku_add_ons.md @@ -12,6 +12,7 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |actions|JSON| |addon_service|JSON| |app|JSON| @@ -19,7 +20,6 @@ The primary key for this table is **id**. |billing_entity|JSON| |config_vars|StringArray| |created_at|Timestamp| -|id (PK)|String| |name|String| |plan|JSON| |provider_id|String| diff --git a/plugins/source/heroku/docs/tables/heroku_app_features.md b/plugins/source/heroku/docs/tables/heroku_app_features.md index b9c7d52f5f3fe5..203a887970abe9 100644 --- a/plugins/source/heroku/docs/tables/heroku_app_features.md +++ b/plugins/source/heroku/docs/tables/heroku_app_features.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |description|String| |display_name|String| |doc_url|String| |enabled|Bool| |feedback_email|String| -|id (PK)|String| |name|String| |state|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_app_transfers.md b/plugins/source/heroku/docs/tables/heroku_app_transfers.md index df869e34679685..428eb2554af937 100644 --- a/plugins/source/heroku/docs/tables/heroku_app_transfers.md +++ b/plugins/source/heroku/docs/tables/heroku_app_transfers.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |created_at|Timestamp| -|id (PK)|String| |owner|JSON| |recipient|JSON| |state|String| diff --git a/plugins/source/heroku/docs/tables/heroku_app_webhook_deliveries.md b/plugins/source/heroku/docs/tables/heroku_app_webhook_deliveries.md index 4162d0debddccd..ee2e5949dc617f 100644 --- a/plugins/source/heroku/docs/tables/heroku_app_webhook_deliveries.md +++ b/plugins/source/heroku/docs/tables/heroku_app_webhook_deliveries.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |event|JSON| -|id (PK)|String| |last_attempt|JSON| |next_attempt_at|Timestamp| |num_attempts|Int| diff --git a/plugins/source/heroku/docs/tables/heroku_app_webhook_events.md b/plugins/source/heroku/docs/tables/heroku_app_webhook_events.md index d1a34a3e2d2f56..08be83e0f628b4 100644 --- a/plugins/source/heroku/docs/tables/heroku_app_webhook_events.md +++ b/plugins/source/heroku/docs/tables/heroku_app_webhook_events.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |include|String| |payload|JSON| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_app_webhooks.md b/plugins/source/heroku/docs/tables/heroku_app_webhooks.md index bab334f9088daa..b8a6b8987727cc 100644 --- a/plugins/source/heroku/docs/tables/heroku_app_webhooks.md +++ b/plugins/source/heroku/docs/tables/heroku_app_webhooks.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |created_at|Timestamp| -|id (PK)|String| |include|StringArray| |level|String| |updated_at|Timestamp| diff --git a/plugins/source/heroku/docs/tables/heroku_apps.md b/plugins/source/heroku/docs/tables/heroku_apps.md index 2cb8ecceb1b14a..715394b618ce83 100644 --- a/plugins/source/heroku/docs/tables/heroku_apps.md +++ b/plugins/source/heroku/docs/tables/heroku_apps.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |acm|Bool| |archived_at|Timestamp| |build_stack|JSON| |buildpack_provided_description|String| |created_at|Timestamp| |git_url|String| -|id (PK)|String| |internal_routing|Bool| |maintenance|Bool| |name|String| diff --git a/plugins/source/heroku/docs/tables/heroku_builds.md b/plugins/source/heroku/docs/tables/heroku_builds.md index b99945ff465a14..444e63bbd429cd 100644 --- a/plugins/source/heroku/docs/tables/heroku_builds.md +++ b/plugins/source/heroku/docs/tables/heroku_builds.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |buildpacks|JSON| |created_at|Timestamp| -|id (PK)|String| |output_stream_url|String| |release|JSON| |slug|JSON| diff --git a/plugins/source/heroku/docs/tables/heroku_collaborators.md b/plugins/source/heroku/docs/tables/heroku_collaborators.md index 1dad279b0d6117..ce9a381e97991f 100644 --- a/plugins/source/heroku/docs/tables/heroku_collaborators.md +++ b/plugins/source/heroku/docs/tables/heroku_collaborators.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |created_at|Timestamp| -|id (PK)|String| |permissions|JSON| |role|String| |updated_at|Timestamp| diff --git a/plugins/source/heroku/docs/tables/heroku_credits.md b/plugins/source/heroku/docs/tables/heroku_credits.md index 56c2f199e1fa9b..f10b1e2fe1014b 100644 --- a/plugins/source/heroku/docs/tables/heroku_credits.md +++ b/plugins/source/heroku/docs/tables/heroku_credits.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |amount|Float| |balance|Float| |created_at|Timestamp| |expires_at|Timestamp| -|id (PK)|String| |title|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_domains.md b/plugins/source/heroku/docs/tables/heroku_domains.md index 055883c07dead2..ce5e576caef5b5 100644 --- a/plugins/source/heroku/docs/tables/heroku_domains.md +++ b/plugins/source/heroku/docs/tables/heroku_domains.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |acm_status|String| |acm_status_reason|String| |app|JSON| |cname|String| |created_at|Timestamp| |hostname|String| -|id (PK)|String| |kind|String| |sni_endpoint|JSON| |status|String| diff --git a/plugins/source/heroku/docs/tables/heroku_dyno_sizes.md b/plugins/source/heroku/docs/tables/heroku_dyno_sizes.md index 3183a6f49fcd78..d8bd34235ee009 100644 --- a/plugins/source/heroku/docs/tables/heroku_dyno_sizes.md +++ b/plugins/source/heroku/docs/tables/heroku_dyno_sizes.md @@ -12,11 +12,11 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |compute|Int| |cost|JSON| |dedicated|Bool| |dyno_units|Int| -|id (PK)|String| |memory|Float| |name|String| |private_space_only|Bool| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_dynos.md b/plugins/source/heroku/docs/tables/heroku_dynos.md index de06e1aab0d5f3..eb9ba8f2f4ccfb 100644 --- a/plugins/source/heroku/docs/tables/heroku_dynos.md +++ b/plugins/source/heroku/docs/tables/heroku_dynos.md @@ -12,11 +12,11 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |attach_url|String| |command|String| |created_at|Timestamp| -|id (PK)|String| |name|String| |release|JSON| |size|String| diff --git a/plugins/source/heroku/docs/tables/heroku_enterprise_account_members.md b/plugins/source/heroku/docs/tables/heroku_enterprise_account_members.md index 326a1c8d5bd702..f0c903ed2fd3c3 100644 --- a/plugins/source/heroku/docs/tables/heroku_enterprise_account_members.md +++ b/plugins/source/heroku/docs/tables/heroku_enterprise_account_members.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|enterprise_account|JSON| |id (PK)|String| +|enterprise_account|JSON| |identity_provider|JSON| |permissions|JSON| |two_factor_authentication|Bool| diff --git a/plugins/source/heroku/docs/tables/heroku_enterprise_accounts.md b/plugins/source/heroku/docs/tables/heroku_enterprise_accounts.md index f4f950112750f3..001f037d240e55 100644 --- a/plugins/source/heroku/docs/tables/heroku_enterprise_accounts.md +++ b/plugins/source/heroku/docs/tables/heroku_enterprise_accounts.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |identity_provider|JSON| |name|String| |permissions|StringArray| diff --git a/plugins/source/heroku/docs/tables/heroku_formations.md b/plugins/source/heroku/docs/tables/heroku_formations.md index 2b6618540f6d76..41ca8f5d677d93 100644 --- a/plugins/source/heroku/docs/tables/heroku_formations.md +++ b/plugins/source/heroku/docs/tables/heroku_formations.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |command|String| |created_at|Timestamp| -|id (PK)|String| |quantity|Int| |size|String| |type|String| diff --git a/plugins/source/heroku/docs/tables/heroku_inbound_rulesets.md b/plugins/source/heroku/docs/tables/heroku_inbound_rulesets.md index 9664cce616db87..981b351fdd7a29 100644 --- a/plugins/source/heroku/docs/tables/heroku_inbound_rulesets.md +++ b/plugins/source/heroku/docs/tables/heroku_inbound_rulesets.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |created_by|String| -|id (PK)|String| |rules|JSON| |space|JSON| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_invoices.md b/plugins/source/heroku/docs/tables/heroku_invoices.md index 7c2172e180ad4f..c0dfbd860de63f 100644 --- a/plugins/source/heroku/docs/tables/heroku_invoices.md +++ b/plugins/source/heroku/docs/tables/heroku_invoices.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |charges_total|Float| |created_at|Timestamp| |credits_total|Float| -|id (PK)|String| |number|Int| |period_end|String| |period_start|String| diff --git a/plugins/source/heroku/docs/tables/heroku_keys.md b/plugins/source/heroku/docs/tables/heroku_keys.md index cac32f5faeece6..050e717c73d61f 100644 --- a/plugins/source/heroku/docs/tables/heroku_keys.md +++ b/plugins/source/heroku/docs/tables/heroku_keys.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |comment|String| |created_at|Timestamp| |email|String| |fingerprint|String| -|id (PK)|String| |public_key|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_log_drains.md b/plugins/source/heroku/docs/tables/heroku_log_drains.md index 651cff19bff759..9c87a38f5a16a8 100644 --- a/plugins/source/heroku/docs/tables/heroku_log_drains.md +++ b/plugins/source/heroku/docs/tables/heroku_log_drains.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addon|JSON| |created_at|Timestamp| -|id (PK)|String| |token|String| |updated_at|Timestamp| |url|String| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_oauth_authorizations.md b/plugins/source/heroku/docs/tables/heroku_oauth_authorizations.md index 4324d0b87983d0..6c42877203bb5b 100644 --- a/plugins/source/heroku/docs/tables/heroku_oauth_authorizations.md +++ b/plugins/source/heroku/docs/tables/heroku_oauth_authorizations.md @@ -12,11 +12,11 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |access_token|JSON| |client|JSON| |created_at|Timestamp| |grant|JSON| -|id (PK)|String| |refresh_token|JSON| |scope|StringArray| |updated_at|Timestamp| diff --git a/plugins/source/heroku/docs/tables/heroku_oauth_clients.md b/plugins/source/heroku/docs/tables/heroku_oauth_clients.md index 7286bb19cafed3..113be309cf31a7 100644 --- a/plugins/source/heroku/docs/tables/heroku_oauth_clients.md +++ b/plugins/source/heroku/docs/tables/heroku_oauth_clients.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |ignores_delinquent|Bool| |name|String| |redirect_uri|String| diff --git a/plugins/source/heroku/docs/tables/heroku_outbound_rulesets.md b/plugins/source/heroku/docs/tables/heroku_outbound_rulesets.md index 2187efa3c143bb..3e6f3afde34797 100644 --- a/plugins/source/heroku/docs/tables/heroku_outbound_rulesets.md +++ b/plugins/source/heroku/docs/tables/heroku_outbound_rulesets.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |created_by|String| -|id (PK)|String| |rules|JSON| |space|JSON| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_pipeline_builds.md b/plugins/source/heroku/docs/tables/heroku_pipeline_builds.md index 5b5202ddd0968c..7716e59f8c79b8 100644 --- a/plugins/source/heroku/docs/tables/heroku_pipeline_builds.md +++ b/plugins/source/heroku/docs/tables/heroku_pipeline_builds.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |buildpacks|JSON| |created_at|Timestamp| -|id (PK)|String| |output_stream_url|String| |release|JSON| |slug|JSON| diff --git a/plugins/source/heroku/docs/tables/heroku_pipeline_couplings.md b/plugins/source/heroku/docs/tables/heroku_pipeline_couplings.md index 06d51291fdf97f..86a2b0801191a4 100644 --- a/plugins/source/heroku/docs/tables/heroku_pipeline_couplings.md +++ b/plugins/source/heroku/docs/tables/heroku_pipeline_couplings.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |created_at|Timestamp| -|id (PK)|String| |pipeline|JSON| |stage|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_pipeline_deployments.md b/plugins/source/heroku/docs/tables/heroku_pipeline_deployments.md index 8df5a5228295d2..c94d46a66b6d56 100644 --- a/plugins/source/heroku/docs/tables/heroku_pipeline_deployments.md +++ b/plugins/source/heroku/docs/tables/heroku_pipeline_deployments.md @@ -12,12 +12,12 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addon_plan_names|StringArray| |app|JSON| |created_at|Timestamp| |current|Bool| |description|String| -|id (PK)|String| |output_stream_url|String| |slug|JSON| |status|String| diff --git a/plugins/source/heroku/docs/tables/heroku_pipeline_releases.md b/plugins/source/heroku/docs/tables/heroku_pipeline_releases.md index 63b612ef81c4f3..1eb8630c0edd47 100644 --- a/plugins/source/heroku/docs/tables/heroku_pipeline_releases.md +++ b/plugins/source/heroku/docs/tables/heroku_pipeline_releases.md @@ -12,12 +12,12 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addon_plan_names|StringArray| |app|JSON| |created_at|Timestamp| |current|Bool| |description|String| -|id (PK)|String| |output_stream_url|String| |slug|JSON| |status|String| diff --git a/plugins/source/heroku/docs/tables/heroku_pipelines.md b/plugins/source/heroku/docs/tables/heroku_pipelines.md index 430ae24e682d3c..3b1ca9204e8a44 100644 --- a/plugins/source/heroku/docs/tables/heroku_pipelines.md +++ b/plugins/source/heroku/docs/tables/heroku_pipelines.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |name|String| |owner|JSON| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_regions.md b/plugins/source/heroku/docs/tables/heroku_regions.md index 71144f3ccbd5ba..6ab692ee141d89 100644 --- a/plugins/source/heroku/docs/tables/heroku_regions.md +++ b/plugins/source/heroku/docs/tables/heroku_regions.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |country|String| |created_at|Timestamp| |description|String| -|id (PK)|String| |locale|String| |name|String| |private_capable|Bool| diff --git a/plugins/source/heroku/docs/tables/heroku_releases.md b/plugins/source/heroku/docs/tables/heroku_releases.md index a4666faa85c7db..34505a76939165 100644 --- a/plugins/source/heroku/docs/tables/heroku_releases.md +++ b/plugins/source/heroku/docs/tables/heroku_releases.md @@ -12,12 +12,12 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addon_plan_names|StringArray| |app|JSON| |created_at|Timestamp| |current|Bool| |description|String| -|id (PK)|String| |output_stream_url|String| |slug|JSON| |status|String| diff --git a/plugins/source/heroku/docs/tables/heroku_review_apps.md b/plugins/source/heroku/docs/tables/heroku_review_apps.md index 00172047d709bf..97e9b7437334ce 100644 --- a/plugins/source/heroku/docs/tables/heroku_review_apps.md +++ b/plugins/source/heroku/docs/tables/heroku_review_apps.md @@ -12,6 +12,7 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |app|JSON| |app_setup|JSON| |branch|String| @@ -19,7 +20,6 @@ The primary key for this table is **id**. |creator|JSON| |error_status|String| |fork_repo|JSON| -|id (PK)|String| |message|String| |pipeline|JSON| |pr_number|Int| diff --git a/plugins/source/heroku/docs/tables/heroku_space_app_accesses.md b/plugins/source/heroku/docs/tables/heroku_space_app_accesses.md index 67509063c14623..2df8dfe81b124a 100644 --- a/plugins/source/heroku/docs/tables/heroku_space_app_accesses.md +++ b/plugins/source/heroku/docs/tables/heroku_space_app_accesses.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |permissions|JSON| |space|JSON| |updated_at|Timestamp| diff --git a/plugins/source/heroku/docs/tables/heroku_spaces.md b/plugins/source/heroku/docs/tables/heroku_spaces.md index 8aa333e42fea3f..54659cfb94f2ba 100644 --- a/plugins/source/heroku/docs/tables/heroku_spaces.md +++ b/plugins/source/heroku/docs/tables/heroku_spaces.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |cidr|String| |created_at|Timestamp| |data_cidr|String| -|id (PK)|String| |name|String| |organization|JSON| |region|JSON| diff --git a/plugins/source/heroku/docs/tables/heroku_stacks.md b/plugins/source/heroku/docs/tables/heroku_stacks.md index 33dff479907a64..b0b7c3d68493d4 100644 --- a/plugins/source/heroku/docs/tables/heroku_stacks.md +++ b/plugins/source/heroku/docs/tables/heroku_stacks.md @@ -12,9 +12,9 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |default|Bool| -|id (PK)|String| |name|String| |state|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_team_features.md b/plugins/source/heroku/docs/tables/heroku_team_features.md index 81e014624e2427..61a0cb530d80f5 100644 --- a/plugins/source/heroku/docs/tables/heroku_team_features.md +++ b/plugins/source/heroku/docs/tables/heroku_team_features.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |description|String| |display_name|String| |doc_url|String| |enabled|Bool| |feedback_email|String| -|id (PK)|String| |name|String| |state|String| |updated_at|Timestamp| \ No newline at end of file diff --git a/plugins/source/heroku/docs/tables/heroku_team_invitations.md b/plugins/source/heroku/docs/tables/heroku_team_invitations.md index d803857cf1a9cd..b937c72885460c 100644 --- a/plugins/source/heroku/docs/tables/heroku_team_invitations.md +++ b/plugins/source/heroku/docs/tables/heroku_team_invitations.md @@ -12,8 +12,8 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| -|created_at|Timestamp| |id (PK)|String| +|created_at|Timestamp| |invited_by|JSON| |role|String| |team|JSON| diff --git a/plugins/source/heroku/docs/tables/heroku_team_invoices.md b/plugins/source/heroku/docs/tables/heroku_team_invoices.md index ce53bf0cb2fb31..0f7f345aa2e261 100644 --- a/plugins/source/heroku/docs/tables/heroku_team_invoices.md +++ b/plugins/source/heroku/docs/tables/heroku_team_invoices.md @@ -12,13 +12,13 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |addons_total|Int| |charges_total|Int| |created_at|Timestamp| |credits_total|Int| |database_total|Int| |dyno_units|Float| -|id (PK)|String| |number|Int| |payment_status|String| |period_end|String| diff --git a/plugins/source/heroku/docs/tables/heroku_team_members.md b/plugins/source/heroku/docs/tables/heroku_team_members.md index 5b3ed8cb2fe884..bb52c7e8114126 100644 --- a/plugins/source/heroku/docs/tables/heroku_team_members.md +++ b/plugins/source/heroku/docs/tables/heroku_team_members.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |email|String| |federated|Bool| -|id (PK)|String| |identity_provider|JSON| |role|String| |two_factor_authentication|Bool| diff --git a/plugins/source/heroku/docs/tables/heroku_team_spaces.md b/plugins/source/heroku/docs/tables/heroku_team_spaces.md index aa8bb8d2086b4e..0ee01cf5167cfb 100644 --- a/plugins/source/heroku/docs/tables/heroku_team_spaces.md +++ b/plugins/source/heroku/docs/tables/heroku_team_spaces.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |cidr|String| |created_at|Timestamp| |data_cidr|String| -|id (PK)|String| |name|String| |organization|JSON| |region|JSON| diff --git a/plugins/source/heroku/docs/tables/heroku_teams.md b/plugins/source/heroku/docs/tables/heroku_teams.md index 0d057e04313c7c..21f3ff64239925 100644 --- a/plugins/source/heroku/docs/tables/heroku_teams.md +++ b/plugins/source/heroku/docs/tables/heroku_teams.md @@ -12,11 +12,11 @@ The primary key for this table is **id**. |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| |created_at|Timestamp| |credit_card_collections|Bool| |default|Bool| |enterprise_account|JSON| -|id (PK)|String| |identity_provider|JSON| |membership_limit|Float| |name|String| diff --git a/plugins/source/heroku/go.mod b/plugins/source/heroku/go.mod index 1808c744cd5ace..a4cd381964d0f3 100644 --- a/plugins/source/heroku/go.mod +++ b/plugins/source/heroku/go.mod @@ -3,12 +3,10 @@ module github.com/cloudquery/cloudquery/plugins/source/heroku go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/go-cmp v0.5.9 github.com/googleapis/gax-go/v2 v2.7.0 github.com/heroku/heroku-go/v5 v5.5.0 - github.com/iancoleman/strcase v0.2.0 - github.com/jinzhu/inflection v1.0.0 github.com/julienschmidt/httprouter v1.3.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/heroku/go.sum b/plugins/source/heroku/go.sum index d092567f612c57..1849902cc09297 100644 --- a/plugins/source/heroku/go.sum +++ b/plugins/source/heroku/go.sum @@ -49,8 +49,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -144,14 +144,10 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/heroku/heroku-go/v5 v5.5.0 h1:+pKHpiPskqkkarrPHF7RpeUveXl+mAsKLAEI/ZIY9uA= github.com/heroku/heroku-go/v5 v5.5.0/go.mod h1:Uo3XhGPwaTpniR4X1e50BDjg4SzdFk2Bd2mgYZVkfHo= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= diff --git a/plugins/source/heroku/resources/services/account_feature.go b/plugins/source/heroku/resources/services/account_feature.go index 72bcf8734bfb45..52dea3000250cb 100644 --- a/plugins/source/heroku/resources/services/account_feature.go +++ b/plugins/source/heroku/resources/services/account_feature.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func AccountFeatures() *schema.Table { Name: "heroku_account_features", Description: `https://devcenter.heroku.com/articles/platform-api-reference#account-feature`, Resolver: fetchAccountFeatures, + Transform: transformers.TransformWithStruct(&heroku.AccountFeature{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "doc_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocURL"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "feedback_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeedbackEmail"), - }, { Name: "id", Type: schema.TypeString, @@ -54,21 +25,6 @@ func AccountFeatures() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -82,7 +38,7 @@ func fetchAccountFeatures(ctx context.Context, meta schema.ClientMeta, _ *schema // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AccountFeatureList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/account_feature_mock_test.go b/plugins/source/heroku/resources/services/account_feature_mock_test.go index 01810f0858d3a7..01e8d0ddd09491 100644 --- a/plugins/source/heroku/resources/services/account_feature_mock_test.go +++ b/plugins/source/heroku/resources/services/account_feature_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on.go b/plugins/source/heroku/resources/services/add_on.go index 59e89f6e44ba1e..223b58976eb542 100644 --- a/plugins/source/heroku/resources/services/add_on.go +++ b/plugins/source/heroku/resources/services/add_on.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,42 +15,8 @@ func AddOns() *schema.Table { Name: "heroku_add_ons", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on`, Resolver: fetchAddOns, + Transform: transformers.TransformWithStruct(&heroku.AddOn{}), Columns: []schema.Column{ - { - Name: "actions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Actions"), - }, - { - Name: "addon_service", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AddonService"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "billed_price", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BilledPrice"), - }, - { - Name: "billing_entity", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BillingEntity"), - }, - { - Name: "config_vars", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("ConfigVars"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -59,36 +25,6 @@ func AddOns() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "plan", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Plan"), - }, - { - Name: "provider_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProviderID"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "web_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebURL"), - }, }, } } @@ -102,7 +38,7 @@ func fetchAddOns(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_attachment.go b/plugins/source/heroku/resources/services/add_on_attachment.go index 3caadd8a01d440..1a02de67d47212 100644 --- a/plugins/source/heroku/resources/services/add_on_attachment.go +++ b/plugins/source/heroku/resources/services/add_on_attachment.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func AddOnAttachments() *schema.Table { Name: "heroku_add_on_attachments", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-attachment`, Resolver: fetchAddOnAttachments, + Transform: transformers.TransformWithStruct(&heroku.AddOnAttachment{}), Columns: []schema.Column{ - { - Name: "addon", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Addon"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -39,31 +25,6 @@ func AddOnAttachments() *schema.Table { PrimaryKey: true, }, }, - { - Name: "log_input_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("LogInputURL"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "namespace", - Type: schema.TypeString, - Resolver: schema.PathResolver("Namespace"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "web_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebURL"), - }, }, } } @@ -77,7 +38,7 @@ func fetchAddOnAttachments(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnAttachmentList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_attachment_mock_test.go b/plugins/source/heroku/resources/services/add_on_attachment_mock_test.go index 308c311434ac1e..dfadf20f4d5064 100644 --- a/plugins/source/heroku/resources/services/add_on_attachment_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_attachment_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_config.go b/plugins/source/heroku/resources/services/add_on_config.go index 7bab760209199e..bb5123716332e0 100644 --- a/plugins/source/heroku/resources/services/add_on_config.go +++ b/plugins/source/heroku/resources/services/add_on_config.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,18 +15,8 @@ func AddOnConfigs() *schema.Table { Name: "heroku_add_on_configs", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-config`, Resolver: fetchAddOnConfigs, - Columns: []schema.Column{ - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, - }, + Transform: transformers.TransformWithStruct(&heroku.AddOnConfig{}), + Columns: []schema.Column{}, } } @@ -40,7 +30,7 @@ func fetchAddOnConfigs(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -56,7 +46,7 @@ func fetchAddOnConfigs(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnConfigList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_config_mock_test.go b/plugins/source/heroku/resources/services/add_on_config_mock_test.go index 0e3d0253bfdd11..b0dfc160fe62e2 100644 --- a/plugins/source/heroku/resources/services/add_on_config_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_config_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_mock_test.go b/plugins/source/heroku/resources/services/add_on_mock_test.go index fe1bea2d6809a9..b5deea641f3960 100644 --- a/plugins/source/heroku/resources/services/add_on_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_region_capability.go b/plugins/source/heroku/resources/services/add_on_region_capability.go index 4066108c767440..d0ab4208aa27f2 100644 --- a/plugins/source/heroku/resources/services/add_on_region_capability.go +++ b/plugins/source/heroku/resources/services/add_on_region_capability.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func AddOnRegionCapabilities() *schema.Table { Name: "heroku_add_on_region_capabilities", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-region-capability`, Resolver: fetchAddOnRegionCapabilities, + Transform: transformers.TransformWithStruct(&heroku.AddOnRegionCapability{}), Columns: []schema.Column{ - { - Name: "addon_service", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AddonService"), - }, { Name: "id", Type: schema.TypeString, @@ -29,16 +25,6 @@ func AddOnRegionCapabilities() *schema.Table { PrimaryKey: true, }, }, - { - Name: "region", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "supports_private_networking", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsPrivateNetworking"), - }, }, } } @@ -52,7 +38,7 @@ func fetchAddOnRegionCapabilities(ctx context.Context, meta schema.ClientMeta, _ // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnRegionCapabilityList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_region_capability_mock_test.go b/plugins/source/heroku/resources/services/add_on_region_capability_mock_test.go index e46032ab14354c..7be64e2238c8a1 100644 --- a/plugins/source/heroku/resources/services/add_on_region_capability_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_region_capability_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_service.go b/plugins/source/heroku/resources/services/add_on_service.go index 42a571ded3edd4..0afc0f361aac77 100644 --- a/plugins/source/heroku/resources/services/add_on_service.go +++ b/plugins/source/heroku/resources/services/add_on_service.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func AddOnServices() *schema.Table { Name: "heroku_add_on_services", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-service`, Resolver: fetchAddOnServices, + Transform: transformers.TransformWithStruct(&heroku.AddOnService{}), Columns: []schema.Column{ - { - Name: "cli_plugin_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("CliPluginName"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "human_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("HumanName"), - }, { Name: "id", Type: schema.TypeString, @@ -39,31 +25,6 @@ func AddOnServices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "supports_multiple_installations", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsMultipleInstallations"), - }, - { - Name: "supports_sharing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("SupportsSharing"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -77,7 +38,7 @@ func fetchAddOnServices(ctx context.Context, meta schema.ClientMeta, _ *schema.R // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnServiceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_service_mock_test.go b/plugins/source/heroku/resources/services/add_on_service_mock_test.go index bfb1b737d8b15a..115d0a4cfec4d4 100644 --- a/plugins/source/heroku/resources/services/add_on_service_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_service_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_webhook.go b/plugins/source/heroku/resources/services/add_on_webhook.go index e35395efd8a138..8ab76ad1d17d9d 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook.go +++ b/plugins/source/heroku/resources/services/add_on_webhook.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func AddOnWebhooks() *schema.Table { Name: "heroku_add_on_webhooks", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-webhook`, Resolver: fetchAddOnWebhooks, + Transform: transformers.TransformWithStruct(&heroku.AddOnWebhook{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,26 +25,6 @@ func AddOnWebhooks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "include", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Include"), - }, - { - Name: "level", - Type: schema.TypeString, - Resolver: schema.PathResolver("Level"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, }, } } @@ -63,7 +39,7 @@ func fetchAddOnWebhooks(ctx context.Context, meta schema.ClientMeta, _ *schema.R // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -79,7 +55,7 @@ func fetchAddOnWebhooks(ctx context.Context, meta schema.ClientMeta, _ *schema.R // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnWebhookList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_webhook_delivery.go b/plugins/source/heroku/resources/services/add_on_webhook_delivery.go index 90a68f2a808261..5a25130cc3c8b0 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook_delivery.go +++ b/plugins/source/heroku/resources/services/add_on_webhook_delivery.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func AddOnWebhookDeliveries() *schema.Table { Name: "heroku_add_on_webhook_deliveries", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-webhook-delivery`, Resolver: fetchAddOnWebhookDeliveries, + Transform: transformers.TransformWithStruct(&heroku.AddOnWebhookDeliveryInfoResult{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "event", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Event"), - }, { Name: "id", Type: schema.TypeString, @@ -34,36 +25,6 @@ func AddOnWebhookDeliveries() *schema.Table { PrimaryKey: true, }, }, - { - Name: "last_attempt", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastAttempt"), - }, - { - Name: "next_attempt_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NextAttemptAt"), - }, - { - Name: "num_attempts", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumAttempts"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "webhook", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Webhook"), - }, }, } } @@ -78,7 +39,7 @@ func fetchAddOnWebhookDeliveries(ctx context.Context, meta schema.ClientMeta, _ // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -94,7 +55,7 @@ func fetchAddOnWebhookDeliveries(ctx context.Context, meta schema.ClientMeta, _ // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnWebhookDeliveryList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_webhook_delivery_mock_test.go b/plugins/source/heroku/resources/services/add_on_webhook_delivery_mock_test.go index d8d4a70d450785..52c1ce83451fb9 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook_delivery_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_webhook_delivery_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_webhook_event.go b/plugins/source/heroku/resources/services/add_on_webhook_event.go index 4a4df53f235812..40334a3ba12d07 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook_event.go +++ b/plugins/source/heroku/resources/services/add_on_webhook_event.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func AddOnWebhookEvents() *schema.Table { Name: "heroku_add_on_webhook_events", Description: `https://devcenter.heroku.com/articles/platform-api-reference#add-on-webhook-event`, Resolver: fetchAddOnWebhookEvents, + Transform: transformers.TransformWithStruct(&heroku.AddOnWebhookEventInfoResult{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,21 +25,6 @@ func AddOnWebhookEvents() *schema.Table { PrimaryKey: true, }, }, - { - Name: "include", - Type: schema.TypeString, - Resolver: schema.PathResolver("Include"), - }, - { - Name: "payload", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Payload"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -58,7 +39,7 @@ func fetchAddOnWebhookEvents(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -74,7 +55,7 @@ func fetchAddOnWebhookEvents(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AddOnWebhookEventList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/add_on_webhook_event_mock_test.go b/plugins/source/heroku/resources/services/add_on_webhook_event_mock_test.go index 6e96ed0a6b321f..04d63a7d1607b4 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook_event_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_webhook_event_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/add_on_webhook_mock_test.go b/plugins/source/heroku/resources/services/add_on_webhook_mock_test.go index 93061e5a190a88..968dc68edb3412 100644 --- a/plugins/source/heroku/resources/services/add_on_webhook_mock_test.go +++ b/plugins/source/heroku/resources/services/add_on_webhook_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app.go b/plugins/source/heroku/resources/services/app.go index f7a1bfb2f93f8a..a7b64a71c8ae86 100644 --- a/plugins/source/heroku/resources/services/app.go +++ b/plugins/source/heroku/resources/services/app.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func Apps() *schema.Table { Name: "heroku_apps", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app`, Resolver: fetchApps, + Transform: transformers.TransformWithStruct(&heroku.App{}), Columns: []schema.Column{ - { - Name: "acm", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Acm"), - }, - { - Name: "archived_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ArchivedAt"), - }, - { - Name: "build_stack", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("BuildStack"), - }, - { - Name: "buildpack_provided_description", - Type: schema.TypeString, - Resolver: schema.PathResolver("BuildpackProvidedDescription"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "git_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("GitURL"), - }, { Name: "id", Type: schema.TypeString, @@ -54,76 +25,6 @@ func Apps() *schema.Table { PrimaryKey: true, }, }, - { - Name: "internal_routing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("InternalRouting"), - }, - { - Name: "maintenance", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Maintenance"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "organization", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Organization"), - }, - { - Name: "owner", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "region", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "released_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ReleasedAt"), - }, - { - Name: "repo_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("RepoSize"), - }, - { - Name: "slug_size", - Type: schema.TypeInt, - Resolver: schema.PathResolver("SlugSize"), - }, - { - Name: "space", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Space"), - }, - { - Name: "stack", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Stack"), - }, - { - Name: "team", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Team"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "web_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("WebURL"), - }, }, } } @@ -137,7 +38,7 @@ func fetchApps(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_feature.go b/plugins/source/heroku/resources/services/app_feature.go index 947fbbac02239a..afdaaf90654f64 100644 --- a/plugins/source/heroku/resources/services/app_feature.go +++ b/plugins/source/heroku/resources/services/app_feature.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func AppFeatures() *schema.Table { Name: "heroku_app_features", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app-feature`, Resolver: fetchAppFeatures, + Transform: transformers.TransformWithStruct(&heroku.AppFeature{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "doc_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocURL"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "feedback_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeedbackEmail"), - }, { Name: "id", Type: schema.TypeString, @@ -54,21 +25,6 @@ func AppFeatures() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -83,7 +39,7 @@ func fetchAppFeatures(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -99,7 +55,7 @@ func fetchAppFeatures(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppFeatureList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_feature_mock_test.go b/plugins/source/heroku/resources/services/app_feature_mock_test.go index 37e67946727745..8fbd1aabb9d5e1 100644 --- a/plugins/source/heroku/resources/services/app_feature_mock_test.go +++ b/plugins/source/heroku/resources/services/app_feature_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app_mock_test.go b/plugins/source/heroku/resources/services/app_mock_test.go index 56c5a9b1288f00..34aba3b04b5348 100644 --- a/plugins/source/heroku/resources/services/app_mock_test.go +++ b/plugins/source/heroku/resources/services/app_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app_transfer.go b/plugins/source/heroku/resources/services/app_transfer.go index aae30cc2a6040c..078c40fc85a7aa 100644 --- a/plugins/source/heroku/resources/services/app_transfer.go +++ b/plugins/source/heroku/resources/services/app_transfer.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func AppTransfers() *schema.Table { Name: "heroku_app_transfers", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app-transfer`, Resolver: fetchAppTransfers, + Transform: transformers.TransformWithStruct(&heroku.AppTransfer{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -34,26 +25,6 @@ func AppTransfers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "owner", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "recipient", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Recipient"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -67,7 +38,7 @@ func fetchAppTransfers(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppTransferList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_transfer_mock_test.go b/plugins/source/heroku/resources/services/app_transfer_mock_test.go index 0973a8ec62c54d..3e67219db57434 100644 --- a/plugins/source/heroku/resources/services/app_transfer_mock_test.go +++ b/plugins/source/heroku/resources/services/app_transfer_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app_webhook.go b/plugins/source/heroku/resources/services/app_webhook.go index fdcf83ed6ff29b..2c4e22310e7e9b 100644 --- a/plugins/source/heroku/resources/services/app_webhook.go +++ b/plugins/source/heroku/resources/services/app_webhook.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func AppWebhooks() *schema.Table { Name: "heroku_app_webhooks", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app-webhook`, Resolver: fetchAppWebhooks, + Transform: transformers.TransformWithStruct(&heroku.AppWebhookInfoResult{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -34,26 +25,6 @@ func AppWebhooks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "include", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Include"), - }, - { - Name: "level", - Type: schema.TypeString, - Resolver: schema.PathResolver("Level"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, }, } } @@ -68,7 +39,7 @@ func fetchAppWebhooks(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -84,7 +55,7 @@ func fetchAppWebhooks(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppWebhookList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_webhook_delivery.go b/plugins/source/heroku/resources/services/app_webhook_delivery.go index 0ccb5be793a0c1..f22ef11059773a 100644 --- a/plugins/source/heroku/resources/services/app_webhook_delivery.go +++ b/plugins/source/heroku/resources/services/app_webhook_delivery.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func AppWebhookDeliveries() *schema.Table { Name: "heroku_app_webhook_deliveries", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app-webhook-delivery`, Resolver: fetchAppWebhookDeliveries, + Transform: transformers.TransformWithStruct(&heroku.AppWebhookDelivery{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "event", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Event"), - }, { Name: "id", Type: schema.TypeString, @@ -34,36 +25,6 @@ func AppWebhookDeliveries() *schema.Table { PrimaryKey: true, }, }, - { - Name: "last_attempt", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LastAttempt"), - }, - { - Name: "next_attempt_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("NextAttemptAt"), - }, - { - Name: "num_attempts", - Type: schema.TypeInt, - Resolver: schema.PathResolver("NumAttempts"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "webhook", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Webhook"), - }, }, } } @@ -78,7 +39,7 @@ func fetchAppWebhookDeliveries(ctx context.Context, meta schema.ClientMeta, _ *s // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -94,7 +55,7 @@ func fetchAppWebhookDeliveries(ctx context.Context, meta schema.ClientMeta, _ *s // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppWebhookDeliveryList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_webhook_delivery_mock_test.go b/plugins/source/heroku/resources/services/app_webhook_delivery_mock_test.go index 29d4ef8951ce45..95bc929d8c38e4 100644 --- a/plugins/source/heroku/resources/services/app_webhook_delivery_mock_test.go +++ b/plugins/source/heroku/resources/services/app_webhook_delivery_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app_webhook_event.go b/plugins/source/heroku/resources/services/app_webhook_event.go index 312385c6d082c3..5c9e6fecdf5051 100644 --- a/plugins/source/heroku/resources/services/app_webhook_event.go +++ b/plugins/source/heroku/resources/services/app_webhook_event.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func AppWebhookEvents() *schema.Table { Name: "heroku_app_webhook_events", Description: `https://devcenter.heroku.com/articles/platform-api-reference#app-webhook-event`, Resolver: fetchAppWebhookEvents, + Transform: transformers.TransformWithStruct(&heroku.AppWebhookEvent{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,21 +25,6 @@ func AppWebhookEvents() *schema.Table { PrimaryKey: true, }, }, - { - Name: "include", - Type: schema.TypeString, - Resolver: schema.PathResolver("Include"), - }, - { - Name: "payload", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Payload"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -58,7 +39,7 @@ func fetchAppWebhookEvents(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -74,7 +55,7 @@ func fetchAppWebhookEvents(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppWebhookEventList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/app_webhook_event_mock_test.go b/plugins/source/heroku/resources/services/app_webhook_event_mock_test.go index 47a6d3a844239c..de7b064352ed9e 100644 --- a/plugins/source/heroku/resources/services/app_webhook_event_mock_test.go +++ b/plugins/source/heroku/resources/services/app_webhook_event_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/app_webhook_mock_test.go b/plugins/source/heroku/resources/services/app_webhook_mock_test.go index 6b2a294941a264..9cf1728668d310 100644 --- a/plugins/source/heroku/resources/services/app_webhook_mock_test.go +++ b/plugins/source/heroku/resources/services/app_webhook_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/build.go b/plugins/source/heroku/resources/services/build.go index 35d00fcdc4cdab..24b601d6f860a8 100644 --- a/plugins/source/heroku/resources/services/build.go +++ b/plugins/source/heroku/resources/services/build.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func Builds() *schema.Table { Name: "heroku_builds", Description: `https://devcenter.heroku.com/articles/platform-api-reference#build`, Resolver: fetchBuilds, + Transform: transformers.TransformWithStruct(&heroku.Build{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "buildpacks", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Buildpacks"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -39,46 +25,6 @@ func Builds() *schema.Table { PrimaryKey: true, }, }, - { - Name: "output_stream_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputStreamURL"), - }, - { - Name: "release", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Release"), - }, - { - Name: "slug", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "source_blob", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceBlob"), - }, - { - Name: "stack", - Type: schema.TypeString, - Resolver: schema.PathResolver("Stack"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -93,7 +39,7 @@ func fetchBuilds(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -109,7 +55,7 @@ func fetchBuilds(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.BuildList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/build_mock_test.go b/plugins/source/heroku/resources/services/build_mock_test.go index 97100660129f39..970f69b1ad2df7 100644 --- a/plugins/source/heroku/resources/services/build_mock_test.go +++ b/plugins/source/heroku/resources/services/build_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/buildpack_installation.go b/plugins/source/heroku/resources/services/buildpack_installation.go index 0e0d62d5e61eb3..f30bd7303394da 100644 --- a/plugins/source/heroku/resources/services/buildpack_installation.go +++ b/plugins/source/heroku/resources/services/buildpack_installation.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,18 +15,8 @@ func BuildpackInstallations() *schema.Table { Name: "heroku_buildpack_installations", Description: `https://devcenter.heroku.com/articles/platform-api-reference#buildpack-installation`, Resolver: fetchBuildpackInstallations, - Columns: []schema.Column{ - { - Name: "buildpack", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Buildpack"), - }, - { - Name: "ordinal", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Ordinal"), - }, - }, + Transform: transformers.TransformWithStruct(&heroku.BuildpackInstallation{}), + Columns: []schema.Column{}, } } @@ -40,7 +30,7 @@ func fetchBuildpackInstallations(ctx context.Context, meta schema.ClientMeta, _ // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -56,7 +46,7 @@ func fetchBuildpackInstallations(ctx context.Context, meta schema.ClientMeta, _ // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.BuildpackInstallationList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/buildpack_installation_mock_test.go b/plugins/source/heroku/resources/services/buildpack_installation_mock_test.go index 64204f271ffe0e..9c2cd646d02cea 100644 --- a/plugins/source/heroku/resources/services/buildpack_installation_mock_test.go +++ b/plugins/source/heroku/resources/services/buildpack_installation_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/collaborator.go b/plugins/source/heroku/resources/services/collaborator.go index 6c443fee3fafd3..939fbbbeba0090 100644 --- a/plugins/source/heroku/resources/services/collaborator.go +++ b/plugins/source/heroku/resources/services/collaborator.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func Collaborators() *schema.Table { Name: "heroku_collaborators", Description: `https://devcenter.heroku.com/articles/platform-api-reference#collaborator`, Resolver: fetchCollaborators, + Transform: transformers.TransformWithStruct(&heroku.Collaborator{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -34,26 +25,6 @@ func Collaborators() *schema.Table { PrimaryKey: true, }, }, - { - Name: "permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Permissions"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -68,7 +39,7 @@ func fetchCollaborators(ctx context.Context, meta schema.ClientMeta, _ *schema.R // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -84,7 +55,7 @@ func fetchCollaborators(ctx context.Context, meta schema.ClientMeta, _ *schema.R // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.CollaboratorList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/collaborator_mock_test.go b/plugins/source/heroku/resources/services/collaborator_mock_test.go index d87046adee91c8..7d8b84dba68ffc 100644 --- a/plugins/source/heroku/resources/services/collaborator_mock_test.go +++ b/plugins/source/heroku/resources/services/collaborator_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/credit.go b/plugins/source/heroku/resources/services/credit.go index 311116977d1027..e52da865956296 100644 --- a/plugins/source/heroku/resources/services/credit.go +++ b/plugins/source/heroku/resources/services/credit.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func Credits() *schema.Table { Name: "heroku_credits", Description: `https://devcenter.heroku.com/articles/platform-api-reference#credit`, Resolver: fetchCredits, + Transform: transformers.TransformWithStruct(&heroku.Credit{}), Columns: []schema.Column{ - { - Name: "amount", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Amount"), - }, - { - Name: "balance", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Balance"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "expires_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ExpiresAt"), - }, { Name: "id", Type: schema.TypeString, @@ -44,16 +25,6 @@ func Credits() *schema.Table { PrimaryKey: true, }, }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -67,7 +38,7 @@ func fetchCredits(ctx context.Context, meta schema.ClientMeta, _ *schema.Resourc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.CreditList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/credit_mock_test.go b/plugins/source/heroku/resources/services/credit_mock_test.go index 02cf61488ab1ac..7b16e134def9bf 100644 --- a/plugins/source/heroku/resources/services/credit_mock_test.go +++ b/plugins/source/heroku/resources/services/credit_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/domain.go b/plugins/source/heroku/resources/services/domain.go index 8b90e9c55e9d65..af2232a71b6ed1 100644 --- a/plugins/source/heroku/resources/services/domain.go +++ b/plugins/source/heroku/resources/services/domain.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func Domains() *schema.Table { Name: "heroku_domains", Description: `https://devcenter.heroku.com/articles/platform-api-reference#domain`, Resolver: fetchDomains, + Transform: transformers.TransformWithStruct(&heroku.Domain{}), Columns: []schema.Column{ - { - Name: "acm_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("AcmStatus"), - }, - { - Name: "acm_status_reason", - Type: schema.TypeString, - Resolver: schema.PathResolver("AcmStatusReason"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "cname", - Type: schema.TypeString, - Resolver: schema.PathResolver("CName"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "hostname", - Type: schema.TypeString, - Resolver: schema.PathResolver("Hostname"), - }, { Name: "id", Type: schema.TypeString, @@ -54,26 +25,6 @@ func Domains() *schema.Table { PrimaryKey: true, }, }, - { - Name: "kind", - Type: schema.TypeString, - Resolver: schema.PathResolver("Kind"), - }, - { - Name: "sni_endpoint", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SniEndpoint"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -88,7 +39,7 @@ func fetchDomains(ctx context.Context, meta schema.ClientMeta, _ *schema.Resourc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -104,7 +55,7 @@ func fetchDomains(ctx context.Context, meta schema.ClientMeta, _ *schema.Resourc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.DomainList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/domain_mock_test.go b/plugins/source/heroku/resources/services/domain_mock_test.go index 7e0a18fc0213a9..9cf09e0affdc42 100644 --- a/plugins/source/heroku/resources/services/domain_mock_test.go +++ b/plugins/source/heroku/resources/services/domain_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/dyno.go b/plugins/source/heroku/resources/services/dyno.go index 1999f39a27dc96..d6fb3cd6b35eb8 100644 --- a/plugins/source/heroku/resources/services/dyno.go +++ b/plugins/source/heroku/resources/services/dyno.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func Dynos() *schema.Table { Name: "heroku_dynos", Description: `https://devcenter.heroku.com/articles/platform-api-reference#dyno`, Resolver: fetchDynos, + Transform: transformers.TransformWithStruct(&heroku.Dyno{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "attach_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("AttachURL"), - }, - { - Name: "command", - Type: schema.TypeString, - Resolver: schema.PathResolver("Command"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -44,36 +25,6 @@ func Dynos() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "release", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Release"), - }, - { - Name: "size", - Type: schema.TypeString, - Resolver: schema.PathResolver("Size"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -88,7 +39,7 @@ func fetchDynos(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -104,7 +55,7 @@ func fetchDynos(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.DynoList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/dyno_mock_test.go b/plugins/source/heroku/resources/services/dyno_mock_test.go index 3f7ca6b712f2de..67f7e9f89cf261 100644 --- a/plugins/source/heroku/resources/services/dyno_mock_test.go +++ b/plugins/source/heroku/resources/services/dyno_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/dyno_size.go b/plugins/source/heroku/resources/services/dyno_size.go index 47d90ac524cafb..0969e3dc55c5db 100644 --- a/plugins/source/heroku/resources/services/dyno_size.go +++ b/plugins/source/heroku/resources/services/dyno_size.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func DynoSizes() *schema.Table { Name: "heroku_dyno_sizes", Description: `https://devcenter.heroku.com/articles/platform-api-reference#dyno-size`, Resolver: fetchDynoSizes, + Transform: transformers.TransformWithStruct(&heroku.DynoSize{}), Columns: []schema.Column{ - { - Name: "compute", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Compute"), - }, - { - Name: "cost", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Cost"), - }, - { - Name: "dedicated", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Dedicated"), - }, - { - Name: "dyno_units", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DynoUnits"), - }, { Name: "id", Type: schema.TypeString, @@ -44,21 +25,6 @@ func DynoSizes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "memory", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Memory"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "private_space_only", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PrivateSpaceOnly"), - }, }, } } @@ -72,7 +38,7 @@ func fetchDynoSizes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resou // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.DynoSizeList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/dyno_size_mock_test.go b/plugins/source/heroku/resources/services/dyno_size_mock_test.go index 2610edbfc91c34..38999f7ff9166b 100644 --- a/plugins/source/heroku/resources/services/dyno_size_mock_test.go +++ b/plugins/source/heroku/resources/services/dyno_size_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/enterprise_account.go b/plugins/source/heroku/resources/services/enterprise_account.go index 5f6f9c2aa8dde8..f692c7e779d110 100644 --- a/plugins/source/heroku/resources/services/enterprise_account.go +++ b/plugins/source/heroku/resources/services/enterprise_account.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func EnterpriseAccounts() *schema.Table { Name: "heroku_enterprise_accounts", Description: `https://devcenter.heroku.com/articles/platform-api-reference#enterprise-account`, Resolver: fetchEnterpriseAccounts, + Transform: transformers.TransformWithStruct(&heroku.EnterpriseAccount{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,31 +25,6 @@ func EnterpriseAccounts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "identity_provider", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityProvider"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "permissions", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Permissions"), - }, - { - Name: "trial", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Trial"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -67,7 +38,7 @@ func fetchEnterpriseAccounts(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.EnterpriseAccountList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/enterprise_account_member.go b/plugins/source/heroku/resources/services/enterprise_account_member.go index 1e2d12326766a5..b1b5b9d380ddd5 100644 --- a/plugins/source/heroku/resources/services/enterprise_account_member.go +++ b/plugins/source/heroku/resources/services/enterprise_account_member.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func EnterpriseAccountMembers() *schema.Table { Name: "heroku_enterprise_account_members", Description: `https://devcenter.heroku.com/articles/platform-api-reference#enterprise-account-member`, Resolver: fetchEnterpriseAccountMembers, + Transform: transformers.TransformWithStruct(&heroku.EnterpriseAccountMember{}), Columns: []schema.Column{ - { - Name: "enterprise_account", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnterpriseAccount"), - }, { Name: "id", Type: schema.TypeString, @@ -29,26 +25,6 @@ func EnterpriseAccountMembers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "identity_provider", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityProvider"), - }, - { - Name: "permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Permissions"), - }, - { - Name: "two_factor_authentication", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TwoFactorAuthentication"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -63,7 +39,7 @@ func fetchEnterpriseAccountMembers(ctx context.Context, meta schema.ClientMeta, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.EnterpriseAccountList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -79,7 +55,7 @@ func fetchEnterpriseAccountMembers(ctx context.Context, meta schema.ClientMeta, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.EnterpriseAccountMemberList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/enterprise_account_member_mock_test.go b/plugins/source/heroku/resources/services/enterprise_account_member_mock_test.go index caa96508bec274..f5922103766939 100644 --- a/plugins/source/heroku/resources/services/enterprise_account_member_mock_test.go +++ b/plugins/source/heroku/resources/services/enterprise_account_member_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/enterprise_account_mock_test.go b/plugins/source/heroku/resources/services/enterprise_account_mock_test.go index 00e1385a63fa6e..d737554a786c68 100644 --- a/plugins/source/heroku/resources/services/enterprise_account_mock_test.go +++ b/plugins/source/heroku/resources/services/enterprise_account_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/formation.go b/plugins/source/heroku/resources/services/formation.go index 7fb8c798407f68..a3df4b964f0a99 100644 --- a/plugins/source/heroku/resources/services/formation.go +++ b/plugins/source/heroku/resources/services/formation.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func Formations() *schema.Table { Name: "heroku_formations", Description: `https://devcenter.heroku.com/articles/platform-api-reference#formation`, Resolver: fetchFormations, + Transform: transformers.TransformWithStruct(&heroku.Formation{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "command", - Type: schema.TypeString, - Resolver: schema.PathResolver("Command"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -39,26 +25,6 @@ func Formations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "quantity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Quantity"), - }, - { - Name: "size", - Type: schema.TypeString, - Resolver: schema.PathResolver("Size"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -73,7 +39,7 @@ func fetchFormations(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -89,7 +55,7 @@ func fetchFormations(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.FormationList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/formation_mock_test.go b/plugins/source/heroku/resources/services/formation_mock_test.go index 8b77be846f58de..380a68f7b17fe9 100644 --- a/plugins/source/heroku/resources/services/formation_mock_test.go +++ b/plugins/source/heroku/resources/services/formation_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/inbound_ruleset.go b/plugins/source/heroku/resources/services/inbound_ruleset.go index b1ca2040c8282b..27849933e65879 100644 --- a/plugins/source/heroku/resources/services/inbound_ruleset.go +++ b/plugins/source/heroku/resources/services/inbound_ruleset.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func InboundRulesets() *schema.Table { Name: "heroku_inbound_rulesets", Description: `https://devcenter.heroku.com/articles/platform-api-reference#inbound-ruleset`, Resolver: fetchInboundRulesets, + Transform: transformers.TransformWithStruct(&heroku.InboundRuleset{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, { Name: "id", Type: schema.TypeString, @@ -34,16 +25,6 @@ func InboundRulesets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, - { - Name: "space", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Space"), - }, }, } } @@ -58,7 +39,7 @@ func fetchInboundRulesets(ctx context.Context, meta schema.ClientMeta, _ *schema // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -74,7 +55,7 @@ func fetchInboundRulesets(ctx context.Context, meta schema.ClientMeta, _ *schema // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.InboundRulesetList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/inbound_ruleset_mock_test.go b/plugins/source/heroku/resources/services/inbound_ruleset_mock_test.go index e3db8fcddfe6d7..b422d8b3004d3a 100644 --- a/plugins/source/heroku/resources/services/inbound_ruleset_mock_test.go +++ b/plugins/source/heroku/resources/services/inbound_ruleset_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/invoice.go b/plugins/source/heroku/resources/services/invoice.go index 3e382780ba4379..c34b49d18ea9da 100644 --- a/plugins/source/heroku/resources/services/invoice.go +++ b/plugins/source/heroku/resources/services/invoice.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func Invoices() *schema.Table { Name: "heroku_invoices", Description: `https://devcenter.heroku.com/articles/platform-api-reference#invoice`, Resolver: fetchInvoices, + Transform: transformers.TransformWithStruct(&heroku.Invoice{}), Columns: []schema.Column{ - { - Name: "charges_total", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("ChargesTotal"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "credits_total", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("CreditsTotal"), - }, { Name: "id", Type: schema.TypeString, @@ -39,36 +25,6 @@ func Invoices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Number"), - }, - { - Name: "period_end", - Type: schema.TypeString, - Resolver: schema.PathResolver("PeriodEnd"), - }, - { - Name: "period_start", - Type: schema.TypeString, - Resolver: schema.PathResolver("PeriodStart"), - }, - { - Name: "state", - Type: schema.TypeInt, - Resolver: schema.PathResolver("State"), - }, - { - Name: "total", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Total"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -82,7 +38,7 @@ func fetchInvoices(ctx context.Context, meta schema.ClientMeta, _ *schema.Resour // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.InvoiceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/invoice_mock_test.go b/plugins/source/heroku/resources/services/invoice_mock_test.go index f49bed641ea387..f4ad0afa2dac12 100644 --- a/plugins/source/heroku/resources/services/invoice_mock_test.go +++ b/plugins/source/heroku/resources/services/invoice_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/key.go b/plugins/source/heroku/resources/services/key.go index fe6c1bcc5bcc30..4aaed4f0e4d58d 100644 --- a/plugins/source/heroku/resources/services/key.go +++ b/plugins/source/heroku/resources/services/key.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func Keys() *schema.Table { Name: "heroku_keys", Description: `https://devcenter.heroku.com/articles/platform-api-reference#key`, Resolver: fetchKeys, + Transform: transformers.TransformWithStruct(&heroku.Key{}), Columns: []schema.Column{ - { - Name: "comment", - Type: schema.TypeString, - Resolver: schema.PathResolver("Comment"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "fingerprint", - Type: schema.TypeString, - Resolver: schema.PathResolver("Fingerprint"), - }, { Name: "id", Type: schema.TypeString, @@ -44,16 +25,6 @@ func Keys() *schema.Table { PrimaryKey: true, }, }, - { - Name: "public_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicKey"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -67,7 +38,7 @@ func fetchKeys(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.KeyList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/key_mock_test.go b/plugins/source/heroku/resources/services/key_mock_test.go index d0a3dba4311755..03a48c258a8cff 100644 --- a/plugins/source/heroku/resources/services/key_mock_test.go +++ b/plugins/source/heroku/resources/services/key_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/log_drain.go b/plugins/source/heroku/resources/services/log_drain.go index 9d59e380daea30..73d094f8701f78 100644 --- a/plugins/source/heroku/resources/services/log_drain.go +++ b/plugins/source/heroku/resources/services/log_drain.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func LogDrains() *schema.Table { Name: "heroku_log_drains", Description: `https://devcenter.heroku.com/articles/platform-api-reference#log-drain`, Resolver: fetchLogDrains, + Transform: transformers.TransformWithStruct(&heroku.LogDrain{}), Columns: []schema.Column{ - { - Name: "addon", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Addon"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -34,21 +25,6 @@ func LogDrains() *schema.Table { PrimaryKey: true, }, }, - { - Name: "token", - Type: schema.TypeString, - Resolver: schema.PathResolver("Token"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, }, } } @@ -63,7 +39,7 @@ func fetchLogDrains(ctx context.Context, meta schema.ClientMeta, _ *schema.Resou // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -79,7 +55,7 @@ func fetchLogDrains(ctx context.Context, meta schema.ClientMeta, _ *schema.Resou // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.LogDrainList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/log_drain_mock_test.go b/plugins/source/heroku/resources/services/log_drain_mock_test.go index ab6b09497d084e..fb55355b28f131 100644 --- a/plugins/source/heroku/resources/services/log_drain_mock_test.go +++ b/plugins/source/heroku/resources/services/log_drain_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/o_auth_authorization.go b/plugins/source/heroku/resources/services/o_auth_authorization.go index e82ed575e1a1aa..4b6d4b4abc1a8f 100644 --- a/plugins/source/heroku/resources/services/o_auth_authorization.go +++ b/plugins/source/heroku/resources/services/o_auth_authorization.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func OAuthAuthorizations() *schema.Table { Name: "heroku_oauth_authorizations", Description: `https://devcenter.heroku.com/articles/platform-api-reference#o-auth-authorization`, Resolver: fetchOAuthAuthorizations, + Transform: transformers.TransformWithStruct(&heroku.OAuthAuthorization{}), Columns: []schema.Column{ - { - Name: "access_token", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AccessToken"), - }, - { - Name: "client", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Client"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "grant", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Grant"), - }, { Name: "id", Type: schema.TypeString, @@ -44,26 +25,6 @@ func OAuthAuthorizations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "refresh_token", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RefreshToken"), - }, - { - Name: "scope", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Scope"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -77,7 +38,7 @@ func fetchOAuthAuthorizations(ctx context.Context, meta schema.ClientMeta, _ *sc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.OAuthAuthorizationList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/o_auth_authorization_mock_test.go b/plugins/source/heroku/resources/services/o_auth_authorization_mock_test.go index dd18f00b5d89ee..7bf9b7be728de8 100644 --- a/plugins/source/heroku/resources/services/o_auth_authorization_mock_test.go +++ b/plugins/source/heroku/resources/services/o_auth_authorization_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/o_auth_client.go b/plugins/source/heroku/resources/services/o_auth_client.go index fcc26124f8277a..c5a7f7b45d3354 100644 --- a/plugins/source/heroku/resources/services/o_auth_client.go +++ b/plugins/source/heroku/resources/services/o_auth_client.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func OAuthClients() *schema.Table { Name: "heroku_oauth_clients", Description: `https://devcenter.heroku.com/articles/platform-api-reference#o-auth-client`, Resolver: fetchOAuthClients, + Transform: transformers.TransformWithStruct(&heroku.OAuthClient{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,31 +25,6 @@ func OAuthClients() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ignores_delinquent", - Type: schema.TypeBool, - Resolver: schema.PathResolver("IgnoresDelinquent"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "redirect_uri", - Type: schema.TypeString, - Resolver: schema.PathResolver("RedirectURI"), - }, - { - Name: "secret", - Type: schema.TypeString, - Resolver: schema.PathResolver("Secret"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -67,7 +38,7 @@ func fetchOAuthClients(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.OAuthClientList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/o_auth_client_mock_test.go b/plugins/source/heroku/resources/services/o_auth_client_mock_test.go index 708b926a849ddc..13e2812e049938 100644 --- a/plugins/source/heroku/resources/services/o_auth_client_mock_test.go +++ b/plugins/source/heroku/resources/services/o_auth_client_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/outbound_ruleset.go b/plugins/source/heroku/resources/services/outbound_ruleset.go index d072db13062038..bc3b8c3555f988 100644 --- a/plugins/source/heroku/resources/services/outbound_ruleset.go +++ b/plugins/source/heroku/resources/services/outbound_ruleset.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func OutboundRulesets() *schema.Table { Name: "heroku_outbound_rulesets", Description: `https://devcenter.heroku.com/articles/platform-api-reference#outbound-ruleset`, Resolver: fetchOutboundRulesets, + Transform: transformers.TransformWithStruct(&heroku.OutboundRuleset{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "created_by", - Type: schema.TypeString, - Resolver: schema.PathResolver("CreatedBy"), - }, { Name: "id", Type: schema.TypeString, @@ -34,16 +25,6 @@ func OutboundRulesets() *schema.Table { PrimaryKey: true, }, }, - { - Name: "rules", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Rules"), - }, - { - Name: "space", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Space"), - }, }, } } @@ -58,7 +39,7 @@ func fetchOutboundRulesets(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -74,7 +55,7 @@ func fetchOutboundRulesets(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.OutboundRulesetList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/outbound_ruleset_mock_test.go b/plugins/source/heroku/resources/services/outbound_ruleset_mock_test.go index ebcd14d0201e55..e77720bba9d0c8 100644 --- a/plugins/source/heroku/resources/services/outbound_ruleset_mock_test.go +++ b/plugins/source/heroku/resources/services/outbound_ruleset_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/peering.go b/plugins/source/heroku/resources/services/peering.go index e4cf6eda03ca5d..76a84404f09470 100644 --- a/plugins/source/heroku/resources/services/peering.go +++ b/plugins/source/heroku/resources/services/peering.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,48 +15,8 @@ func Peerings() *schema.Table { Name: "heroku_peerings", Description: `https://devcenter.heroku.com/articles/platform-api-reference#peering`, Resolver: fetchPeerings, - Columns: []schema.Column{ - { - Name: "aws_account_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsAccountID"), - }, - { - Name: "aws_region", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsRegion"), - }, - { - Name: "aws_vpc_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AwsVpcID"), - }, - { - Name: "cidr_blocks", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("CIDRBlocks"), - }, - { - Name: "expires", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("Expires"), - }, - { - Name: "pcx_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("PcxID"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - }, + Transform: transformers.TransformWithStruct(&heroku.Peering{}), + Columns: []schema.Column{}, } } @@ -70,7 +30,7 @@ func fetchPeerings(ctx context.Context, meta schema.ClientMeta, _ *schema.Resour // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -86,7 +46,7 @@ func fetchPeerings(ctx context.Context, meta schema.ClientMeta, _ *schema.Resour // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PeeringList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/peering_mock_test.go b/plugins/source/heroku/resources/services/peering_mock_test.go index 638110f532331d..3c0fa0a79053fc 100644 --- a/plugins/source/heroku/resources/services/peering_mock_test.go +++ b/plugins/source/heroku/resources/services/peering_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/permission_entity.go b/plugins/source/heroku/resources/services/permission_entity.go index ef55a2b2303304..9d9920766d2ed5 100644 --- a/plugins/source/heroku/resources/services/permission_entity.go +++ b/plugins/source/heroku/resources/services/permission_entity.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,6 +15,7 @@ func PermissionEntities() *schema.Table { Name: "heroku_permission_entities", Description: `https://devcenter.heroku.com/articles/platform-api-reference#permission-entity`, Resolver: fetchPermissionEntities, + Transform: transformers.TransformWithStruct(&heroku.PermissionEntity{}), Columns: []schema.Column{ { Name: "id", @@ -24,26 +25,6 @@ func PermissionEntities() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "team_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("TeamID"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "users", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Users"), - }, }, } } @@ -58,7 +39,7 @@ func fetchPermissionEntities(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -74,7 +55,7 @@ func fetchPermissionEntities(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PermissionEntityList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/permission_entity_mock_test.go b/plugins/source/heroku/resources/services/permission_entity_mock_test.go index da13bb247257e6..6e8d9c55fcadec 100644 --- a/plugins/source/heroku/resources/services/permission_entity_mock_test.go +++ b/plugins/source/heroku/resources/services/permission_entity_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/pipeline.go b/plugins/source/heroku/resources/services/pipeline.go index 2d0de2c1156f44..39580c964b11b9 100644 --- a/plugins/source/heroku/resources/services/pipeline.go +++ b/plugins/source/heroku/resources/services/pipeline.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func Pipelines() *schema.Table { Name: "heroku_pipelines", Description: `https://devcenter.heroku.com/articles/platform-api-reference#pipeline`, Resolver: fetchPipelines, + Transform: transformers.TransformWithStruct(&heroku.Pipeline{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,21 +25,6 @@ func Pipelines() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "owner", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Owner"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -57,7 +38,7 @@ func fetchPipelines(ctx context.Context, meta schema.ClientMeta, _ *schema.Resou // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/pipeline_build.go b/plugins/source/heroku/resources/services/pipeline_build.go index 3054ce646d3975..93cb6d81870627 100644 --- a/plugins/source/heroku/resources/services/pipeline_build.go +++ b/plugins/source/heroku/resources/services/pipeline_build.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func PipelineBuilds() *schema.Table { Name: "heroku_pipeline_builds", Description: `https://devcenter.heroku.com/articles/platform-api-reference#pipeline-build`, Resolver: fetchPipelineBuilds, + Transform: transformers.TransformWithStruct(&heroku.PipelineBuildListResult{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "buildpacks", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Buildpacks"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -39,46 +25,6 @@ func PipelineBuilds() *schema.Table { PrimaryKey: true, }, }, - { - Name: "output_stream_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputStreamURL"), - }, - { - Name: "release", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Release"), - }, - { - Name: "slug", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "source_blob", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SourceBlob"), - }, - { - Name: "stack", - Type: schema.TypeString, - Resolver: schema.PathResolver("Stack"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -93,7 +39,7 @@ func fetchPipelineBuilds(ctx context.Context, meta schema.ClientMeta, _ *schema. // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -109,7 +55,7 @@ func fetchPipelineBuilds(ctx context.Context, meta schema.ClientMeta, _ *schema. // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineBuildList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/pipeline_build_mock_test.go b/plugins/source/heroku/resources/services/pipeline_build_mock_test.go index 8cac322033879b..5468b2a7cccb29 100644 --- a/plugins/source/heroku/resources/services/pipeline_build_mock_test.go +++ b/plugins/source/heroku/resources/services/pipeline_build_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/pipeline_coupling.go b/plugins/source/heroku/resources/services/pipeline_coupling.go index c2a76f69e03d07..493d6cd6050f68 100644 --- a/plugins/source/heroku/resources/services/pipeline_coupling.go +++ b/plugins/source/heroku/resources/services/pipeline_coupling.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func PipelineCouplings() *schema.Table { Name: "heroku_pipeline_couplings", Description: `https://devcenter.heroku.com/articles/platform-api-reference#pipeline-coupling`, Resolver: fetchPipelineCouplings, + Transform: transformers.TransformWithStruct(&heroku.PipelineCoupling{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -34,21 +25,6 @@ func PipelineCouplings() *schema.Table { PrimaryKey: true, }, }, - { - Name: "pipeline", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Pipeline"), - }, - { - Name: "stage", - Type: schema.TypeString, - Resolver: schema.PathResolver("Stage"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -62,7 +38,7 @@ func fetchPipelineCouplings(ctx context.Context, meta schema.ClientMeta, _ *sche // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineCouplingList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/pipeline_coupling_mock_test.go b/plugins/source/heroku/resources/services/pipeline_coupling_mock_test.go index 34ccf6ab969977..c2418232a119cf 100644 --- a/plugins/source/heroku/resources/services/pipeline_coupling_mock_test.go +++ b/plugins/source/heroku/resources/services/pipeline_coupling_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/pipeline_deployment.go b/plugins/source/heroku/resources/services/pipeline_deployment.go index a8dc02fd3aeccd..b901acc092e96c 100644 --- a/plugins/source/heroku/resources/services/pipeline_deployment.go +++ b/plugins/source/heroku/resources/services/pipeline_deployment.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,32 +15,8 @@ func PipelineDeployments() *schema.Table { Name: "heroku_pipeline_deployments", Description: `https://devcenter.heroku.com/articles/platform-api-reference#pipeline-deployment`, Resolver: fetchPipelineDeployments, + Transform: transformers.TransformWithStruct(&heroku.PipelineDeploymentListResult{}), Columns: []schema.Column{ - { - Name: "addon_plan_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AddonPlanNames"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "current", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Current"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, { Name: "id", Type: schema.TypeString, @@ -49,36 +25,6 @@ func PipelineDeployments() *schema.Table { PrimaryKey: true, }, }, - { - Name: "output_stream_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputStreamURL"), - }, - { - Name: "slug", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } @@ -93,7 +39,7 @@ func fetchPipelineDeployments(ctx context.Context, meta schema.ClientMeta, _ *sc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -109,7 +55,7 @@ func fetchPipelineDeployments(ctx context.Context, meta schema.ClientMeta, _ *sc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineDeploymentList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/pipeline_deployment_mock_test.go b/plugins/source/heroku/resources/services/pipeline_deployment_mock_test.go index 6aa7ad2deda622..21226bff0264d6 100644 --- a/plugins/source/heroku/resources/services/pipeline_deployment_mock_test.go +++ b/plugins/source/heroku/resources/services/pipeline_deployment_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/pipeline_mock_test.go b/plugins/source/heroku/resources/services/pipeline_mock_test.go index d294c847b8c9c7..cd7adba6b3e89d 100644 --- a/plugins/source/heroku/resources/services/pipeline_mock_test.go +++ b/plugins/source/heroku/resources/services/pipeline_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/pipeline_release.go b/plugins/source/heroku/resources/services/pipeline_release.go index 85fbabe0cd80dd..3e309a5f66447c 100644 --- a/plugins/source/heroku/resources/services/pipeline_release.go +++ b/plugins/source/heroku/resources/services/pipeline_release.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,32 +15,8 @@ func PipelineReleases() *schema.Table { Name: "heroku_pipeline_releases", Description: `https://devcenter.heroku.com/articles/platform-api-reference#pipeline-release`, Resolver: fetchPipelineReleases, + Transform: transformers.TransformWithStruct(&heroku.PipelineReleaseListResult{}), Columns: []schema.Column{ - { - Name: "addon_plan_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AddonPlanNames"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "current", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Current"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, { Name: "id", Type: schema.TypeString, @@ -49,36 +25,6 @@ func PipelineReleases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "output_stream_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputStreamURL"), - }, - { - Name: "slug", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } @@ -93,7 +39,7 @@ func fetchPipelineReleases(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -109,7 +55,7 @@ func fetchPipelineReleases(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineReleaseList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/pipeline_release_mock_test.go b/plugins/source/heroku/resources/services/pipeline_release_mock_test.go index 23ca26e1205828..2604e232099c59 100644 --- a/plugins/source/heroku/resources/services/pipeline_release_mock_test.go +++ b/plugins/source/heroku/resources/services/pipeline_release_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/region.go b/plugins/source/heroku/resources/services/region.go index ed7ba50ff78de9..8b0d430eedbd41 100644 --- a/plugins/source/heroku/resources/services/region.go +++ b/plugins/source/heroku/resources/services/region.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func Regions() *schema.Table { Name: "heroku_regions", Description: `https://devcenter.heroku.com/articles/platform-api-reference#region`, Resolver: fetchRegions, + Transform: transformers.TransformWithStruct(&heroku.Region{}), Columns: []schema.Column{ - { - Name: "country", - Type: schema.TypeString, - Resolver: schema.PathResolver("Country"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, { Name: "id", Type: schema.TypeString, @@ -39,31 +25,6 @@ func Regions() *schema.Table { PrimaryKey: true, }, }, - { - Name: "locale", - Type: schema.TypeString, - Resolver: schema.PathResolver("Locale"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "private_capable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("PrivateCapable"), - }, - { - Name: "provider", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Provider"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -77,7 +38,7 @@ func fetchRegions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resourc // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.RegionList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/region_mock_test.go b/plugins/source/heroku/resources/services/region_mock_test.go index 68f34dc0c5cc7a..8dfbb22e374da1 100644 --- a/plugins/source/heroku/resources/services/region_mock_test.go +++ b/plugins/source/heroku/resources/services/region_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/release.go b/plugins/source/heroku/resources/services/release.go index f097459ddba779..7788eefaf0804c 100644 --- a/plugins/source/heroku/resources/services/release.go +++ b/plugins/source/heroku/resources/services/release.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,32 +15,8 @@ func Releases() *schema.Table { Name: "heroku_releases", Description: `https://devcenter.heroku.com/articles/platform-api-reference#release`, Resolver: fetchReleases, + Transform: transformers.TransformWithStruct(&heroku.Release{}), Columns: []schema.Column{ - { - Name: "addon_plan_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AddonPlanNames"), - }, - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "current", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Current"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, { Name: "id", Type: schema.TypeString, @@ -49,36 +25,6 @@ func Releases() *schema.Table { PrimaryKey: true, }, }, - { - Name: "output_stream_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OutputStreamURL"), - }, - { - Name: "slug", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Slug"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, - { - Name: "version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Version"), - }, }, } } @@ -93,7 +39,7 @@ func fetchReleases(ctx context.Context, meta schema.ClientMeta, _ *schema.Resour // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.AppList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -109,7 +55,7 @@ func fetchReleases(ctx context.Context, meta schema.ClientMeta, _ *schema.Resour // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.ReleaseList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/release_mock_test.go b/plugins/source/heroku/resources/services/release_mock_test.go index 364a10cc1a4c55..8eb96b1960e9e6 100644 --- a/plugins/source/heroku/resources/services/release_mock_test.go +++ b/plugins/source/heroku/resources/services/release_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/review_app.go b/plugins/source/heroku/resources/services/review_app.go index f62759098d98c5..e44e131428255f 100644 --- a/plugins/source/heroku/resources/services/review_app.go +++ b/plugins/source/heroku/resources/services/review_app.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,42 +15,8 @@ func ReviewApps() *schema.Table { Name: "heroku_review_apps", Description: `https://devcenter.heroku.com/articles/platform-api-reference#review-app`, Resolver: fetchReviewApps, + Transform: transformers.TransformWithStruct(&heroku.ReviewApp{}), Columns: []schema.Column{ - { - Name: "app", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("App"), - }, - { - Name: "app_setup", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AppSetup"), - }, - { - Name: "branch", - Type: schema.TypeString, - Resolver: schema.PathResolver("Branch"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "creator", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Creator"), - }, - { - Name: "error_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("ErrorStatus"), - }, - { - Name: "fork_repo", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ForkRepo"), - }, { Name: "id", Type: schema.TypeString, @@ -59,36 +25,6 @@ func ReviewApps() *schema.Table { PrimaryKey: true, }, }, - { - Name: "message", - Type: schema.TypeString, - Resolver: schema.PathResolver("Message"), - }, - { - Name: "pipeline", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Pipeline"), - }, - { - Name: "pr_number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PrNumber"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "wait_for_ci", - Type: schema.TypeBool, - Resolver: schema.PathResolver("WaitForCi"), - }, }, } } @@ -103,7 +39,7 @@ func fetchReviewApps(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.PipelineList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -119,7 +55,7 @@ func fetchReviewApps(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.ReviewAppList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/review_app_mock_test.go b/plugins/source/heroku/resources/services/review_app_mock_test.go index beb9215a8bbc0e..c00e727a957005 100644 --- a/plugins/source/heroku/resources/services/review_app_mock_test.go +++ b/plugins/source/heroku/resources/services/review_app_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/space.go b/plugins/source/heroku/resources/services/space.go index 9fe470fa37ca40..a8ef4311416160 100644 --- a/plugins/source/heroku/resources/services/space.go +++ b/plugins/source/heroku/resources/services/space.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func Spaces() *schema.Table { Name: "heroku_spaces", Description: `https://devcenter.heroku.com/articles/platform-api-reference#space`, Resolver: fetchSpaces, + Transform: transformers.TransformWithStruct(&heroku.Space{}), Columns: []schema.Column{ - { - Name: "cidr", - Type: schema.TypeString, - Resolver: schema.PathResolver("CIDR"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "data_cidr", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataCIDR"), - }, { Name: "id", Type: schema.TypeString, @@ -39,41 +25,6 @@ func Spaces() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "organization", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Organization"), - }, - { - Name: "region", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "shield", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Shield"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "team", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Team"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -87,7 +38,7 @@ func fetchSpaces(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/space_app_access.go b/plugins/source/heroku/resources/services/space_app_access.go index 83afeec0120a7a..2e1725fe6581b8 100644 --- a/plugins/source/heroku/resources/services/space_app_access.go +++ b/plugins/source/heroku/resources/services/space_app_access.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func SpaceAppAccesses() *schema.Table { Name: "heroku_space_app_accesses", Description: `https://devcenter.heroku.com/articles/platform-api-reference#space-app-access`, Resolver: fetchSpaceAppAccesses, + Transform: transformers.TransformWithStruct(&heroku.SpaceAppAccess{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,26 +25,6 @@ func SpaceAppAccesses() *schema.Table { PrimaryKey: true, }, }, - { - Name: "permissions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Permissions"), - }, - { - Name: "space", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Space"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -63,7 +39,7 @@ func fetchSpaceAppAccesses(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -79,7 +55,7 @@ func fetchSpaceAppAccesses(ctx context.Context, meta schema.ClientMeta, _ *schem // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceAppAccessList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/space_app_access_mock_test.go b/plugins/source/heroku/resources/services/space_app_access_mock_test.go index b18dcc2b6b4179..2df37dc9875821 100644 --- a/plugins/source/heroku/resources/services/space_app_access_mock_test.go +++ b/plugins/source/heroku/resources/services/space_app_access_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/space_mock_test.go b/plugins/source/heroku/resources/services/space_mock_test.go index c2a1318d7353ea..972a5553f7e4fb 100644 --- a/plugins/source/heroku/resources/services/space_mock_test.go +++ b/plugins/source/heroku/resources/services/space_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/stack.go b/plugins/source/heroku/resources/services/stack.go index 83cd8b6c93aaf5..4843d4d2f8040b 100644 --- a/plugins/source/heroku/resources/services/stack.go +++ b/plugins/source/heroku/resources/services/stack.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,17 +15,8 @@ func Stacks() *schema.Table { Name: "heroku_stacks", Description: `https://devcenter.heroku.com/articles/platform-api-reference#stack`, Resolver: fetchStacks, + Transform: transformers.TransformWithStruct(&heroku.Stack{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Default"), - }, { Name: "id", Type: schema.TypeString, @@ -34,21 +25,6 @@ func Stacks() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -62,7 +38,7 @@ func fetchStacks(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.StackList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/stack_mock_test.go b/plugins/source/heroku/resources/services/stack_mock_test.go index 4a42ac26f970dd..e2c2ff966e248e 100644 --- a/plugins/source/heroku/resources/services/stack_mock_test.go +++ b/plugins/source/heroku/resources/services/stack_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team.go b/plugins/source/heroku/resources/services/team.go index a6f0a9db375415..94507c927ce9d0 100644 --- a/plugins/source/heroku/resources/services/team.go +++ b/plugins/source/heroku/resources/services/team.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,27 +15,8 @@ func Teams() *schema.Table { Name: "heroku_teams", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team`, Resolver: fetchTeams, + Transform: transformers.TransformWithStruct(&heroku.Team{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "credit_card_collections", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CreditCardCollections"), - }, - { - Name: "default", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Default"), - }, - { - Name: "enterprise_account", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EnterpriseAccount"), - }, { Name: "id", Type: schema.TypeString, @@ -44,41 +25,6 @@ func Teams() *schema.Table { PrimaryKey: true, }, }, - { - Name: "identity_provider", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityProvider"), - }, - { - Name: "membership_limit", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("MembershipLimit"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "provisioned_licenses", - Type: schema.TypeBool, - Resolver: schema.PathResolver("ProvisionedLicenses"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -92,7 +38,7 @@ func fetchTeams(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_app_permission.go b/plugins/source/heroku/resources/services/team_app_permission.go index d0bb4c6a74413a..a776b22844234a 100644 --- a/plugins/source/heroku/resources/services/team_app_permission.go +++ b/plugins/source/heroku/resources/services/team_app_permission.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,18 +15,8 @@ func TeamAppPermissions() *schema.Table { Name: "heroku_team_app_permissions", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-app-permission`, Resolver: fetchTeamAppPermissions, - Columns: []schema.Column{ - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - }, + Transform: transformers.TransformWithStruct(&heroku.TeamAppPermission{}), + Columns: []schema.Column{}, } } @@ -39,7 +29,7 @@ func fetchTeamAppPermissions(ctx context.Context, meta schema.ClientMeta, _ *sch // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamAppPermissionList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_app_permission_mock_test.go b/plugins/source/heroku/resources/services/team_app_permission_mock_test.go index 87c9ccb0e79aa7..5e089d57b3803e 100644 --- a/plugins/source/heroku/resources/services/team_app_permission_mock_test.go +++ b/plugins/source/heroku/resources/services/team_app_permission_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_feature.go b/plugins/source/heroku/resources/services/team_feature.go index aaefe0a9a79932..e37313867e54fc 100644 --- a/plugins/source/heroku/resources/services/team_feature.go +++ b/plugins/source/heroku/resources/services/team_feature.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func TeamFeatures() *schema.Table { Name: "heroku_team_features", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-feature`, Resolver: fetchTeamFeatures, + Transform: transformers.TransformWithStruct(&heroku.TeamFeature{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "description", - Type: schema.TypeString, - Resolver: schema.PathResolver("Description"), - }, - { - Name: "display_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("DisplayName"), - }, - { - Name: "doc_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("DocURL"), - }, - { - Name: "enabled", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Enabled"), - }, - { - Name: "feedback_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("FeedbackEmail"), - }, { Name: "id", Type: schema.TypeString, @@ -54,21 +25,6 @@ func TeamFeatures() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -83,7 +39,7 @@ func fetchTeamFeatures(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -99,7 +55,7 @@ func fetchTeamFeatures(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamFeatureList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_feature_mock_test.go b/plugins/source/heroku/resources/services/team_feature_mock_test.go index ba12171ac92452..110410cd3acca5 100644 --- a/plugins/source/heroku/resources/services/team_feature_mock_test.go +++ b/plugins/source/heroku/resources/services/team_feature_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_invitation.go b/plugins/source/heroku/resources/services/team_invitation.go index d93a4902fbf8bb..8242361aa6c9d3 100644 --- a/plugins/source/heroku/resources/services/team_invitation.go +++ b/plugins/source/heroku/resources/services/team_invitation.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,12 +15,8 @@ func TeamInvitations() *schema.Table { Name: "heroku_team_invitations", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-invitation`, Resolver: fetchTeamInvitations, + Transform: transformers.TransformWithStruct(&heroku.TeamInvitation{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, { Name: "id", Type: schema.TypeString, @@ -29,31 +25,6 @@ func TeamInvitations() *schema.Table { PrimaryKey: true, }, }, - { - Name: "invited_by", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("InvitedBy"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "team", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Team"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -68,7 +39,7 @@ func fetchTeamInvitations(ctx context.Context, meta schema.ClientMeta, _ *schema // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -84,7 +55,7 @@ func fetchTeamInvitations(ctx context.Context, meta schema.ClientMeta, _ *schema // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamInvitationList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_invitation_mock_test.go b/plugins/source/heroku/resources/services/team_invitation_mock_test.go index ac03874a087f41..6ff5883081cf20 100644 --- a/plugins/source/heroku/resources/services/team_invitation_mock_test.go +++ b/plugins/source/heroku/resources/services/team_invitation_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_invoice.go b/plugins/source/heroku/resources/services/team_invoice.go index affa01bf6b678f..7051842338c47f 100644 --- a/plugins/source/heroku/resources/services/team_invoice.go +++ b/plugins/source/heroku/resources/services/team_invoice.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,37 +15,8 @@ func TeamInvoices() *schema.Table { Name: "heroku_team_invoices", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-invoice`, Resolver: fetchTeamInvoices, + Transform: transformers.TransformWithStruct(&heroku.TeamInvoice{}), Columns: []schema.Column{ - { - Name: "addons_total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AddonsTotal"), - }, - { - Name: "charges_total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("ChargesTotal"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "credits_total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CreditsTotal"), - }, - { - Name: "database_total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DatabaseTotal"), - }, - { - Name: "dyno_units", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("DynoUnits"), - }, { Name: "id", Type: schema.TypeString, @@ -54,51 +25,6 @@ func TeamInvoices() *schema.Table { PrimaryKey: true, }, }, - { - Name: "number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Number"), - }, - { - Name: "payment_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("PaymentStatus"), - }, - { - Name: "period_end", - Type: schema.TypeString, - Resolver: schema.PathResolver("PeriodEnd"), - }, - { - Name: "period_start", - Type: schema.TypeString, - Resolver: schema.PathResolver("PeriodStart"), - }, - { - Name: "platform_total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("PlatformTotal"), - }, - { - Name: "state", - Type: schema.TypeInt, - Resolver: schema.PathResolver("State"), - }, - { - Name: "total", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Total"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "weighted_dyno_hours", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("WeightedDynoHours"), - }, }, } } @@ -113,7 +39,7 @@ func fetchTeamInvoices(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -129,7 +55,7 @@ func fetchTeamInvoices(ctx context.Context, meta schema.ClientMeta, _ *schema.Re // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamInvoiceList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_invoice_mock_test.go b/plugins/source/heroku/resources/services/team_invoice_mock_test.go index f43ca763c6f682..eabfc7cf9beab1 100644 --- a/plugins/source/heroku/resources/services/team_invoice_mock_test.go +++ b/plugins/source/heroku/resources/services/team_invoice_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_member.go b/plugins/source/heroku/resources/services/team_member.go index d6227e978d04b3..60b7b2c7f0eb40 100644 --- a/plugins/source/heroku/resources/services/team_member.go +++ b/plugins/source/heroku/resources/services/team_member.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func TeamMembers() *schema.Table { Name: "heroku_team_members", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-member`, Resolver: fetchTeamMembers, + Transform: transformers.TransformWithStruct(&heroku.TeamMember{}), Columns: []schema.Column{ - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "federated", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Federated"), - }, { Name: "id", Type: schema.TypeString, @@ -39,31 +25,6 @@ func TeamMembers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "identity_provider", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("IdentityProvider"), - }, - { - Name: "role", - Type: schema.TypeString, - Resolver: schema.PathResolver("Role"), - }, - { - Name: "two_factor_authentication", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TwoFactorAuthentication"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("User"), - }, }, } } @@ -78,7 +39,7 @@ func fetchTeamMembers(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -94,7 +55,7 @@ func fetchTeamMembers(ctx context.Context, meta schema.ClientMeta, _ *schema.Res // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamMemberList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_member_mock_test.go b/plugins/source/heroku/resources/services/team_member_mock_test.go index a796ef3e044b64..ce7973581a04e4 100644 --- a/plugins/source/heroku/resources/services/team_member_mock_test.go +++ b/plugins/source/heroku/resources/services/team_member_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_mock_test.go b/plugins/source/heroku/resources/services/team_mock_test.go index 33230699d07fab..c2021b184a4748 100644 --- a/plugins/source/heroku/resources/services/team_mock_test.go +++ b/plugins/source/heroku/resources/services/team_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/team_space.go b/plugins/source/heroku/resources/services/team_space.go index 5dafe00e47e224..a197815e358480 100644 --- a/plugins/source/heroku/resources/services/team_space.go +++ b/plugins/source/heroku/resources/services/team_space.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,22 +15,8 @@ func TeamSpaces() *schema.Table { Name: "heroku_team_spaces", Description: `https://devcenter.heroku.com/articles/platform-api-reference#team-space`, Resolver: fetchTeamSpaces, + Transform: transformers.TransformWithStruct(&heroku.TeamSpaceListResult{}), Columns: []schema.Column{ - { - Name: "cidr", - Type: schema.TypeString, - Resolver: schema.PathResolver("CIDR"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "data_cidr", - Type: schema.TypeString, - Resolver: schema.PathResolver("DataCIDR"), - }, { Name: "id", Type: schema.TypeString, @@ -39,41 +25,6 @@ func TeamSpaces() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "organization", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Organization"), - }, - { - Name: "region", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Region"), - }, - { - Name: "shield", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Shield"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "team", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Team"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } @@ -88,7 +39,7 @@ func fetchTeamSpaces(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -104,7 +55,7 @@ func fetchTeamSpaces(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.TeamSpaceList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/team_space_mock_test.go b/plugins/source/heroku/resources/services/team_space_mock_test.go index 0040d99fb46955..9f0b16ff9513cf 100644 --- a/plugins/source/heroku/resources/services/team_space_mock_test.go +++ b/plugins/source/heroku/resources/services/team_space_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( diff --git a/plugins/source/heroku/resources/services/vpn_connection.go b/plugins/source/heroku/resources/services/vpn_connection.go index def7972a2a4ba8..4121d6437b7b67 100644 --- a/plugins/source/heroku/resources/services/vpn_connection.go +++ b/plugins/source/heroku/resources/services/vpn_connection.go @@ -1,11 +1,11 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( "context" + "github.com/cloudquery/cloudquery/plugins/source/heroku/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" heroku "github.com/heroku/heroku-go/v5" "github.com/pkg/errors" ) @@ -15,6 +15,7 @@ func VPNConnections() *schema.Table { Name: "heroku_vpn_connections", Description: `https://devcenter.heroku.com/articles/platform-api-reference#vpn-connection`, Resolver: fetchVPNConnections, + Transform: transformers.TransformWithStruct(&heroku.VPNConnection{}), Columns: []schema.Column{ { Name: "id", @@ -24,46 +25,6 @@ func VPNConnections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ike_version", - Type: schema.TypeInt, - Resolver: schema.PathResolver("IKEVersion"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "public_ip", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicIP"), - }, - { - Name: "routable_cidrs", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("RoutableCidrs"), - }, - { - Name: "space_cidr_block", - Type: schema.TypeString, - Resolver: schema.PathResolver("SpaceCIDRBlock"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "status_message", - Type: schema.TypeString, - Resolver: schema.PathResolver("StatusMessage"), - }, - { - Name: "tunnels", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Tunnels"), - }, }, } } @@ -78,7 +39,7 @@ func fetchVPNConnections(ctx context.Context, meta schema.ClientMeta, _ *schema. // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.SpaceList(ctxWithRange, nextRange) if err != nil { return errors.WithStack(err) @@ -94,7 +55,7 @@ func fetchVPNConnections(ctx context.Context, meta schema.ClientMeta, _ *schema. // Roundtripper middleware in client/pagination.go // sets the nextRange value after each request for nextRange.Max != 0 { - ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) + ctxWithRange := context.WithValue(ctx, "nextRange", nextRange) // nolint:revive,staticcheck v, err := c.Heroku.VPNConnectionList(ctxWithRange, it.ID, nextRange) if err != nil { return errors.WithStack(err) diff --git a/plugins/source/heroku/resources/services/vpn_connection_mock_test.go b/plugins/source/heroku/resources/services/vpn_connection_mock_test.go index 08dc640f52e4e2..35decae14e684c 100644 --- a/plugins/source/heroku/resources/services/vpn_connection_mock_test.go +++ b/plugins/source/heroku/resources/services/vpn_connection_mock_test.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package services import ( From 1c8fcade028ebda2e1300cdb103ca6423bf62d84 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:04:18 +0000 Subject: [PATCH 178/221] fix(shopify): Remove codegen, upgrade SDK (#6568) --- plugins/source/shopify/Makefile | 7 +- plugins/source/shopify/client/client.go | 3 +- plugins/source/shopify/client/testing.go | 2 +- plugins/source/shopify/codegen/main.go | 110 ------- .../shopify/codegen/recipes/checkout.go | 16 - .../shopify/codegen/recipes/customer.go | 15 - .../source/shopify/codegen/recipes/order.go | 15 - .../shopify/codegen/recipes/price_rule.go | 21 -- .../source/shopify/codegen/recipes/product.go | 27 -- .../source/shopify/codegen/recipes/recipes.go | 158 --------- .../shopify/codegen/templates/resource.go.tpl | 14 - plugins/source/shopify/go.mod | 3 +- plugins/source/shopify/go.sum | 6 +- .../services/checkout/abandoned_checkouts.go | 169 +--------- .../resources/services/customer/customers.go | 119 +------ .../resources/services/order/orders.go | 299 +----------------- .../price_rule/price_rule_discount_codes.go | 29 +- .../services/price_rule/price_rules.go | 134 +------- .../services/product/product_images.go | 54 +--- .../services/product/product_variants.go | 109 +------ .../resources/services/product/products.go | 79 +---- 21 files changed, 47 insertions(+), 1342 deletions(-) delete mode 100644 plugins/source/shopify/codegen/main.go delete mode 100644 plugins/source/shopify/codegen/recipes/checkout.go delete mode 100644 plugins/source/shopify/codegen/recipes/customer.go delete mode 100644 plugins/source/shopify/codegen/recipes/order.go delete mode 100644 plugins/source/shopify/codegen/recipes/price_rule.go delete mode 100644 plugins/source/shopify/codegen/recipes/product.go delete mode 100644 plugins/source/shopify/codegen/recipes/recipes.go delete mode 100644 plugins/source/shopify/codegen/templates/resource.go.tpl diff --git a/plugins/source/shopify/Makefile b/plugins/source/shopify/Makefile index a5fb1f59eb96af..87d9deb74a9d88 100644 --- a/plugins/source/shopify/Makefile +++ b/plugins/source/shopify/Makefile @@ -13,11 +13,6 @@ gen-docs: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - # All gen targets .PHONY: gen -gen: gen-code gen-docs +gen: gen-docs diff --git a/plugins/source/shopify/client/client.go b/plugins/source/shopify/client/client.go index 4724c67c502d2c..89c14c8e755ff4 100644 --- a/plugins/source/shopify/client/client.go +++ b/plugins/source/shopify/client/client.go @@ -9,6 +9,7 @@ import ( "time" "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -39,7 +40,7 @@ func (c *Client) ID() string { return c.sourceSpec.Name } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { spSpec := &Spec{} if err := s.UnmarshalSpec(spSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal shopify spec: %w", err) diff --git a/plugins/source/shopify/client/testing.go b/plugins/source/shopify/client/testing.go index 8ab42e142f7975..68fd0cf0a2d1a7 100644 --- a/plugins/source/shopify/client/testing.go +++ b/plugins/source/shopify/client/testing.go @@ -72,7 +72,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createServices func(*mux. zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var spSpec Spec if err := spec.UnmarshalSpec(&spSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal shopify spec: %w", err) diff --git a/plugins/source/shopify/codegen/main.go b/plugins/source/shopify/codegen/main.go deleted file mode 100644 index df977510933966..00000000000000 --- a/plugins/source/shopify/codegen/main.go +++ /dev/null @@ -1,110 +0,0 @@ -package main - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "log" - "os" - "path" - "runtime" - "strings" - "text/template" - - "github.com/cloudquery/cloudquery/plugins/source/shopify/codegen/recipes" - "github.com/cloudquery/plugin-sdk/codegen" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func main() { - var resources []*recipes.Resource - resources = append(resources, recipes.ProductResources()...) - resources = append(resources, recipes.CustomerResources()...) - resources = append(resources, recipes.OrderResources()...) - resources = append(resources, recipes.CheckoutResources()...) - resources = append(resources, recipes.PriceRuleResources()...) - - for _, r := range resources { - r.Infer() - } - if err := recipes.SetParentChildRelationships(resources); err != nil { - log.Fatal(err) - } - for _, r := range resources { - r.GenerateNames() - - _, filename, _, ok := runtime.Caller(0) - if !ok { - log.Fatal("Failed to get caller information") - } - codegenDir := path.Join(path.Dir(filename), "..", "resources", "services") - - generateTable(codegenDir, *r) - } -} - -func generateTable(basedir string, r recipes.Resource) { - var err error - - r.TableName = "shopify_" + r.TableName - - log.Println("Generating table", r.TableName) - opts := []codegen.TableOption{ - codegen.WithSkipFields(r.SkipFields), - codegen.WithExtraColumns(r.ExtraColumns), - codegen.WithPKColumns(r.PKColumns...), - } - if r.UnwrapEmbeddedStructs { - opts = append(opts, codegen.WithUnwrapAllEmbeddedStructs()) - } - r.Table, err = codegen.NewTableFromStruct(r.TableName, r.DataStruct, opts...) - - if err != nil { - log.Fatal(err) - } - - r.Table.Resolver = r.ResolverFuncName - r.Table.Multiplex = r.Multiplex - r.ImportClient = strings.HasPrefix(r.Multiplex, "client.") - r.Table.Relations = r.Relations - r.Table.PreResourceResolver = r.PreResourceResolver - r.Table.PostResourceResolver = r.PostResourceResolver - - for _, c := range r.Table.Columns { - if strings.HasPrefix(c.Resolver, "client.") { - r.ImportClient = true - } - } - - mainTemplate := r.Template + ".go.tpl" - tpl, err := template.New(mainTemplate).ParseFS(templatesFS, "templates/"+mainTemplate) - if err != nil { - log.Fatal(fmt.Errorf("failed to parse templates: %w", err)) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - log.Fatal(fmt.Errorf("failed to parse recipes template: %w", err)) - } - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - log.Fatal(fmt.Errorf("failed to execute template: %w", err)) - } - - pkgPath := path.Join(basedir, r.Service) - if err := os.Mkdir(pkgPath, 0755); err != nil && !os.IsExist(err) { - log.Fatal(err) - } - - filePath := path.Join(pkgPath, r.Filename) - content, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Println(buff.String()) - log.Fatal(fmt.Errorf("failed to format code for %s: %w", filePath, err)) - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - log.Fatal(fmt.Errorf("failed to write file %s: %w", filePath, err)) - } -} diff --git a/plugins/source/shopify/codegen/recipes/checkout.go b/plugins/source/shopify/codegen/recipes/checkout.go deleted file mode 100644 index cd86308f13fc71..00000000000000 --- a/plugins/source/shopify/codegen/recipes/checkout.go +++ /dev/null @@ -1,16 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" -) - -func CheckoutResources() []*Resource { - return []*Resource{ - { - DataStruct: &shopify.Checkout{}, - Service: "checkout", - TableName: "abandoned_checkouts", - PKColumns: []string{"id"}, - }, - } -} diff --git a/plugins/source/shopify/codegen/recipes/customer.go b/plugins/source/shopify/codegen/recipes/customer.go deleted file mode 100644 index 07557eadecd731..00000000000000 --- a/plugins/source/shopify/codegen/recipes/customer.go +++ /dev/null @@ -1,15 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" -) - -func CustomerResources() []*Resource { - return []*Resource{ - { - DataStruct: &shopify.Customer{}, - Service: "customer", - PKColumns: []string{"id"}, - }, - } -} diff --git a/plugins/source/shopify/codegen/recipes/order.go b/plugins/source/shopify/codegen/recipes/order.go deleted file mode 100644 index ac985ccb51cae9..00000000000000 --- a/plugins/source/shopify/codegen/recipes/order.go +++ /dev/null @@ -1,15 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" -) - -func OrderResources() []*Resource { - return []*Resource{ - { - DataStruct: &shopify.Order{}, - Service: "order", - PKColumns: []string{"id"}, - }, - } -} diff --git a/plugins/source/shopify/codegen/recipes/price_rule.go b/plugins/source/shopify/codegen/recipes/price_rule.go deleted file mode 100644 index 29f9aad2b96c15..00000000000000 --- a/plugins/source/shopify/codegen/recipes/price_rule.go +++ /dev/null @@ -1,21 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" -) - -func PriceRuleResources() []*Resource { - return []*Resource{ - { - DataStruct: &shopify.PriceRule{}, - Service: "price_rule", - PKColumns: []string{"id"}, - Relations: []string{"PriceRuleDiscountCodes()"}, - }, - { - DataStruct: &shopify.DiscountCode{}, - Service: "price_rule", - PKColumns: []string{"price_rule_id", "id"}, - }, - } -} diff --git a/plugins/source/shopify/codegen/recipes/product.go b/plugins/source/shopify/codegen/recipes/product.go deleted file mode 100644 index 8043ddd7b1994e..00000000000000 --- a/plugins/source/shopify/codegen/recipes/product.go +++ /dev/null @@ -1,27 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" -) - -func ProductResources() []*Resource { - return []*Resource{ - { - DataStruct: &shopify.Product{}, - Service: "product", - PKColumns: []string{"id"}, - SkipFields: []string{"Variants", "Images"}, - Relations: []string{"ProductVariants()", "ProductImages()"}, - }, - { - DataStruct: &shopify.ProductVariant{}, - Service: "product", - PKColumns: []string{"product_id", "id"}, - }, - { - DataStruct: &shopify.ProductImage{}, - Service: "product", - PKColumns: []string{"product_id", "id"}, - }, - } -} diff --git a/plugins/source/shopify/codegen/recipes/recipes.go b/plugins/source/shopify/codegen/recipes/recipes.go deleted file mode 100644 index 4ae32ba9c95fef..00000000000000 --- a/plugins/source/shopify/codegen/recipes/recipes.go +++ /dev/null @@ -1,158 +0,0 @@ -package recipes - -import ( - "fmt" - "log" - "reflect" - "strings" - - "github.com/cloudquery/plugin-sdk/caser" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/gertd/go-pluralize" -) - -type Resource struct { - // Table is the table definition that will be used to generate the cloudquery table - Table *codegen.TableDefinition - // DataStruct that will be used to generate the cloudquery table - DataStruct any - // SkipFields fields in go struct to skip when generating the table from the go struct - SkipFields []string - Template string - Multiplex string - - ExtraColumns []codegen.ColumnDefinition - PKColumns []string - - PreResourceResolver string - PostResourceResolver string - Relations []string - UnwrapEmbeddedStructs bool - - SkipSubserviceName bool // Skip name of the subservice in auto generated table names (including relations) - - // These are inferred with reflection but can be overridden - Service string // Inferred from DataStruct package, pluralized - SubService string // Inferred from DataStruct name, singular - TableName string // singular Service + plural SubService - - // These are auto calculated - ImportClient bool // true if the resource/column resolvers use the client package - Filename string // Calculated from TableName - TableFuncName string // Calculated from TableName - ResolverFuncName string // Calculated from TableFuncName - - //used for generating better table names - parent *Resource - children []*Resource -} - -var ( - pluralizeClient *pluralize.Client - csr *caser.Caser -) - -func init() { - pluralizeClient = pluralize.NewClient() - csr = caser.New() -} - -func (r *Resource) Infer() { - // Set defaults and/or infer fields - if r.Template == "" { - r.Template = "resource" - } - - ds := reflect.TypeOf(r.DataStruct) - if ds.Kind() == reflect.Ptr { - ds = ds.Elem() - } - - if r.Service == "" { - log.Fatalf("Service is required for %s", r.SubService) - } - if r.SubService == "" { - r.SubService = csr.ToSnake(pluralizeClient.Singular(ds.Name())) - } -} - -func (r *Resource) GenerateNames() { - if r.TableName == "" { - // Table names are always in [...] format. Add everything in singular form and pluralize the last word later - - const sep = "_" - nParts := strings.Split(pluralizeClient.Singular(r.Service), sep) - p := r.parent - for p != nil { - nParts = appendNoRepeat(nParts, strings.Split(pluralizeClient.Singular(p.SubService), sep)...) - p = p.parent - } - nParts = appendNoRepeat(nParts, strings.Split(pluralizeClient.Singular(r.SubService), sep)...) - nParts[len(nParts)-1] = pluralizeClient.Plural(nParts[len(nParts)-1]) - - if r.TableName == "" { - if len(nParts) == 0 { - log.Fatalf("Could not generate table name for %s.%s", r.Service, r.SubService) - } - - r.TableName = strings.Join(nParts, sep) - } - } - - r.Filename = csr.ToSnake(r.TableName) + ".go" - r.TableFuncName = csr.ToPascal(r.TableName) - r.ResolverFuncName = "fetch" + r.TableFuncName -} - -// SetParentChildRelationships calculates and sets the parent and children fields on resources. -func SetParentChildRelationships(resources []*Resource) error { - m := map[string]*Resource{} - for _, r := range resources { - var key string - if r.TableName != "" { - key = r.TableName - } else { - key = r.Service + "_" + pluralizeClient.Plural(r.SubService) - } - m[key] = r - } - for _, r := range resources { - for _, ch := range r.Relations { - snakeChild := csr.ToSnake(strings.TrimSuffix(ch, "()")) - name := strings.TrimPrefix(snakeChild, r.Service+"_"+r.SubService+"_") - v, ok := m[r.Service+"_"+name] - if !ok { - v, ok = m[name] - } - if !ok { - return fmt.Errorf("child not found for %s.%s: %s missing", r.Service, r.SubService, name) - } - v.parent = r - } - } - return nil -} - -func appendNoRepeat(parts []string, addition ...string) []string { - // foo + bar = foo_bar - // foo + foo_bar = foo_bar - // foo_bar + bar_baz = foo_bar_baz - // foo_bar + baz_bax = foo_bar_baz_bax - // foo_bar_baz + bar_baz_bax = foo_bar_baz_bax - - for i := len(addition); i > 0; i-- { - // ever-increasing from long form to short: foo_bar_baz, foo_bar, foo - if sliceEndsWith(parts, addition[:i]) { - return append(parts, addition[i:]...) - } - } - return append(parts, addition...) -} - -func sliceEndsWith(haystack, needle []string) bool { - ln, lh := len(needle), len(haystack) - if ln > lh { - return false - } - return reflect.DeepEqual(needle, haystack[lh-ln:]) -} diff --git a/plugins/source/shopify/codegen/templates/resource.go.tpl b/plugins/source/shopify/codegen/templates/resource.go.tpl deleted file mode 100644 index 07161f5dff8ed8..00000000000000 --- a/plugins/source/shopify/codegen/templates/resource.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" -{{- if .ImportClient}} - "github.com/cloudquery/cloudquery/plugins/source/shopify/client" -{{- end}} -) - -func {{.TableFuncName}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} diff --git a/plugins/source/shopify/go.mod b/plugins/source/shopify/go.mod index cc4e5fc5a28346..7a95bd603a789f 100644 --- a/plugins/source/shopify/go.mod +++ b/plugins/source/shopify/go.mod @@ -3,8 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/shopify go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 - github.com/gertd/go-pluralize v0.2.1 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 golang.org/x/time v0.3.0 diff --git a/plugins/source/shopify/go.sum b/plugins/source/shopify/go.sum index 0c85cb04404199..febe033b98a4f4 100644 --- a/plugins/source/shopify/go.sum +++ b/plugins/source/shopify/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -55,8 +55,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= diff --git a/plugins/source/shopify/resources/services/checkout/abandoned_checkouts.go b/plugins/source/shopify/resources/services/checkout/abandoned_checkouts.go index 29f1118e8db40b..73a62ac3441448 100644 --- a/plugins/source/shopify/resources/services/checkout/abandoned_checkouts.go +++ b/plugins/source/shopify/resources/services/checkout/abandoned_checkouts.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package checkout import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func AbandonedCheckouts() *schema.Table { return &schema.Table{ - Name: "shopify_abandoned_checkouts", - Resolver: fetchAbandonedCheckouts, + Name: "shopify_abandoned_checkouts", + Resolver: fetchAbandonedCheckouts, + Transform: transformers.TransformWithStruct(&shopify.Checkout{}), Columns: []schema.Column{ { Name: "id", @@ -19,166 +20,6 @@ func AbandonedCheckouts() *schema.Table { PrimaryKey: true, }, }, - { - Name: "token", - Type: schema.TypeString, - Resolver: schema.PathResolver("Token"), - }, - { - Name: "cart_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("CartToken"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "gateway", - Type: schema.TypeString, - Resolver: schema.PathResolver("Gateway"), - }, - { - Name: "buyer_accepts_marketing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BuyerAcceptsMarketing"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "landing_site", - Type: schema.TypeString, - Resolver: schema.PathResolver("LandingSite"), - }, - { - Name: "note_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NoteAttributes"), - }, - { - Name: "referring_site", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReferringSite"), - }, - { - Name: "shipping_lines", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ShippingLines"), - }, - { - Name: "taxes_included", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TaxesIncluded"), - }, - { - Name: "total_weight", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalWeight"), - }, - { - Name: "currency", - Type: schema.TypeString, - Resolver: schema.PathResolver("Currency"), - }, - { - Name: "completed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CompletedAt"), - }, - { - Name: "closed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClosedAt"), - }, - { - Name: "user_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UserID"), - }, - { - Name: "customer_locale", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerLocale"), - }, - { - Name: "line_items", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LineItems"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "abandoned_checkout_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("AbandonedCheckoutURL"), - }, - { - Name: "discount_codes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DiscountCodes"), - }, - { - Name: "tax_lines", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TaxLines"), - }, - { - Name: "source_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceName"), - }, - { - Name: "presentment_currency", - Type: schema.TypeString, - Resolver: schema.PathResolver("PresentmentCurrency"), - }, - { - Name: "buyer_accepts_sms_marketing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BuyerAcceptsSmsMarketing"), - }, - { - Name: "total_discounts", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalDiscounts"), - }, - { - Name: "total_line_items_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalLineItemsPrice"), - }, - { - Name: "total_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalPrice"), - }, - { - Name: "total_tax", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalTax"), - }, - { - Name: "subtotal_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubtotalPrice"), - }, - { - Name: "customer", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Customer"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/customer/customers.go b/plugins/source/shopify/resources/services/customer/customers.go index 1ec6c9c8bcb59c..db978de9f5c8a8 100644 --- a/plugins/source/shopify/resources/services/customer/customers.go +++ b/plugins/source/shopify/resources/services/customer/customers.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package customer import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Customers() *schema.Table { return &schema.Table{ - Name: "shopify_customers", - Resolver: fetchCustomers, + Name: "shopify_customers", + Resolver: fetchCustomers, + Transform: transformers.TransformWithStruct(&shopify.Customer{}), Columns: []schema.Column{ { Name: "id", @@ -19,116 +20,6 @@ func Customers() *schema.Table { PrimaryKey: true, }, }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "accepts_marketing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("AcceptsMarketing"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "first_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("FirstName"), - }, - { - Name: "last_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastName"), - }, - { - Name: "orders_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("OrdersCount"), - }, - { - Name: "state", - Type: schema.TypeString, - Resolver: schema.PathResolver("State"), - }, - { - Name: "total_spent", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalSpent"), - }, - { - Name: "last_order_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("LastOrderID"), - }, - { - Name: "verified_email", - Type: schema.TypeBool, - Resolver: schema.PathResolver("VerifiedEmail"), - }, - { - Name: "tax_exempt", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TaxExempt"), - }, - { - Name: "tags", - Type: schema.TypeString, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "last_order_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("LastOrderName"), - }, - { - Name: "currency", - Type: schema.TypeString, - Resolver: schema.PathResolver("Currency"), - }, - { - Name: "addresses", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Addresses"), - }, - { - Name: "accepts_marketing_updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("AcceptsMarketingUpdatedAt"), - }, - { - Name: "marketing_opt_in_level", - Type: schema.TypeString, - Resolver: schema.PathResolver("MarketingOptInLevel"), - }, - { - Name: "tax_exemptions", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TaxExemptions"), - }, - { - Name: "email_marketing_consent", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EmailMarketingConsent"), - }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, - { - Name: "default_address", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DefaultAddress"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/order/orders.go b/plugins/source/shopify/resources/services/order/orders.go index 038f73222f1d32..e486679494cb4c 100644 --- a/plugins/source/shopify/resources/services/order/orders.go +++ b/plugins/source/shopify/resources/services/order/orders.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package order import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Orders() *schema.Table { return &schema.Table{ - Name: "shopify_orders", - Resolver: fetchOrders, + Name: "shopify_orders", + Resolver: fetchOrders, + Transform: transformers.TransformWithStruct(&shopify.Order{}), Columns: []schema.Column{ { Name: "id", @@ -19,296 +20,6 @@ func Orders() *schema.Table { PrimaryKey: true, }, }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, - { - Name: "app_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("AppID"), - }, - { - Name: "browser_ip", - Type: schema.TypeString, - Resolver: schema.PathResolver("BrowserIP"), - }, - { - Name: "buyer_accepts_marketing", - Type: schema.TypeBool, - Resolver: schema.PathResolver("BuyerAcceptsMarketing"), - }, - { - Name: "cancelled_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CancelledAt"), - }, - { - Name: "cart_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("CartToken"), - }, - { - Name: "checkout_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("CheckoutID"), - }, - { - Name: "checkout_token", - Type: schema.TypeString, - Resolver: schema.PathResolver("CheckoutToken"), - }, - { - Name: "closed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ClosedAt"), - }, - { - Name: "confirmed", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Confirmed"), - }, - { - Name: "contact_email", - Type: schema.TypeString, - Resolver: schema.PathResolver("ContactEmail"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "currency", - Type: schema.TypeString, - Resolver: schema.PathResolver("Currency"), - }, - { - Name: "current_subtotal_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrentSubtotalPrice"), - }, - { - Name: "current_total_discounts", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrentTotalDiscounts"), - }, - { - Name: "current_total_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrentTotalPrice"), - }, - { - Name: "current_total_tax", - Type: schema.TypeString, - Resolver: schema.PathResolver("CurrentTotalTax"), - }, - { - Name: "customer_locale", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerLocale"), - }, - { - Name: "discount_codes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DiscountCodes"), - }, - { - Name: "email", - Type: schema.TypeString, - Resolver: schema.PathResolver("Email"), - }, - { - Name: "estimated_taxes", - Type: schema.TypeBool, - Resolver: schema.PathResolver("EstimatedTaxes"), - }, - { - Name: "financial_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("FinancialStatus"), - }, - { - Name: "gateway", - Type: schema.TypeString, - Resolver: schema.PathResolver("Gateway"), - }, - { - Name: "landing_site", - Type: schema.TypeString, - Resolver: schema.PathResolver("LandingSite"), - }, - { - Name: "name", - Type: schema.TypeString, - Resolver: schema.PathResolver("Name"), - }, - { - Name: "note_attributes", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("NoteAttributes"), - }, - { - Name: "number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Number"), - }, - { - Name: "order_number", - Type: schema.TypeInt, - Resolver: schema.PathResolver("OrderNumber"), - }, - { - Name: "order_status_url", - Type: schema.TypeString, - Resolver: schema.PathResolver("OrderStatusURL"), - }, - { - Name: "payment_gateway_names", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("PaymentGatewayNames"), - }, - { - Name: "phone", - Type: schema.TypeString, - Resolver: schema.PathResolver("Phone"), - }, - { - Name: "presentment_currency", - Type: schema.TypeString, - Resolver: schema.PathResolver("PresentmentCurrency"), - }, - { - Name: "processed_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("ProcessedAt"), - }, - { - Name: "processing_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProcessingMethod"), - }, - { - Name: "referring_site", - Type: schema.TypeString, - Resolver: schema.PathResolver("ReferringSite"), - }, - { - Name: "source_name", - Type: schema.TypeString, - Resolver: schema.PathResolver("SourceName"), - }, - { - Name: "subtotal_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("SubtotalPrice"), - }, - { - Name: "tags", - Type: schema.TypeString, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "tax_lines", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TaxLines"), - }, - { - Name: "taxes_included", - Type: schema.TypeBool, - Resolver: schema.PathResolver("TaxesIncluded"), - }, - { - Name: "test", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Test"), - }, - { - Name: "token", - Type: schema.TypeString, - Resolver: schema.PathResolver("Token"), - }, - { - Name: "total_discounts", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalDiscounts"), - }, - { - Name: "total_line_items_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalLineItemsPrice"), - }, - { - Name: "total_outstanding", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalOutstanding"), - }, - { - Name: "total_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalPrice"), - }, - { - Name: "total_price_usd", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalPriceUsd"), - }, - { - Name: "total_tax", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalTax"), - }, - { - Name: "total_tip_received", - Type: schema.TypeString, - Resolver: schema.PathResolver("TotalTipReceived"), - }, - { - Name: "total_weight", - Type: schema.TypeInt, - Resolver: schema.PathResolver("TotalWeight"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "user_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UserID"), - }, - { - Name: "customer", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Customer"), - }, - { - Name: "discount_applications", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("DiscountApplications"), - }, - { - Name: "fulfillments", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Fulfillments"), - }, - { - Name: "line_items", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("LineItems"), - }, - { - Name: "refunds", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Refunds"), - }, - { - Name: "shipping_lines", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("ShippingLines"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/price_rule/price_rule_discount_codes.go b/plugins/source/shopify/resources/services/price_rule/price_rule_discount_codes.go index 8028c8447e969d..07e56b30e83c94 100644 --- a/plugins/source/shopify/resources/services/price_rule/price_rule_discount_codes.go +++ b/plugins/source/shopify/resources/services/price_rule/price_rule_discount_codes.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package price_rule import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PriceRuleDiscountCodes() *schema.Table { return &schema.Table{ - Name: "shopify_price_rule_discount_codes", - Resolver: fetchPriceRuleDiscountCodes, + Name: "shopify_price_rule_discount_codes", + Resolver: fetchPriceRuleDiscountCodes, + Transform: transformers.TransformWithStruct(&shopify.DiscountCode{}), Columns: []schema.Column{ { Name: "id", @@ -27,26 +28,6 @@ func PriceRuleDiscountCodes() *schema.Table { PrimaryKey: true, }, }, - { - Name: "code", - Type: schema.TypeString, - Resolver: schema.PathResolver("Code"), - }, - { - Name: "usage_count", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UsageCount"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/price_rule/price_rules.go b/plugins/source/shopify/resources/services/price_rule/price_rules.go index d6b925236beca3..ba7457f7b37a77 100644 --- a/plugins/source/shopify/resources/services/price_rule/price_rules.go +++ b/plugins/source/shopify/resources/services/price_rule/price_rules.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package price_rule import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func PriceRules() *schema.Table { return &schema.Table{ - Name: "shopify_price_rules", - Resolver: fetchPriceRules, + Name: "shopify_price_rules", + Resolver: fetchPriceRules, + Transform: transformers.TransformWithStruct(&shopify.PriceRule{}), Columns: []schema.Column{ { Name: "id", @@ -19,131 +20,6 @@ func PriceRules() *schema.Table { PrimaryKey: true, }, }, - { - Name: "value_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ValueType"), - }, - { - Name: "value", - Type: schema.TypeString, - Resolver: schema.PathResolver("Value"), - }, - { - Name: "customer_selection", - Type: schema.TypeString, - Resolver: schema.PathResolver("CustomerSelection"), - }, - { - Name: "target_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetType"), - }, - { - Name: "target_selection", - Type: schema.TypeString, - Resolver: schema.PathResolver("TargetSelection"), - }, - { - Name: "allocation_method", - Type: schema.TypeString, - Resolver: schema.PathResolver("AllocationMethod"), - }, - { - Name: "once_per_customer", - Type: schema.TypeBool, - Resolver: schema.PathResolver("OncePerCustomer"), - }, - { - Name: "usage_limit", - Type: schema.TypeInt, - Resolver: schema.PathResolver("UsageLimit"), - }, - { - Name: "starts_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("StartsAt"), - }, - { - Name: "ends_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("EndsAt"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "entitled_product_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EntitledProductIds"), - }, - { - Name: "entitled_variant_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EntitledVariantIds"), - }, - { - Name: "entitled_collection_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EntitledCollectionIds"), - }, - { - Name: "entitled_country_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("EntitledCountryIds"), - }, - { - Name: "prerequisite_product_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteProductIds"), - }, - { - Name: "prerequisite_variant_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteVariantIds"), - }, - { - Name: "prerequisite_collection_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteCollectionIds"), - }, - { - Name: "customer_segment_prerequisite_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("CustomerSegmentPrerequisiteIds"), - }, - { - Name: "prerequisite_customer_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteCustomerIds"), - }, - { - Name: "prerequisite_to_entitlement_quantity_ratio", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteToEntitlementQuantityRatio"), - }, - { - Name: "prerequisite_to_entitlement_purchase", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("PrerequisiteToEntitlementPurchase"), - }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/shopify/resources/services/product/product_images.go b/plugins/source/shopify/resources/services/product/product_images.go index 06230f56a91d6c..4c4cf4368dd999 100644 --- a/plugins/source/shopify/resources/services/product/product_images.go +++ b/plugins/source/shopify/resources/services/product/product_images.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package product import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ProductImages() *schema.Table { return &schema.Table{ - Name: "shopify_product_images", - Resolver: fetchProductImages, + Name: "shopify_product_images", + Resolver: fetchProductImages, + Transform: transformers.TransformWithStruct(&shopify.ProductImage{}), Columns: []schema.Column{ { Name: "product_id", @@ -27,51 +28,6 @@ func ProductImages() *schema.Table { PrimaryKey: true, }, }, - { - Name: "position", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Position"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "alt", - Type: schema.TypeString, - Resolver: schema.PathResolver("Alt"), - }, - { - Name: "width", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Width"), - }, - { - Name: "height", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Height"), - }, - { - Name: "src", - Type: schema.TypeString, - Resolver: schema.PathResolver("Src"), - }, - { - Name: "variant_ids", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("VariantIDs"), - }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/product/product_variants.go b/plugins/source/shopify/resources/services/product/product_variants.go index 7266cfff725277..8e84d10a8c1b7e 100644 --- a/plugins/source/shopify/resources/services/product/product_variants.go +++ b/plugins/source/shopify/resources/services/product/product_variants.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package product import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func ProductVariants() *schema.Table { return &schema.Table{ - Name: "shopify_product_variants", - Resolver: fetchProductVariants, + Name: "shopify_product_variants", + Resolver: fetchProductVariants, + Transform: transformers.TransformWithStruct(&shopify.ProductVariant{}), Columns: []schema.Column{ { Name: "product_id", @@ -27,106 +28,6 @@ func ProductVariants() *schema.Table { PrimaryKey: true, }, }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "price", - Type: schema.TypeString, - Resolver: schema.PathResolver("Price"), - }, - { - Name: "sku", - Type: schema.TypeString, - Resolver: schema.PathResolver("Sku"), - }, - { - Name: "position", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Position"), - }, - { - Name: "inventory_policy", - Type: schema.TypeString, - Resolver: schema.PathResolver("InventoryPolicy"), - }, - { - Name: "compare_at_price", - Type: schema.TypeString, - Resolver: schema.PathResolver("CompareAtPrice"), - }, - { - Name: "fulfillment_service", - Type: schema.TypeString, - Resolver: schema.PathResolver("FulfillmentService"), - }, - { - Name: "inventory_management", - Type: schema.TypeString, - Resolver: schema.PathResolver("InventoryManagement"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "taxable", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Taxable"), - }, - { - Name: "barcode", - Type: schema.TypeString, - Resolver: schema.PathResolver("Barcode"), - }, - { - Name: "grams", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Grams"), - }, - { - Name: "weight", - Type: schema.TypeFloat, - Resolver: schema.PathResolver("Weight"), - }, - { - Name: "weight_unit", - Type: schema.TypeString, - Resolver: schema.PathResolver("WeightUnit"), - }, - { - Name: "inventory_item_id", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InventoryItemID"), - }, - { - Name: "inventory_quantity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("InventoryQuantity"), - }, - { - Name: "old_inventory_quantity", - Type: schema.TypeInt, - Resolver: schema.PathResolver("OldInventoryQuantity"), - }, - { - Name: "requires_shipping", - Type: schema.TypeBool, - Resolver: schema.PathResolver("RequiresShipping"), - }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, }, } } diff --git a/plugins/source/shopify/resources/services/product/products.go b/plugins/source/shopify/resources/services/product/products.go index ff4931f6961091..7051bbdfcf2f69 100644 --- a/plugins/source/shopify/resources/services/product/products.go +++ b/plugins/source/shopify/resources/services/product/products.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package product import ( + "github.com/cloudquery/cloudquery/plugins/source/shopify/internal/shopify" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" ) func Products() *schema.Table { return &schema.Table{ - Name: "shopify_products", - Resolver: fetchProducts, + Name: "shopify_products", + Resolver: fetchProducts, + Transform: transformers.TransformWithStruct(&shopify.Product{}, transformers.WithSkipFields("Variants", "Images")), Columns: []schema.Column{ { Name: "id", @@ -19,76 +20,6 @@ func Products() *schema.Table { PrimaryKey: true, }, }, - { - Name: "title", - Type: schema.TypeString, - Resolver: schema.PathResolver("Title"), - }, - { - Name: "body_html", - Type: schema.TypeString, - Resolver: schema.PathResolver("BodyHTML"), - }, - { - Name: "vendor", - Type: schema.TypeString, - Resolver: schema.PathResolver("Vendor"), - }, - { - Name: "product_type", - Type: schema.TypeString, - Resolver: schema.PathResolver("ProductType"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "handle", - Type: schema.TypeString, - Resolver: schema.PathResolver("Handle"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, - { - Name: "published_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("PublishedAt"), - }, - { - Name: "template_suffix", - Type: schema.TypeString, - Resolver: schema.PathResolver("TemplateSuffix"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "published_scope", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublishedScope"), - }, - { - Name: "tags", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "image", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Image"), - }, - { - Name: "admin_graphql_api_id", - Type: schema.TypeString, - Resolver: schema.PathResolver("AdminGraphqlAPIID"), - }, }, Relations: []*schema.Table{ From ec29565b50a72d38162949d6e01ddb8e7ab54d3b Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:05:40 +0000 Subject: [PATCH 179/221] fix(digitalocean): Remove codegen, upgrade SDK (#6569) DO had some codegen leftovers --- plugins/source/digitalocean/client/client.go | 3 +- plugins/source/digitalocean/client/testing.go | 2 +- plugins/source/digitalocean/codegen/main.go | 396 ------------------ .../digitalocean/codegen/recipes/base.go | 121 ------ .../codegen/recipes/templates/resource.go.tpl | 14 - plugins/source/digitalocean/go.mod | 4 +- plugins/source/digitalocean/go.sum | 8 +- 7 files changed, 6 insertions(+), 542 deletions(-) delete mode 100644 plugins/source/digitalocean/codegen/main.go delete mode 100644 plugins/source/digitalocean/codegen/recipes/base.go delete mode 100644 plugins/source/digitalocean/codegen/recipes/templates/resource.go.tpl diff --git a/plugins/source/digitalocean/client/client.go b/plugins/source/digitalocean/client/client.go index 3a1a38009f77bb..934828cbe0a6ea 100644 --- a/plugins/source/digitalocean/client/client.go +++ b/plugins/source/digitalocean/client/client.go @@ -9,6 +9,7 @@ import ( awscfg "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/smithy-go/logging" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/digitalocean/godo" @@ -130,7 +131,7 @@ func (s *ServicesManager) ServicesByRegion(region string) *Services { return s.services[region] } -func New(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { // providerConfig := config.(*Config) var doSpec Spec if err := s.UnmarshalSpec(&doSpec); err != nil { diff --git a/plugins/source/digitalocean/client/testing.go b/plugins/source/digitalocean/client/testing.go index c111048b54f474..89ff36cea1a97c 100644 --- a/plugins/source/digitalocean/client/testing.go +++ b/plugins/source/digitalocean/client/testing.go @@ -27,7 +27,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createService func(t *tes zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var doSpec Spec if err := spec.UnmarshalSpec(&doSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal do spec: %w", err) diff --git a/plugins/source/digitalocean/codegen/main.go b/plugins/source/digitalocean/codegen/main.go deleted file mode 100644 index bc228ed560816f..00000000000000 --- a/plugins/source/digitalocean/codegen/main.go +++ /dev/null @@ -1,396 +0,0 @@ -package main - -import ( - "log" - - "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/cloudquery/cloudquery/plugins/source/digitalocean/codegen/recipes" - "github.com/cloudquery/cloudquery/plugins/source/digitalocean/resources/services/droplets" - "github.com/cloudquery/cloudquery/plugins/source/digitalocean/resources/services/spaces" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/digitalocean/godo" -) - -var Resources = []*recipes.Resource{ - { - Service: "accounts", - Struct: godo.Account{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "uuid", - Type: schema.TypeString, - Resolver: `schema.PathResolver("UUID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"UUID"}, - }, - { - Service: "cdns", - Struct: godo.CDN{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - // BillingHistory has two types of entries: invoices and payments. Payments - // do not have a unique ID, so we assign no PK to this table. - Service: "billing_history", - Struct: godo.BillingHistoryEntry{}, - }, - { - Service: "monitoring", - SubService: "alert_policies", - Struct: godo.AlertPolicy{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "uuid", - Type: schema.TypeString, - Resolver: `schema.PathResolver("UUID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"UUID"}, - }, - { - Service: "balances", - Struct: godo.Balance{}, - }, - { - Service: "certificates", - Struct: godo.Certificate{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "databases", - Struct: godo.Database{}, - Relations: []string{"FirewallRules()", "Replicas()", "Backups()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "databases", - Struct: godo.DatabaseBackup{}, - SubService: "backups", - }, - { - Service: "databases", - SubService: "replicas", - Struct: godo.DatabaseReplica{}, - }, - { - Service: "databases", - SubService: "firewall_rules", - Struct: godo.DatabaseFirewallRule{}, - }, - { - Service: "domains", - Struct: godo.Domain{}, - Relations: []string{"Records()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"Name"}, - }, - { - Service: "domains", - SubService: "records", - Struct: godo.DomainRecord{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "droplets", - Struct: godo.Droplet{}, - Relations: []string{"Neighbors()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "backup_ids", - Type: schema.TypeIntArray, - Resolver: `schema.PathResolver("BackupIDs")`, - }, - { - Name: "snapshot_ids", - Type: schema.TypeIntArray, - Resolver: `schema.PathResolver("SnapshotIDs")`, - }, - { - Name: "volume_ids", - Type: schema.TypeStringArray, - Resolver: `schema.PathResolver("VolumeIDs")`, - }, - { - Name: "id", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"BackupIDs", "SnapshotIDs", "VolumeIDs", "ID"}, - }, - { - Service: "droplets", - SubService: "neighbors", - Struct: &droplets.NeighborWrapper{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "neighbor_id", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("NeighborId")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"NeighborId"}, - }, - { - Service: "firewalls", - Struct: godo.Firewall{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "droplet_ids", - Type: schema.TypeIntArray, - Resolver: `schema.PathResolver("DropletIDs")`, - }, - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"DropletIDs", "ID"}, - }, - - { - Service: "floating_ips", - Struct: godo.FloatingIP{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "ip", - Type: schema.TypeString, - Resolver: `schema.PathResolver("IP")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"IP"}, - }, - { - Service: "images", - Struct: godo.Image{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "keys", - Struct: godo.Key{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeInt, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "projects", - Struct: godo.Project{}, - Relations: []string{"Resources()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "projects", - SubService: "resources", - Struct: godo.ProjectResource{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "urn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("URN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"URN"}, - }, - { - Service: "registries", - Struct: &godo.Registry{}, - Relations: []string{"Repositories()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"Name"}, - }, - { - Service: "registries", - SubService: "repositories", - Struct: &godo.Repository{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "name", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Name")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"Name"}, - }, - { - Service: "sizes", - Struct: godo.Size{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "slug", - Type: schema.TypeString, - Resolver: `schema.PathResolver("Slug")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"Slug"}, - }, - { - Service: "snapshots", - Struct: godo.Snapshot{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "spaces", - Struct: spaces.WrappedBucket{}, - PostResolver: "resolveSpaceAttributes", - Multiplex: "client.SpacesRegionMultiplex", - Imports: []string{"github.com/cloudquery/cloudquery/plugins/source/digitalocean/client"}, - Relations: []string{"Cors()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "acls", - Type: schema.TypeJSON, - Resolver: `schema.PathResolver("ACLs")`, - }, - }, - SkipFields: []string{"ACLs"}, - }, - { - Service: "spaces", - SubService: "cors", - Struct: types.CORSRule{}, - // 'id' is not a PK - it can be `null` when arriving from the upstream API. - }, - { - Service: "storage", - SubService: "volumes", - Struct: godo.Volume{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - { - Name: "droplet_ids", - Type: schema.TypeIntArray, - Resolver: `schema.PathResolver("DropletIDs")`, - }, - }, - SkipFields: []string{"DropletIDs", "ID"}, - }, - { - Service: "vpcs", - Struct: &godo.VPC{}, - Relations: []string{"Members()"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "id", - Type: schema.TypeString, - Resolver: `schema.PathResolver("ID")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"ID"}, - }, - { - Service: "vpcs", - SubService: "members", - Struct: &godo.VPCMember{}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "urn", - Type: schema.TypeString, - Resolver: `schema.PathResolver("URN")`, - Options: schema.ColumnCreationOptions{PrimaryKey: true}, - }, - }, - SkipFields: []string{"URN"}, - }, -} - -func main() { - for _, r := range Resources { - if err := r.Generate(); err != nil { - log.Fatal(err) - } - } -} diff --git a/plugins/source/digitalocean/codegen/recipes/base.go b/plugins/source/digitalocean/codegen/recipes/base.go deleted file mode 100644 index ab9f7475b5124e..00000000000000 --- a/plugins/source/digitalocean/codegen/recipes/base.go +++ /dev/null @@ -1,121 +0,0 @@ -package recipes - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "os" - "path" - "runtime" - "strings" - "text/template" - - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/gertd/go-pluralize" - "github.com/iancoleman/strcase" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -type Resource struct { - // Table is the table definition that will be used to generate the cloudquery table - Table *codegen.TableDefinition - // Struct that will be used to generate the cloudquery table - Struct any - // Service is the name of the digitalocean service the struct/api is residing - Service string - // SubService is the name of the subservice - SubService string - // Relations list of resources that are relations of current resource - Relations []string - // imports to add for this resource - Imports []string - // Multiplex - Multiplex string - // SkipFields fields in go struct to skip when generating the table from the go struct - SkipFields []string - // Columns override, override generated columns - ExtraColumns []codegen.ColumnDefinition - // PostResolver name of post resolver function - PostResolver string - // TableName name of the table - TableName string -} - -func (r *Resource) Generate() error { - _, filename, _, ok := runtime.Caller(0) - if !ok { - return fmt.Errorf("failed to get caller information") - } - dir := path.Dir(filename) - - var err error - opts := []codegen.TableOption{ - codegen.WithSkipFields(r.SkipFields), - codegen.WithExtraColumns(r.ExtraColumns), - } - - plural := pluralize.NewClient() - if r.TableName == "" { - r.TableName = fmt.Sprintf("digitalocean_%s_%s", plural.Singular(r.Service), r.SubService) - if r.SubService == "" { - r.SubService = r.Service - r.TableName = fmt.Sprintf("digitalocean_%s", r.Service) - } - } - - r.Table, err = codegen.NewTableFromStruct( - r.TableName, - r.Struct, - opts..., - ) - if err != nil { - return err - } - r.Table.Resolver = "fetch" + strcase.ToCamel(r.Service) + strcase.ToCamel(r.SubService) - if r.Multiplex != "" { - r.Table.Multiplex = r.Multiplex - } - - if r.Relations != nil { - r.Table.Relations = r.Relations - } - - if r.PostResolver != "" { - r.Table.PostResourceResolver = r.PostResolver - } - - tpl, err := template.New("resource.go.tpl").Funcs(template.FuncMap{ - "ToCamel": strcase.ToCamel, - "ToLower": strings.ToLower, - }).ParseFS(templatesFS, "templates/resource.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse templates: %w", err) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse sdk template: %w", err) - } - - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - return fmt.Errorf("failed to execute template: %w", err) - } - dir = path.Join(dir, "../../resources/services", r.Service) - if err := os.MkdirAll(dir, os.ModePerm); err != nil { - return fmt.Errorf("failed to create directory %s: %w", dir, err) - } - - filePath := path.Join(dir, r.SubService+".go") - content, err := format.Source(buff.Bytes()) - if err != nil { - return fmt.Errorf("failed to format source: %s: %w", filePath, err) - } - - if err := os.WriteFile(filePath, content, 0644); err != nil { - return fmt.Errorf("failed to write file %s: %w", filePath, err) - } - return nil -} diff --git a/plugins/source/digitalocean/codegen/recipes/templates/resource.go.tpl b/plugins/source/digitalocean/codegen/recipes/templates/resource.go.tpl deleted file mode 100644 index 37f32d7f5b2dde..00000000000000 --- a/plugins/source/digitalocean/codegen/recipes/templates/resource.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" - {{range .Imports}} - "{{.}}" - {{end}} -) - -func {{.SubService | ToCamel}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} \ No newline at end of file diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index b6e571938eb668..b65fb16ec92e90 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -8,11 +8,9 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.8 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/smithy-go v1.13.5 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/digitalocean/godo v1.93.0 - github.com/gertd/go-pluralize v0.2.1 github.com/golang/mock v1.6.0 - github.com/iancoleman/strcase v0.2.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 0bee10879f7103..d66332c5714615 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -77,8 +77,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -95,8 +95,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -173,8 +171,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= From e20988e647d450c4cc9110d2a38f72dbd8be8ddb Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Tue, 10 Jan 2023 14:05:56 +0200 Subject: [PATCH 180/221] fix(website): Set Id for Hacker News source plugin in overview table (#6571) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary We need to set the id where we can't easily use the name to link to the overview. Another option is to update the login in https://github.com/cloudquery/cloudquery/blob/d089745836f4d6a3e862ea7a98e57fd5054fa970/website/components/PluginsTable.tsx#L65 to strip whitespaces when defaulting to `name` --- website/pages/docs/plugins/sources/overview.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/pages/docs/plugins/sources/overview.mdx b/website/pages/docs/plugins/sources/overview.mdx index 24bf61fc19d580..696a4d0e0b84aa 100644 --- a/website/pages/docs/plugins/sources/overview.mdx +++ b/website/pages/docs/plugins/sources/overview.mdx @@ -23,7 +23,7 @@ Official source plugins follow [release stages](#source-plugin-release-stages). { name: "Fastly", stage:"Preview" }, { name: "GitHub", stage:"GA" }, { name: "GitLab", stage:"Preview" }, - { name: "Hacker News", stage:"Preview" }, + { name: "Hacker News", stage:"Preview", id: `hackernews` }, { name: "Heroku", stage:"Preview" }, { name: "k8s", stage:"Preview" }, { name: "Okta", stage:"Preview" }, From 18b2c2569deed9e165b239393c3c926f6c0ae27e Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:09:39 +0000 Subject: [PATCH 181/221] fix(gandi): Remove codegen, upgrade SDK (#6570) --- plugins/source/gandi/Makefile | 7 +- plugins/source/gandi/client/client.go | 3 +- plugins/source/gandi/client/testing.go | 2 +- plugins/source/gandi/codegen/main.go | 109 ----------- .../gandi/codegen/recipes/certificates.go | 22 --- .../source/gandi/codegen/recipes/domains.go | 56 ------ .../source/gandi/codegen/recipes/livedns.go | 29 --- .../source/gandi/codegen/recipes/recipes.go | 170 ------------------ .../gandi/codegen/recipes/simplehosting.go | 29 --- .../gandi/codegen/templates/resource.go.tpl | 14 -- .../docs/tables/gandi_domain_dnssec_keys.md | 2 +- .../docs/tables/gandi_domain_glue_records.md | 2 +- .../source/gandi/docs/tables/gandi_domains.md | 4 +- plugins/source/gandi/go.mod | 3 +- plugins/source/gandi/go.sum | 6 +- .../certificates/certificate_packages.go | 39 +--- .../services/certificates/certificates.go | 54 +----- .../services/domains/domain_dnssec_keys.go | 39 +--- .../services/domains/domain_glue_records.go | 24 +-- .../services/domains/domain_livedns.go | 29 +-- .../domains/domain_web_redirections.go | 39 +--- .../resources/services/domains/domains.go | 80 +-------- .../livedns/livedns_domain_snapshots.go | 2 - .../services/livedns/livedns_domains.go | 2 - .../simplehosting_instance_vhosts.go | 2 - .../simplehosting/simplehosting_instances.go | 2 - 26 files changed, 44 insertions(+), 726 deletions(-) delete mode 100644 plugins/source/gandi/codegen/main.go delete mode 100644 plugins/source/gandi/codegen/recipes/certificates.go delete mode 100644 plugins/source/gandi/codegen/recipes/domains.go delete mode 100644 plugins/source/gandi/codegen/recipes/livedns.go delete mode 100644 plugins/source/gandi/codegen/recipes/recipes.go delete mode 100644 plugins/source/gandi/codegen/recipes/simplehosting.go delete mode 100644 plugins/source/gandi/codegen/templates/resource.go.tpl diff --git a/plugins/source/gandi/Makefile b/plugins/source/gandi/Makefile index 85e78867aca9f6..e1a4ffe3bacc1f 100644 --- a/plugins/source/gandi/Makefile +++ b/plugins/source/gandi/Makefile @@ -24,11 +24,6 @@ gen-docs: lint: golangci-lint run --config ../../.golangci.yml -.PHONY: gen-code -gen-code: - grep -rl '// Code generated by codegen; DO NOT EDIT.' resources/services/* | xargs rm - go run codegen/main.go - # All gen targets .PHONY: gen -gen: gen-code gen-docs +gen: gen-docs diff --git a/plugins/source/gandi/client/client.go b/plugins/source/gandi/client/client.go index e2908e10c9e445..2549ba787e9b90 100644 --- a/plugins/source/gandi/client/client.go +++ b/plugins/source/gandi/client/client.go @@ -6,6 +6,7 @@ import ( "fmt" "time" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/go-gandi/go-gandi" @@ -46,7 +47,7 @@ func (c *Client) ID() string { return c.sharingID } -func Configure(_ context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(_ context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { gaSpec := &Spec{} if err := s.UnmarshalSpec(gaSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal gandi spec: %w", err) diff --git a/plugins/source/gandi/client/testing.go b/plugins/source/gandi/client/testing.go index bd7729035ecf0e..aee0754adf40d1 100644 --- a/plugins/source/gandi/client/testing.go +++ b/plugins/source/gandi/client/testing.go @@ -30,7 +30,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var gaSpec Spec if err := spec.UnmarshalSpec(&gaSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal gandi spec: %w", err) diff --git a/plugins/source/gandi/codegen/main.go b/plugins/source/gandi/codegen/main.go deleted file mode 100644 index 387f0577561909..00000000000000 --- a/plugins/source/gandi/codegen/main.go +++ /dev/null @@ -1,109 +0,0 @@ -package main - -import ( - "bytes" - "embed" - "fmt" - "go/format" - "log" - "os" - "path" - "runtime" - "strings" - "text/template" - - "github.com/cloudquery/cloudquery/plugins/source/gandi/codegen/recipes" - "github.com/cloudquery/plugin-sdk/codegen" -) - -//go:embed templates/*.go.tpl -var templatesFS embed.FS - -func main() { - var resources []*recipes.Resource - resources = append(resources, recipes.CertificateResources()...) - resources = append(resources, recipes.DomainResources()...) - resources = append(resources, recipes.LiveDNSResources()...) - resources = append(resources, recipes.SimpleHostingResources()...) - - for _, r := range resources { - r.Infer() - } - if err := recipes.SetParentChildRelationships(resources); err != nil { - log.Fatal(err) - } - for _, r := range resources { - r.GenerateNames() - - _, filename, _, ok := runtime.Caller(0) - if !ok { - log.Fatal("Failed to get caller information") - } - codegenDir := path.Join(path.Dir(filename), "..", "resources", "services") - - generateTable(codegenDir, *r) - } -} - -func generateTable(basedir string, r recipes.Resource) { - var err error - - r.TableName = "gandi_" + r.TableName - - log.Println("Generating table", r.TableName) - opts := []codegen.TableOption{ - codegen.WithSkipFields(r.SkipFields), - codegen.WithExtraColumns(r.ExtraColumns), - codegen.WithPKColumns(r.PKColumns...), - } - if r.UnwrapEmbeddedStructs { - opts = append(opts, codegen.WithUnwrapAllEmbeddedStructs()) - } - r.Table, err = codegen.NewTableFromStruct(r.TableName, r.DataStruct, opts...) - - if err != nil { - log.Fatal(err) - } - - r.Table.Resolver = r.ResolverFuncName - r.Table.Multiplex = r.Multiplex - r.ImportClient = strings.HasPrefix(r.Multiplex, "client.") - r.Table.Relations = r.Relations - r.Table.PreResourceResolver = r.PreResourceResolver - r.Table.PostResourceResolver = r.PostResourceResolver - - for _, c := range r.Table.Columns { - if strings.HasPrefix(c.Resolver, "client.") { - r.ImportClient = true - } - } - - mainTemplate := r.Template + ".go.tpl" - tpl, err := template.New(mainTemplate).ParseFS(templatesFS, "templates/"+mainTemplate) - if err != nil { - log.Fatal(fmt.Errorf("failed to parse gandi templates: %w", err)) - } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - log.Fatal(fmt.Errorf("failed to parse recipes template: %w", err)) - } - var buff bytes.Buffer - if err := tpl.Execute(&buff, r); err != nil { - log.Fatal(fmt.Errorf("failed to execute template: %w", err)) - } - - pkgPath := path.Join(basedir, r.Service) - if err := os.Mkdir(pkgPath, 0755); err != nil && !os.IsExist(err) { - log.Fatal(err) - } - - filePath := path.Join(pkgPath, r.Filename) - content, err := format.Source(buff.Bytes()) - if err != nil { - fmt.Println(buff.String()) - log.Fatal(fmt.Errorf("failed to format code for %s: %w", filePath, err)) - } - if err := os.WriteFile(filePath, content, 0644); err != nil { - log.Fatal(fmt.Errorf("failed to write file %s: %w", filePath, err)) - } -} diff --git a/plugins/source/gandi/codegen/recipes/certificates.go b/plugins/source/gandi/codegen/recipes/certificates.go deleted file mode 100644 index 3124b4392e58c7..00000000000000 --- a/plugins/source/gandi/codegen/recipes/certificates.go +++ /dev/null @@ -1,22 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/go-gandi/go-gandi/certificate" -) - -func CertificateResources() []*Resource { - return []*Resource{ - { - DataStruct: &certificate.CertificateType{}, - PKColumns: []string{"id"}, - ExtraColumns: []codegen.ColumnDefinition{SharingIDColumn}, - SkipSubserviceName: true, - }, - { - DataStruct: &certificate.Package{}, - PKColumns: []string{"name"}, - ExtraColumns: []codegen.ColumnDefinition{SharingIDColumn}, - }, - } -} diff --git a/plugins/source/gandi/codegen/recipes/domains.go b/plugins/source/gandi/codegen/recipes/domains.go deleted file mode 100644 index d1ba49a73f12ab..00000000000000 --- a/plugins/source/gandi/codegen/recipes/domains.go +++ /dev/null @@ -1,56 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/go-gandi/go-gandi/domain" -) - -func DomainResources() []*Resource { - return []*Resource{ - { - DataStruct: &domain.Details{}, - PKColumns: []string{"id"}, - Relations: []string{"DomainLiveDNS()", "DomainWebRedirections()", "DomainGlueRecords()", "DomainDNSSecKeys()"}, - PreResourceResolver: "getDomain", - SkipSubserviceName: true, - }, - { - DataStruct: &domain.LiveDNS{}, - PKColumns: []string{"fqdn"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "fqdn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("fqdn")`, - }, - }, - }, - { - DataStruct: &domain.DNSSECKey{}, - PKColumns: []string{"fqdn", "id"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "fqdn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("fqdn")`, - }, - }, - }, - { - DataStruct: &domain.GlueRecord{}, - PKColumns: []string{"fqdn", "name"}, - }, - { - DataStruct: &domain.WebRedirection{}, - PKColumns: []string{"fqdn", "host", "type"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "fqdn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("fqdn")`, - }, - }, - }, - } -} diff --git a/plugins/source/gandi/codegen/recipes/livedns.go b/plugins/source/gandi/codegen/recipes/livedns.go deleted file mode 100644 index d12a41cb212b57..00000000000000 --- a/plugins/source/gandi/codegen/recipes/livedns.go +++ /dev/null @@ -1,29 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/go-gandi/go-gandi/livedns" -) - -func LiveDNSResources() []*Resource { - return []*Resource{ - { - DataStruct: &livedns.Domain{}, - PKColumns: []string{"fqdn"}, - ExtraColumns: []codegen.ColumnDefinition{SharingIDColumn}, - Relations: []string{"LiveDNSDomainSnapshots()"}, - }, - { - DataStruct: &livedns.Snapshot{}, - PKColumns: []string{"fqdn", "id"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "fqdn", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("fqdn")`, - }, - }, - }, - } -} diff --git a/plugins/source/gandi/codegen/recipes/recipes.go b/plugins/source/gandi/codegen/recipes/recipes.go deleted file mode 100644 index 86510374700659..00000000000000 --- a/plugins/source/gandi/codegen/recipes/recipes.go +++ /dev/null @@ -1,170 +0,0 @@ -package recipes - -import ( - "fmt" - "log" - "path" - "reflect" - "strings" - - "github.com/cloudquery/plugin-sdk/caser" - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/gertd/go-pluralize" -) - -type Resource struct { - // Table is the table definition that will be used to generate the cloudquery table - Table *codegen.TableDefinition - // DataStruct that will be used to generate the cloudquery table - DataStruct any - // SkipFields fields in go struct to skip when generating the table from the go struct - SkipFields []string - Template string - Multiplex string - - ExtraColumns []codegen.ColumnDefinition - PKColumns []string - - PreResourceResolver string - PostResourceResolver string - Relations []string - UnwrapEmbeddedStructs bool - - SkipSubserviceName bool // Skip name of the subservice in auto generated table names (including relations) - - // These are inferred with reflection but can be overridden - Service string // Inferred from DataStruct package, pluralized - SubService string // Inferred from DataStruct name, singular - TableName string // singular Service + plural SubService - - // These are auto calculated - ImportClient bool // true if the resource/column resolvers use the client package - Filename string // Calculated from TableName - TableFuncName string // Calculated from TableName - ResolverFuncName string // Calculated from TableFuncName - - //used for generating better table names - parent *Resource - children []*Resource -} - -var ( - SharingIDColumn = codegen.ColumnDefinition{ - Name: "sharing_id", - Description: "The Sharing ID of the resource.", - Type: schema.TypeString, - Resolver: "client.ResolveSharingID", - } - - pluralizeClient *pluralize.Client - csr *caser.Caser -) - -func init() { - pluralizeClient = pluralize.NewClient() - for _, s := range []string{"livedns", "simplehosting"} { - pluralizeClient.AddUncountableRule(s) - } - - csr = caser.New( - caser.WithCustomInitialisms(map[string]bool{ - "DNS": true, - "DNSSec": true, - "LiveDNS": true, - //"Simplehosting": true, - //"Vhost": true, - }), - caser.WithCustomExceptions(map[string]string{ - "dnssec": "DNSSec", - "livedns": "LiveDNS", - "vhost": "Vhost", - }), - ) -} - -func enforceAbbrevations(word string) string { - word = strings.ReplaceAll(word, "live_dns", "livedns") - word = strings.ReplaceAll(word, "dns_sec", "dnssec") - return word -} - -func toSnake(word string) string { - return enforceAbbrevations(csr.ToSnake(word)) -} - -func (r *Resource) Infer() { - // Set defaults and/or infer fields - if r.Template == "" { - r.Template = "resource" - } - - ds := reflect.TypeOf(r.DataStruct) - if ds.Kind() == reflect.Ptr { - ds = ds.Elem() - } - basepkg := strings.ToLower(path.Base(ds.PkgPath())) - - if r.Service == "" { - if !pluralizeClient.IsPlural(basepkg) { - basepkg = pluralizeClient.Plural(basepkg) - } - r.Service = basepkg - } - if r.SubService == "" { - r.SubService = toSnake(pluralizeClient.Singular(ds.Name())) - } -} - -func (r *Resource) GenerateNames() { - if r.TableName == "" { - nParts := []string{pluralizeClient.Singular(r.Service)} - p := r.parent - for p != nil { - if !p.SkipSubserviceName { - nParts = append(nParts, pluralizeClient.Singular(p.SubService)) - } - p = p.parent - } - if !r.SkipSubserviceName { - nParts = append(nParts, pluralizeClient.Plural(r.SubService)) - } - if l := len(nParts); l == 1 { - nParts[0] = pluralizeClient.Plural(nParts[0]) - } else if l == 0 { - log.Fatalf("Could not generate table name for %s.%s", r.Service, r.SubService) - } - - if r.TableName == "" { - r.TableName = strings.Join(nParts, "_") - } - } - - r.Filename = toSnake(r.TableName) + ".go" - r.TableFuncName = csr.ToPascal(r.TableName) - r.ResolverFuncName = "fetch" + r.TableFuncName -} - -// SetParentChildRelationships calculates and sets the parent and children fields on resources. -func SetParentChildRelationships(resources []*Resource) error { - m := map[string]*Resource{} - for _, r := range resources { - key := enforceAbbrevations(pluralizeClient.Singular(r.Service) + "_" + pluralizeClient.Plural(r.SubService)) - m[key] = r - } - for _, r := range resources { - for _, ch := range r.Relations { - name := strings.TrimPrefix(toSnake(strings.TrimSuffix(ch, "()")), r.Service+"_"+r.SubService+"_") - if !r.SkipSubserviceName { - name = r.Service + "_" + name - } - v, ok := m[name] - if !ok { - return fmt.Errorf("child not found for %s.%s: %s missing", r.Service, r.SubService, name) - } - r.children = append(r.children, v) - v.parent = r - } - } - return nil -} diff --git a/plugins/source/gandi/codegen/recipes/simplehosting.go b/plugins/source/gandi/codegen/recipes/simplehosting.go deleted file mode 100644 index a981ebbb7d5d4c..00000000000000 --- a/plugins/source/gandi/codegen/recipes/simplehosting.go +++ /dev/null @@ -1,29 +0,0 @@ -package recipes - -import ( - "github.com/cloudquery/plugin-sdk/codegen" - "github.com/cloudquery/plugin-sdk/schema" - "github.com/go-gandi/go-gandi/simplehosting" -) - -func SimpleHostingResources() []*Resource { - return []*Resource{ - { - DataStruct: &simplehosting.Instance{}, - PKColumns: []string{"id"}, - ExtraColumns: []codegen.ColumnDefinition{SharingIDColumn}, - Relations: []string{"SimplehostingInstanceVhosts()"}, - }, - { - DataStruct: &simplehosting.Vhost{}, - PKColumns: []string{"instance_id", "fqdn"}, - ExtraColumns: []codegen.ColumnDefinition{ - { - Name: "instance_id", - Type: schema.TypeString, - Resolver: `schema.ParentColumnResolver("id")`, - }, - }, - }, - } -} diff --git a/plugins/source/gandi/codegen/templates/resource.go.tpl b/plugins/source/gandi/codegen/templates/resource.go.tpl deleted file mode 100644 index 66de5052edadfb..00000000000000 --- a/plugins/source/gandi/codegen/templates/resource.go.tpl +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by codegen; DO NOT EDIT. - -package {{.Service}} - -import ( - "github.com/cloudquery/plugin-sdk/schema" -{{- if .ImportClient}} - "github.com/cloudquery/cloudquery/plugins/source/gandi/client" -{{- end}} -) - -func {{.TableFuncName}}() *schema.Table { - return &schema.Table{{template "table.go.tpl" .Table}} -} diff --git a/plugins/source/gandi/docs/tables/gandi_domain_dnssec_keys.md b/plugins/source/gandi/docs/tables/gandi_domain_dnssec_keys.md index 2b4af2261bd829..758173bddf0157 100644 --- a/plugins/source/gandi/docs/tables/gandi_domain_dnssec_keys.md +++ b/plugins/source/gandi/docs/tables/gandi_domain_dnssec_keys.md @@ -15,10 +15,10 @@ This table depends on [gandi_domains](gandi_domains.md). |_cq_id|UUID| |_cq_parent_id|UUID| |fqdn (PK)|String| +|id (PK)|Int| |algorithm|Int| |digest|String| |digest_type|Int| -|id (PK)|Int| |keytag|Int| |type|String| |public_key|String| \ No newline at end of file diff --git a/plugins/source/gandi/docs/tables/gandi_domain_glue_records.md b/plugins/source/gandi/docs/tables/gandi_domain_glue_records.md index e8f42b62e57c7c..cf31dc066322ed 100644 --- a/plugins/source/gandi/docs/tables/gandi_domain_glue_records.md +++ b/plugins/source/gandi/docs/tables/gandi_domain_glue_records.md @@ -15,7 +15,7 @@ This table depends on [gandi_domains](gandi_domains.md). |_cq_id|UUID| |_cq_parent_id|UUID| |name (PK)|String| -|ips|StringArray| |fqdn (PK)|String| +|ips|StringArray| |href|String| |fqdn_unicode|String| \ No newline at end of file diff --git a/plugins/source/gandi/docs/tables/gandi_domains.md b/plugins/source/gandi/docs/tables/gandi_domains.md index c16dd332d81b46..c1047a6d6b646b 100644 --- a/plugins/source/gandi/docs/tables/gandi_domains.md +++ b/plugins/source/gandi/docs/tables/gandi_domains.md @@ -18,6 +18,8 @@ The following tables depend on gandi_domains: |_cq_sync_time|Timestamp| |_cq_id|UUID| |_cq_parent_id|UUID| +|id (PK)|String| +|sharing_id|String| |autorenew|JSON| |can_tld_lock|Bool| |contacts|JSON| @@ -31,7 +33,5 @@ The following tables depend on gandi_domains: |status|StringArray| |tld|String| |authinfo|String| -|id (PK)|String| -|sharing_id|String| |tags|StringArray| |trustee_roles|StringArray| \ No newline at end of file diff --git a/plugins/source/gandi/go.mod b/plugins/source/gandi/go.mod index 84bef793f4b6b7..dc2da48d6eb83f 100644 --- a/plugins/source/gandi/go.mod +++ b/plugins/source/gandi/go.mod @@ -3,8 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gandi go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 - github.com/gertd/go-pluralize v0.2.1 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/go-gandi/go-gandi v0.5.1-0.20221118201059-f69b292fa399 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/gandi/go.sum b/plugins/source/gandi/go.sum index 7a5844bf50f768..38406711ddbf35 100644 --- a/plugins/source/gandi/go.sum +++ b/plugins/source/gandi/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -55,8 +55,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= diff --git a/plugins/source/gandi/resources/services/certificates/certificate_packages.go b/plugins/source/gandi/resources/services/certificates/certificate_packages.go index cc90362e3d5c85..c7fb3a6206f440 100644 --- a/plugins/source/gandi/resources/services/certificates/certificate_packages.go +++ b/plugins/source/gandi/resources/services/certificates/certificate_packages.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package certificates import ( "github.com/cloudquery/cloudquery/plugins/source/gandi/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/certificate" ) func CertificatePackages() *schema.Table { return &schema.Table{ - Name: "gandi_certificate_packages", - Resolver: fetchCertificatePackages, + Name: "gandi_certificate_packages", + Resolver: fetchCertificatePackages, + Transform: transformers.TransformWithStruct(&certificate.Package{}), Columns: []schema.Column{ { Name: "sharing_id", @@ -26,36 +27,6 @@ func CertificatePackages() *schema.Table { PrimaryKey: true, }, }, - { - Name: "name_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("NameLabel"), - }, - { - Name: "href", - Type: schema.TypeString, - Resolver: schema.PathResolver("Href"), - }, - { - Name: "max_domains", - Type: schema.TypeInt, - Resolver: schema.PathResolver("MaxDomains"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "type_label", - Type: schema.TypeString, - Resolver: schema.PathResolver("TypeLabel"), - }, - { - Name: "wildcard", - Type: schema.TypeBool, - Resolver: schema.PathResolver("Wildcard"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/certificates/certificates.go b/plugins/source/gandi/resources/services/certificates/certificates.go index f761b79eba478c..5fb880b43e5539 100644 --- a/plugins/source/gandi/resources/services/certificates/certificates.go +++ b/plugins/source/gandi/resources/services/certificates/certificates.go @@ -1,16 +1,17 @@ -// Code generated by codegen; DO NOT EDIT. - package certificates import ( "github.com/cloudquery/cloudquery/plugins/source/gandi/client" "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/certificate" ) func Certificates() *schema.Table { return &schema.Table{ - Name: "gandi_certificates", - Resolver: fetchCertificates, + Name: "gandi_certificates", + Resolver: fetchCertificates, + Transform: transformers.TransformWithStruct(&certificate.CertificateType{}), Columns: []schema.Column{ { Name: "sharing_id", @@ -26,51 +27,6 @@ func Certificates() *schema.Table { PrimaryKey: true, }, }, - { - Name: "cn", - Type: schema.TypeString, - Resolver: schema.PathResolver("CN"), - }, - { - Name: "cn_unicode", - Type: schema.TypeString, - Resolver: schema.PathResolver("CNUnicode"), - }, - { - Name: "altnames", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AltNames"), - }, - { - Name: "altnames_unicode", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("AltNamesUnicode"), - }, - { - Name: "contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Contact"), - }, - { - Name: "dates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Dates"), - }, - { - Name: "package", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Package"), - }, - { - Name: "software", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Software"), - }, - { - Name: "status", - Type: schema.TypeString, - Resolver: schema.PathResolver("Status"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/domains/domain_dnssec_keys.go b/plugins/source/gandi/resources/services/domains/domain_dnssec_keys.go index eae284d5f82dfc..6dd68a9d559cd8 100644 --- a/plugins/source/gandi/resources/services/domains/domain_dnssec_keys.go +++ b/plugins/source/gandi/resources/services/domains/domain_dnssec_keys.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package domains import ( "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/domain" ) func DomainDNSSecKeys() *schema.Table { return &schema.Table{ - Name: "gandi_domain_dnssec_keys", - Resolver: fetchDomainDNSSecKeys, + Name: "gandi_domain_dnssec_keys", + Resolver: fetchDomainDNSSecKeys, + Transform: transformers.TransformWithStruct(&domain.DNSSECKey{}), Columns: []schema.Column{ { Name: "fqdn", @@ -19,21 +20,6 @@ func DomainDNSSecKeys() *schema.Table { PrimaryKey: true, }, }, - { - Name: "algorithm", - Type: schema.TypeInt, - Resolver: schema.PathResolver("Algorithm"), - }, - { - Name: "digest", - Type: schema.TypeString, - Resolver: schema.PathResolver("Digest"), - }, - { - Name: "digest_type", - Type: schema.TypeInt, - Resolver: schema.PathResolver("DigestType"), - }, { Name: "id", Type: schema.TypeInt, @@ -42,21 +28,6 @@ func DomainDNSSecKeys() *schema.Table { PrimaryKey: true, }, }, - { - Name: "keytag", - Type: schema.TypeInt, - Resolver: schema.PathResolver("KeyTag"), - }, - { - Name: "type", - Type: schema.TypeString, - Resolver: schema.PathResolver("Type"), - }, - { - Name: "public_key", - Type: schema.TypeString, - Resolver: schema.PathResolver("PublicKey"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/domains/domain_glue_records.go b/plugins/source/gandi/resources/services/domains/domain_glue_records.go index 1d79f912218d33..2a9de81956924c 100644 --- a/plugins/source/gandi/resources/services/domains/domain_glue_records.go +++ b/plugins/source/gandi/resources/services/domains/domain_glue_records.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package domains import ( "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/domain" ) func DomainGlueRecords() *schema.Table { return &schema.Table{ - Name: "gandi_domain_glue_records", - Resolver: fetchDomainGlueRecords, + Name: "gandi_domain_glue_records", + Resolver: fetchDomainGlueRecords, + Transform: transformers.TransformWithStruct(&domain.GlueRecord{}), Columns: []schema.Column{ { Name: "name", @@ -19,11 +20,6 @@ func DomainGlueRecords() *schema.Table { PrimaryKey: true, }, }, - { - Name: "ips", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("IPs"), - }, { Name: "fqdn", Type: schema.TypeString, @@ -32,16 +28,6 @@ func DomainGlueRecords() *schema.Table { PrimaryKey: true, }, }, - { - Name: "href", - Type: schema.TypeString, - Resolver: schema.PathResolver("Href"), - }, - { - Name: "fqdn_unicode", - Type: schema.TypeString, - Resolver: schema.PathResolver("FQDNUnicode"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/domains/domain_livedns.go b/plugins/source/gandi/resources/services/domains/domain_livedns.go index 2b7baecfde4600..622ffc6d7146eb 100644 --- a/plugins/source/gandi/resources/services/domains/domain_livedns.go +++ b/plugins/source/gandi/resources/services/domains/domain_livedns.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package domains import ( "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/domain" ) func DomainLiveDNS() *schema.Table { return &schema.Table{ - Name: "gandi_domain_livedns", - Resolver: fetchDomainLiveDNS, + Name: "gandi_domain_livedns", + Resolver: fetchDomainLiveDNS, + Transform: transformers.TransformWithStruct(&domain.LiveDNS{}), Columns: []schema.Column{ { Name: "fqdn", @@ -19,26 +20,6 @@ func DomainLiveDNS() *schema.Table { PrimaryKey: true, }, }, - { - Name: "current", - Type: schema.TypeString, - Resolver: schema.PathResolver("Current"), - }, - { - Name: "nameservers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Nameservers"), - }, - { - Name: "dnssec_available", - Type: schema.TypeBool, - Resolver: schema.PathResolver("DNSSECAvailable"), - }, - { - Name: "livednssec_available", - Type: schema.TypeBool, - Resolver: schema.PathResolver("LiveDNSSECAvailable"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/domains/domain_web_redirections.go b/plugins/source/gandi/resources/services/domains/domain_web_redirections.go index 076f73de5543a4..1dd5d690753fed 100644 --- a/plugins/source/gandi/resources/services/domains/domain_web_redirections.go +++ b/plugins/source/gandi/resources/services/domains/domain_web_redirections.go @@ -1,15 +1,16 @@ -// Code generated by codegen; DO NOT EDIT. - package domains import ( "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/domain" ) func DomainWebRedirections() *schema.Table { return &schema.Table{ - Name: "gandi_domain_web_redirections", - Resolver: fetchDomainWebRedirections, + Name: "gandi_domain_web_redirections", + Resolver: fetchDomainWebRedirections, + Transform: transformers.TransformWithStruct(&domain.WebRedirection{}), Columns: []schema.Column{ { Name: "fqdn", @@ -35,36 +36,6 @@ func DomainWebRedirections() *schema.Table { PrimaryKey: true, }, }, - { - Name: "url", - Type: schema.TypeString, - Resolver: schema.PathResolver("URL"), - }, - { - Name: "cert_status", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateStatus"), - }, - { - Name: "cert_uuid", - Type: schema.TypeString, - Resolver: schema.PathResolver("CertificateUUID"), - }, - { - Name: "created_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("CreatedAt"), - }, - { - Name: "protocol", - Type: schema.TypeString, - Resolver: schema.PathResolver("Protocol"), - }, - { - Name: "updated_at", - Type: schema.TypeTimestamp, - Resolver: schema.PathResolver("UpdatedAt"), - }, }, } } diff --git a/plugins/source/gandi/resources/services/domains/domains.go b/plugins/source/gandi/resources/services/domains/domains.go index 037839b341d0c8..489f3dae269777 100644 --- a/plugins/source/gandi/resources/services/domains/domains.go +++ b/plugins/source/gandi/resources/services/domains/domains.go @@ -1,82 +1,18 @@ -// Code generated by codegen; DO NOT EDIT. - package domains import ( "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/go-gandi/go-gandi/domain" ) func Domains() *schema.Table { return &schema.Table{ Name: "gandi_domains", Resolver: fetchDomains, + Transform: transformers.TransformWithStruct(&domain.Details{}), PreResourceResolver: getDomain, Columns: []schema.Column{ - { - Name: "autorenew", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AutoRenew"), - }, - { - Name: "can_tld_lock", - Type: schema.TypeBool, - Resolver: schema.PathResolver("CanTLDLock"), - }, - { - Name: "contacts", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Contacts"), - }, - { - Name: "dates", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Dates"), - }, - { - Name: "fqdn", - Type: schema.TypeString, - Resolver: schema.PathResolver("FQDN"), - }, - { - Name: "fqdn_unicode", - Type: schema.TypeString, - Resolver: schema.PathResolver("FQDNUnicode"), - }, - { - Name: "href", - Type: schema.TypeString, - Resolver: schema.PathResolver("Href"), - }, - { - Name: "nameservers", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Nameservers"), - }, - { - Name: "services", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Services"), - }, - { - Name: "sharing_space", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("SharingSpace"), - }, - { - Name: "status", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Status"), - }, - { - Name: "tld", - Type: schema.TypeString, - Resolver: schema.PathResolver("TLD"), - }, - { - Name: "authinfo", - Type: schema.TypeString, - Resolver: schema.PathResolver("AuthInfo"), - }, { Name: "id", Type: schema.TypeString, @@ -90,16 +26,6 @@ func Domains() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("SharingID"), }, - { - Name: "tags", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("Tags"), - }, - { - Name: "trustee_roles", - Type: schema.TypeStringArray, - Resolver: schema.PathResolver("TrusteeRoles"), - }, }, Relations: []*schema.Table{ diff --git a/plugins/source/gandi/resources/services/livedns/livedns_domain_snapshots.go b/plugins/source/gandi/resources/services/livedns/livedns_domain_snapshots.go index 86fad38717d661..5ed4b4672c12bf 100644 --- a/plugins/source/gandi/resources/services/livedns/livedns_domain_snapshots.go +++ b/plugins/source/gandi/resources/services/livedns/livedns_domain_snapshots.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package livedns import ( diff --git a/plugins/source/gandi/resources/services/livedns/livedns_domains.go b/plugins/source/gandi/resources/services/livedns/livedns_domains.go index d0c0899de2ad39..d24b8a3a3059cf 100644 --- a/plugins/source/gandi/resources/services/livedns/livedns_domains.go +++ b/plugins/source/gandi/resources/services/livedns/livedns_domains.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package livedns import ( diff --git a/plugins/source/gandi/resources/services/simplehosting/simplehosting_instance_vhosts.go b/plugins/source/gandi/resources/services/simplehosting/simplehosting_instance_vhosts.go index bd8ebbeb940c7c..b35969ec02be49 100644 --- a/plugins/source/gandi/resources/services/simplehosting/simplehosting_instance_vhosts.go +++ b/plugins/source/gandi/resources/services/simplehosting/simplehosting_instance_vhosts.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package simplehosting import ( diff --git a/plugins/source/gandi/resources/services/simplehosting/simplehosting_instances.go b/plugins/source/gandi/resources/services/simplehosting/simplehosting_instances.go index 4e2832fd7ad055..03bf7af1973974 100644 --- a/plugins/source/gandi/resources/services/simplehosting/simplehosting_instances.go +++ b/plugins/source/gandi/resources/services/simplehosting/simplehosting_instances.go @@ -1,5 +1,3 @@ -// Code generated by codegen; DO NOT EDIT. - package simplehosting import ( From d90410764f8d3e3c0bed82db0a143885e0c90190 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 14:14:52 +0200 Subject: [PATCH 182/221] chore: Update plugin `source-aws` version to v9.2.0 (#6574) Updates the `source-aws` plugin latest version to v9.2.0 --- website/versions/source-aws.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-aws.json b/website/versions/source-aws.json index 3afabef76a907c..8602d841bf47fa 100644 --- a/website/versions/source-aws.json +++ b/website/versions/source-aws.json @@ -1 +1 @@ -{ "latest": "plugins-source-aws-v9.1.1" } +{ "latest": "plugins-source-aws-v9.2.0" } From 3434e4216aa74bba23cb9037e78c5152e5dc6b0e Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Tue, 10 Jan 2023 14:45:59 +0200 Subject: [PATCH 183/221] fix: Revert "fix(gcp-resources): Add `organization_id` and `name` as PK of `gcp_resourcemanager_folders` (#6576) #### Summary Looks like `organization_id` can be `nil`. `name` should be good enough: https://github.com/cloudquery/cloudquery/blob/d90410764f8d3e3c0bed82db0a143885e0c90190/plugins/source/gcp/resources/services/resourcemanager/folders_fetch.go#L44 #### Summary `gcp_bigtableadmin_tables` had only `project_id` as PK which means we can only get 1 per project in `overwrite*` modes. Since the API doesn't provide an Id we need to use the parent `instance_name` and table name. The code to get the table name already exists: https://github.com/cloudquery/cloudquery/blob/60c0f145577881c4850eb82f546da47a1d57ed5c/plugins/source/gcp/resources/services/bigtableadmin/tables_fetch.go#L28 I added it accidentally in https://github.com/cloudquery/cloudquery/pull/6384. This is a breaking change as it relies on newly added columns for PKs Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../gcp/docs/tables/gcp_bigtableadmin_tables.md | 4 +++- .../resources/services/bigtableadmin/tables.go | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/plugins/source/gcp/docs/tables/gcp_bigtableadmin_tables.md b/plugins/source/gcp/docs/tables/gcp_bigtableadmin_tables.md index 36d94ce55ead00..73d8acedc63747 100644 --- a/plugins/source/gcp/docs/tables/gcp_bigtableadmin_tables.md +++ b/plugins/source/gcp/docs/tables/gcp_bigtableadmin_tables.md @@ -2,7 +2,7 @@ https://cloud.google.com/bigtable/docs/reference/admin/rest/v2/projects.instances.tables#Table -The primary key for this table is **project_id**. +The composite primary key for this table is (**project_id**, **instance_name**, **name**). ## Relations @@ -17,6 +17,8 @@ This table depends on [gcp_bigtableadmin_instances](gcp_bigtableadmin_instances. |_cq_id|UUID| |_cq_parent_id|UUID| |project_id (PK)|String| +|instance_name (PK)|String| +|name (PK)|String| |families|StringArray| |family_infos|JSON| |deletion_protection|Int| \ No newline at end of file diff --git a/plugins/source/gcp/resources/services/bigtableadmin/tables.go b/plugins/source/gcp/resources/services/bigtableadmin/tables.go index 8a9bf7c587f525..0baf5b0b24e44b 100644 --- a/plugins/source/gcp/resources/services/bigtableadmin/tables.go +++ b/plugins/source/gcp/resources/services/bigtableadmin/tables.go @@ -24,6 +24,22 @@ func Tables() *schema.Table { PrimaryKey: true, }, }, + { + Name: "instance_name", + Type: schema.TypeString, + Resolver: schema.ParentColumnResolver("name"), + CreationOptions: schema.ColumnCreationOptions{ + PrimaryKey: true, + }, + }, + { + Name: "name", + Type: schema.TypeString, + Resolver: schema.PathResolver("Name"), + CreationOptions: schema.ColumnCreationOptions{ + PrimaryKey: true, + }, + }, }, } } From 8cdb450dbd705eeba2e2eef593e683f15e1c3b76 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:34:02 +0200 Subject: [PATCH 190/221] chore(main): Release plugins-source-gcp v7.0.0 (#6583) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [7.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v6.1.2...plugins-source-gcp-v7.0.0) (2023-01-10) ### ⚠ BREAKING CHANGES * **gcp-resources:** Add `project_id, instance_name, name` as PKs for `gcp_bigtableadmin_tables` ([#6536](https://github.com/cloudquery/cloudquery/issues/6536)) * **deps:** `gcp_cloudiot_device_configs` column `binary_data` type changed from `IntArray` to `ByteArray` * **deps:** `gcp_cloudiot_device_states` column `binary_data` type changed from `IntArray` to `ByteArray` * **deps:** `gcp_iam_service_account_keys` column `public_key_data` type changed from `IntArray` to `ByteArray` * **deps:** `gcp_run_locations` column `metadata` type changed from `IntArray` to `ByteArray` * **deps:** `gcp_artifactregistry_locations` column `metadata` type changed from `IntArray` to `ByteArray` ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) * **gcp-resources:** Add `project_id, instance_name, name` as PKs for `gcp_bigtableadmin_tables` ([#6536](https://github.com/cloudquery/cloudquery/issues/6536)) ([75cf1c5](https://github.com/cloudquery/cloudquery/commit/75cf1c57c151e7831c44c5da037d26c317376189)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/gcp/CHANGELOG.md | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8739cba719ebbd..147fb89a2e059a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -9,7 +9,7 @@ "plugins/source/cloudflare+FILLER": "0.0.0", "plugins/source/digitalocean": "4.0.2", "plugins/source/digitalocean+FILLER": "0.0.0", - "plugins/source/gcp": "6.1.2", + "plugins/source/gcp": "7.0.0", "plugins/source/gcp+FILLER": "0.0.0", "plugins/source/github": "2.0.0", "plugins/source/github+FILLER": "0.0.0", diff --git a/plugins/source/gcp/CHANGELOG.md b/plugins/source/gcp/CHANGELOG.md index f4e428effd1fef..70f6865dbde2c8 100644 --- a/plugins/source/gcp/CHANGELOG.md +++ b/plugins/source/gcp/CHANGELOG.md @@ -5,6 +5,27 @@ All notable changes to this provider will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [7.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v6.1.2...plugins-source-gcp-v7.0.0) (2023-01-10) + + +### ⚠ BREAKING CHANGES + +* **gcp-resources:** Add `project_id, instance_name, name` as PKs for `gcp_bigtableadmin_tables` ([#6536](https://github.com/cloudquery/cloudquery/issues/6536)) +* **deps:** `gcp_cloudiot_device_configs` column `binary_data` type changed from `IntArray` to `ByteArray` +* **deps:** `gcp_cloudiot_device_states` column `binary_data` type changed from `IntArray` to `ByteArray` +* **deps:** `gcp_iam_service_account_keys` column `public_key_data` type changed from `IntArray` to `ByteArray` +* **deps:** `gcp_run_locations` column `metadata` type changed from `IntArray` to `ByteArray` +* **deps:** `gcp_artifactregistry_locations` column `metadata` type changed from `IntArray` to `ByteArray` + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([aa818c5](https://github.com/cloudquery/cloudquery/commit/aa818c5cef004e2c539e110af0575bab6c6fe4c0)) +* **gcp-resources:** Add `project_id, instance_name, name` as PKs for `gcp_bigtableadmin_tables` ([#6536](https://github.com/cloudquery/cloudquery/issues/6536)) ([75cf1c5](https://github.com/cloudquery/cloudquery/commit/75cf1c57c151e7831c44c5da037d26c317376189)) + ## [6.1.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-gcp-v6.1.1...plugins-source-gcp-v6.1.2) (2023-01-10) From 5df5d061048565fe89ec1914b6261fb7138bd994 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:42:40 +0200 Subject: [PATCH 191/221] chore: Update plugin `source-aws` version to v10.0.0 (#6586) Updates the `source-aws` plugin latest version to v10.0.0 --- website/versions/source-aws.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-aws.json b/website/versions/source-aws.json index 8602d841bf47fa..841f226271f796 100644 --- a/website/versions/source-aws.json +++ b/website/versions/source-aws.json @@ -1 +1 @@ -{ "latest": "plugins-source-aws-v9.2.0" } +{ "latest": "plugins-source-aws-v10.0.0" } From ab894fb77315d2cdaf5a1d8072f8d78b1e9968fc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:46:34 +0200 Subject: [PATCH 192/221] chore: Update plugin `source-gcp` version to v7.0.0 (#6587) Updates the `source-gcp` plugin latest version to v7.0.0 --- website/versions/source-gcp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gcp.json b/website/versions/source-gcp.json index 547dcf994f9aa5..c911fb4af918e4 100644 --- a/website/versions/source-gcp.json +++ b/website/versions/source-gcp.json @@ -1 +1 @@ -{ "latest": "plugins-source-gcp-v6.1.2" } +{ "latest": "plugins-source-gcp-v7.0.0" } From 392b848b3124f9cf28f6234fdb9a43d671069879 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:04:53 +0200 Subject: [PATCH 193/221] fix(deps): Update module github.com/cloudquery/plugin-sdk to v1.24.1 (#6553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/plugin-sdk](https://togithub.com/cloudquery/plugin-sdk) | require | minor | `v1.23.0` -> `v1.24.1` | | [github.com/cloudquery/plugin-sdk](https://togithub.com/cloudquery/plugin-sdk) | require | patch | `v1.24.0` -> `v1.24.1` | --- ### Release Notes
cloudquery/plugin-sdk ### [`v1.24.1`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v1.24.1) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v1.24.0...v1.24.1) ##### Bug Fixes - Array types ([#​587](https://togithub.com/cloudquery/plugin-sdk/issues/587)) ([73ea82c](https://togithub.com/cloudquery/plugin-sdk/commit/73ea82cc4abd697d428df0072f6b2ecf7002b4d1)) - Sentry errors not sent ([#​592](https://togithub.com/cloudquery/plugin-sdk/issues/592)) ([9f1e373](https://togithub.com/cloudquery/plugin-sdk/commit/9f1e373b516be958f0594e84fbbbcd43951f14ad)) ### [`v1.24.0`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v1.24.0) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v1.23.0...v1.24.0) ##### Features - Add local backend for storing cursor state ([#​569](https://togithub.com/cloudquery/plugin-sdk/issues/569)) ([3b07885](https://togithub.com/cloudquery/plugin-sdk/commit/3b07885a57595b96dc1db5b786a6f1c22f0a5149)) - Remove codegen ([#​589](https://togithub.com/cloudquery/plugin-sdk/issues/589)) ([1c5943a](https://togithub.com/cloudquery/plugin-sdk/commit/1c5943a3f1fcdd77eac89763ef3650f20f75df03)) ##### Bug Fixes - **destinations:** Log correct size of batch ([#​588](https://togithub.com/cloudquery/plugin-sdk/issues/588)) ([9cebafe](https://togithub.com/cloudquery/plugin-sdk/commit/9cebafef0b46c674df3027886649676cbf6c933f))
--- ### 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 these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- .github/workflows/source_okta.yml | 2 +- cli/go.mod | 4 ++-- cli/go.sum | 4 ++-- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 4 ++-- plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 4 ++-- plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/go.sum | 4 ++-- plugins/destination/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 4 ++-- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 4 ++-- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 4 ++-- plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 4 ++-- plugins/source/azure/client/client.go | 3 ++- plugins/source/azure/client/testing.go | 2 +- plugins/source/azure/codegen0/main.go | 5 ----- plugins/source/azure/go.mod | 2 +- plugins/source/azure/go.sum | 4 ++-- plugins/source/azuredevops/client/client.go | 3 ++- plugins/source/azuredevops/go.mod | 3 +-- plugins/source/azuredevops/go.sum | 6 ++---- plugins/source/cloudflare/client/client.go | 3 ++- plugins/source/cloudflare/client/testing.go | 2 +- plugins/source/cloudflare/go.mod | 2 +- plugins/source/cloudflare/go.sum | 4 ++-- plugins/source/crowdstrike/client/client.go | 3 ++- plugins/source/crowdstrike/client/testing.go | 2 +- plugins/source/crowdstrike/go.mod | 2 +- plugins/source/crowdstrike/go.sum | 4 ++-- plugins/source/datadog/client/client.go | 3 ++- plugins/source/datadog/client/testing.go | 2 +- plugins/source/datadog/go.mod | 2 +- plugins/source/datadog/go.sum | 4 ++-- plugins/source/fastly/go.mod | 2 +- plugins/source/fastly/go.sum | 4 ++-- plugins/source/github/client/client.go | 3 ++- plugins/source/github/client/testing.go | 2 +- plugins/source/github/go.mod | 3 +-- plugins/source/github/go.sum | 6 ++---- plugins/source/hackernews/go.mod | 2 +- plugins/source/hackernews/go.sum | 4 ++-- plugins/source/okta/client/client.go | 3 ++- plugins/source/okta/client/testing.go | 2 +- plugins/source/okta/go.mod | 2 +- plugins/source/okta/go.sum | 4 ++-- plugins/source/pagerduty/client/client.go | 3 ++- plugins/source/pagerduty/client/testing.go | 2 +- plugins/source/pagerduty/go.mod | 3 +-- plugins/source/pagerduty/go.sum | 6 ++---- plugins/source/salesforce/client/client.go | 3 ++- plugins/source/salesforce/client/testing.go | 2 +- plugins/source/salesforce/go.mod | 2 +- plugins/source/salesforce/go.sum | 4 ++-- plugins/source/slack/client/client.go | 3 ++- plugins/source/slack/client/testing.go | 2 +- plugins/source/slack/go.mod | 2 +- plugins/source/slack/go.sum | 4 ++-- plugins/source/snyk/client/client.go | 3 ++- plugins/source/snyk/client/testing.go | 2 +- plugins/source/snyk/go.mod | 2 +- plugins/source/snyk/go.sum | 4 ++-- plugins/source/tailscale/client/client.go | 3 ++- plugins/source/tailscale/client/testing.go | 2 +- plugins/source/tailscale/go.mod | 10 ++++++---- plugins/source/tailscale/go.sum | 6 ++---- plugins/source/terraform/client/client.go | 3 ++- plugins/source/terraform/client/testing.go | 2 +- plugins/source/terraform/go.mod | 2 +- plugins/source/terraform/go.sum | 4 ++-- plugins/source/test/client/client.go | 3 ++- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 ++-- plugins/source/vercel/go.mod | 1 - plugins/source/vercel/go.sum | 4 ---- 78 files changed, 119 insertions(+), 124 deletions(-) diff --git a/.github/workflows/source_okta.yml b/.github/workflows/source_okta.yml index fc299d4c5f37b3..c6e63835922801 100644 --- a/.github/workflows/source_okta.yml +++ b/.github/workflows/source_okta.yml @@ -34,7 +34,7 @@ jobs: uses: cloudquery/golangci-lint-action@master with: version: v1.50.1 - working-directory: plugins/source/k8s + working-directory: plugins/source/okta args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true diff --git a/cli/go.mod b/cli/go.mod index 7f1d8f8319200d..934e5558a0e6a6 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/getsentry/sentry-go v0.16.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.28.0 @@ -39,4 +39,4 @@ require ( google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect -) \ No newline at end of file +) diff --git a/cli/go.sum b/cli/go.sum index 0b4f97721321cd..5101cecbe8f9d1 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,8 +1,8 @@ github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE= github.com/avast/retry-go/v4 v4.3.1/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index cf323ff440e0db..56df802d879074 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 golang.org/x/sync v0.1.0 google.golang.org/api v0.103.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 3e1e514661db37..3daec12ea5a1ef 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 8dd6787232de40..f64f1034db142e 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 go.mongodb.org/mongo-driver v1.11.1 ) diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index e6f79e524111db..765f70f1ba9b6e 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 076e9c58e32a61..6188024cd5f965 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/neo4j/neo4j-go-driver/v5 v5.3.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 84c38e764263e5..3610166e3050fd 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 02a3e08798cb3f..76ef917de601c4 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/jackc/pgx-zerolog v0.0.0-20220923130014-7856b90a65ae github.com/jackc/pgx/v5 v5.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index ddc6135eb0f546..b5c694e67dac55 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index 0f5b532bf19ff4..bc27ced10839d6 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 github.com/snowflakedb/gosnowflake v1.6.16 ) diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 5da42129d375d5..783c6216e8f898 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -103,8 +103,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 10a66bc4ccd43f..5fd047ddac65b6 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index ccbae980ec3545..28a19c21fcea96 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index e8110e49c9ec20..29525acca6f460 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index c3cec0377735fc..ce244f243952ec 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azure/client/client.go b/plugins/source/azure/client/client.go index 2eb6e53193bccc..8762dd68d52c94 100644 --- a/plugins/source/azure/client/client.go +++ b/plugins/source/azure/client/client.go @@ -11,6 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/subscription/armsubscription" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -121,7 +122,7 @@ func (c *Client) disocverResourceGroups(ctx context.Context) error { return nil } -func New(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var spec Spec var err error if err := s.UnmarshalSpec(&spec); err != nil { diff --git a/plugins/source/azure/client/testing.go b/plugins/source/azure/client/testing.go index 389f388d53e3a8..f931e237426c35 100644 --- a/plugins/source/azure/client/testing.go +++ b/plugins/source/azure/client/testing.go @@ -73,7 +73,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createServices func(*mux. mockClient := NewMockHttpClient(h.Client(), h.URL) l := zerolog.New(zerolog.NewTestWriter(t)).Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { err := createServices(router) if err != nil { return nil, err diff --git a/plugins/source/azure/codegen0/main.go b/plugins/source/azure/codegen0/main.go index a2ec1653cb99c3..3646b0bb8d6d58 100644 --- a/plugins/source/azure/codegen0/main.go +++ b/plugins/source/azure/codegen0/main.go @@ -14,7 +14,6 @@ import ( "text/template" "github.com/cloudquery/cloudquery/plugins/source/azure/codegen0/internal/azparser" - "github.com/cloudquery/plugin-sdk/codegen" "github.com/iancoleman/strcase" ) @@ -135,10 +134,6 @@ func generateTable(r *azparser.Table) error { if err != nil { return fmt.Errorf("failed to parse templates: %w", err) } - tpl, err = tpl.ParseFS(codegen.TemplatesFS, "templates/*.go.tpl") - if err != nil { - return fmt.Errorf("failed to parse sdk template: %w", err) - } var buff bytes.Buffer if err := tpl.Execute(&buff, r); err != nil { return fmt.Errorf("failed to execute template for %w", err) diff --git a/plugins/source/azure/go.mod b/plugins/source/azure/go.mod index 7bb6afae786ca0..de9ab65a67ed05 100644 --- a/plugins/source/azure/go.mod +++ b/plugins/source/azure/go.mod @@ -96,7 +96,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsesu/armwindowsesu v0.5.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/windowsiot/armwindowsiot v1.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/workloads/armworkloads v0.2.0 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gorilla/mux v1.8.0 github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/azure/go.sum b/plugins/source/azure/go.sum index 9d529446fa653b..6c5dfdce62dfe9 100644 --- a/plugins/source/azure/go.sum +++ b/plugins/source/azure/go.sum @@ -231,8 +231,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/azuredevops/client/client.go b/plugins/source/azuredevops/client/client.go index 31aafab43730e2..ba251b52a8982d 100644 --- a/plugins/source/azuredevops/client/client.go +++ b/plugins/source/azuredevops/client/client.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/microsoft/azure-devops-go-api/azuredevops/v6" @@ -24,7 +25,7 @@ func (*Client) ID() string { return "AzureDevOpsClient" } -func New(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var spec Spec err := s.UnmarshalSpec(&spec) if err != nil { diff --git a/plugins/source/azuredevops/go.mod b/plugins/source/azuredevops/go.mod index 3e9cb363d6cf10..defcdf63f2b8f3 100644 --- a/plugins/source/azuredevops/go.mod +++ b/plugins/source/azuredevops/go.mod @@ -3,9 +3,8 @@ module github.com/cloudquery/cloudquery/plugins/source/azuredevops go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 - github.com/iancoleman/strcase v0.2.0 github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/azuredevops/go.sum b/plugins/source/azuredevops/go.sum index 769eed794f49c9..943d76120fda32 100644 --- a/plugins/source/azuredevops/go.sum +++ b/plugins/source/azuredevops/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -126,8 +126,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/cloudflare/client/client.go b/plugins/source/cloudflare/client/client.go index 4e460f8a9141df..defe39ffd7a26d 100644 --- a/plugins/source/cloudflare/client/client.go +++ b/plugins/source/cloudflare/client/client.go @@ -7,6 +7,7 @@ import ( "os" "github.com/cloudflare/cloudflare-go" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -71,7 +72,7 @@ func (c *Client) withZoneID(accountId, zoneId string) *Client { } } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { cfSpec := &Spec{} if err := s.UnmarshalSpec(cfSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal cloudflare spec: %w", err) diff --git a/plugins/source/cloudflare/client/testing.go b/plugins/source/cloudflare/client/testing.go index d1759777e6482e..078b2a9c0ee46d 100644 --- a/plugins/source/cloudflare/client/testing.go +++ b/plugins/source/cloudflare/client/testing.go @@ -31,7 +31,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var cfSpec Spec if err := spec.UnmarshalSpec(&cfSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal cloudflare spec: %w", err) diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 967eb90c58c627..af61ddecb47c8d 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudflare/cloudflare-go v0.57.1 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 github.com/thoas/go-funk v0.9.3 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index b4f2a47af5acee..19e3e0ffa696a2 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.57.1 h1:c9OhL/WusagBirP+CIJeCqS7OjT9kiWjtJv4lwxp3ZM= github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVHwHqgXJofb1ya210GQ= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/crowdstrike/client/client.go b/plugins/source/crowdstrike/client/client.go index ef46a696bfbdbf..af7b0cb4f5d26a 100644 --- a/plugins/source/crowdstrike/client/client.go +++ b/plugins/source/crowdstrike/client/client.go @@ -6,6 +6,7 @@ import ( "fmt" "os" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/crowdstrike/gofalcon/falcon" @@ -32,7 +33,7 @@ func (c *Client) ID() string { return c.spec.Name } -func New(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { crowdStrikeSpec := &Spec{} if err := s.UnmarshalSpec(&crowdStrikeSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal CrowdStrike spec: %w", err) diff --git a/plugins/source/crowdstrike/client/testing.go b/plugins/source/crowdstrike/client/testing.go index 7bde718a0af64b..0533c8613269fb 100644 --- a/plugins/source/crowdstrike/client/testing.go +++ b/plugins/source/crowdstrike/client/testing.go @@ -26,7 +26,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var gaSpec Spec if err := spec.UnmarshalSpec(&gaSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal Crowdstrike spec: %w", err) diff --git a/plugins/source/crowdstrike/go.mod b/plugins/source/crowdstrike/go.mod index f94d2b4fdd61cc..74b7a04e9c5da1 100644 --- a/plugins/source/crowdstrike/go.mod +++ b/plugins/source/crowdstrike/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/crowdstrike go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/crowdstrike/gofalcon v0.2.32 github.com/go-openapi/runtime v0.25.0 github.com/golang/mock v1.6.0 diff --git a/plugins/source/crowdstrike/go.sum b/plugins/source/crowdstrike/go.sum index b33f42dd48eac7..e5bebcf96dddcb 100644 --- a/plugins/source/crowdstrike/go.sum +++ b/plugins/source/crowdstrike/go.sum @@ -74,8 +74,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= diff --git a/plugins/source/datadog/client/client.go b/plugins/source/datadog/client/client.go index 7267a4a1f55b2e..8d451478d96dbf 100644 --- a/plugins/source/datadog/client/client.go +++ b/plugins/source/datadog/client/client.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/DataDog/datadog-api-client-go/v2/api/datadog" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/pkg/errors" @@ -69,7 +70,7 @@ func (c *Client) withAccount(account Account) schema.ClientMeta { } } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { cfSpec := &Spec{} if err := s.UnmarshalSpec(cfSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal datadog spec: %w", err) diff --git a/plugins/source/datadog/client/testing.go b/plugins/source/datadog/client/testing.go index 1ec67777e51a81..54192b0fc45d31 100644 --- a/plugins/source/datadog/client/testing.go +++ b/plugins/source/datadog/client/testing.go @@ -23,7 +23,7 @@ func DatadogMockTestHelper(t *testing.T, table *schema.Table, builder func(*test l := zerolog.New(zerolog.NewTestWriter(t)).Output( zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { return &Client{ logger: l, DDServices: builder(t, ctrl), diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index 35505612d76375..78c4cae905ac6b 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/DataDog/datadog-api-client-go/v2 v2.6.1 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 7d755033e0ca55..f7c960a3b35c78 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/fastly/go.mod b/plugins/source/fastly/go.mod index 398cf8a9814299..ff363675b2c376 100644 --- a/plugins/source/fastly/go.mod +++ b/plugins/source/fastly/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cloudquery/codegen v0.1.1 - github.com/cloudquery/plugin-sdk v1.24.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/fastly/go-fastly/v7 v7.0.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/fastly/go.sum b/plugins/source/fastly/go.sum index 1186b281e01844..0190ce04d40bd5 100644 --- a/plugins/source/fastly/go.sum +++ b/plugins/source/fastly/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/codegen v0.1.1 h1:zIPNMeNAlUdLwP4gpb8BsfOfAxyLYOBxBNSG+nZpSx4= github.com/cloudquery/codegen v0.1.1/go.mod h1:oJxzUuOC79fP36vBPU1BJ7n+jgQemS33y/mbgNq6vfM= -github.com/cloudquery/plugin-sdk v1.24.0 h1:vgi3RImpSlnhacg/zbrpsbUEsYpG51UB5KVkNhpX1cs= -github.com/cloudquery/plugin-sdk v1.24.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/github/client/client.go b/plugins/source/github/client/client.go index 4b202c14d188b2..7b2ff0dd36e95e 100644 --- a/plugins/source/github/client/client.go +++ b/plugins/source/github/client/client.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/google/go-github/v48/github" @@ -41,7 +42,7 @@ func (c Client) WithOrg(org string) schema.ClientMeta { } } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var spec Spec err := s.UnmarshalSpec(&spec) if err != nil { diff --git a/plugins/source/github/client/testing.go b/plugins/source/github/client/testing.go index 9b2aeb7dc59b54..7e4b51704c96b6 100644 --- a/plugins/source/github/client/testing.go +++ b/plugins/source/github/client/testing.go @@ -23,7 +23,7 @@ func GithubMockTestHelper(t *testing.T, table *schema.Table, builder func(*testi l := zerolog.New(zerolog.NewTestWriter(t)).Output( zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { return &Client{ logger: l, Github: builder(t, ctrl), diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index 187dc13f6738a6..ad2db256fd5153 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -3,10 +3,9 @@ module github.com/cloudquery/cloudquery/plugins/source/github go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/google/go-github/v48 v48.2.0 - github.com/iancoleman/strcase v0.2.0 github.com/rs/zerolog v1.28.0 github.com/thoas/go-funk v0.9.3 golang.org/x/oauth2 v0.2.0 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 150f28efbf8ca1..e4d34c7279aa68 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -132,8 +132,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/hackernews/go.mod b/plugins/source/hackernews/go.mod index 53b3f7ffbadd10..6e0353d5f615cb 100644 --- a/plugins/source/hackernews/go.mod +++ b/plugins/source/hackernews/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/hackernews go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.24.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/hermanschaaf/hackernews v1.0.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/hackernews/go.sum b/plugins/source/hackernews/go.sum index 0d0a18b93791b0..eeaecac02066fa 100644 --- a/plugins/source/hackernews/go.sum +++ b/plugins/source/hackernews/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.24.0 h1:vgi3RImpSlnhacg/zbrpsbUEsYpG51UB5KVkNhpX1cs= -github.com/cloudquery/plugin-sdk v1.24.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/okta/client/client.go b/plugins/source/okta/client/client.go index f9e2cdab2f2e30..4e98cc5d4b819a 100644 --- a/plugins/source/okta/client/client.go +++ b/plugins/source/okta/client/client.go @@ -6,6 +6,7 @@ import ( "fmt" "os" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/okta/okta-sdk-golang/v3/okta" @@ -41,7 +42,7 @@ func New(logger zerolog.Logger, s specs.Source, okt *okta.APIClient) *Client { } } -func Configure(_ context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(_ context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { oktaSpec := &Spec{} if err := s.UnmarshalSpec(oktaSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal okta spec: %w", err) diff --git a/plugins/source/okta/client/testing.go b/plugins/source/okta/client/testing.go index e452eea52a6a4d..5d6fc9fdde21b7 100644 --- a/plugins/source/okta/client/testing.go +++ b/plugins/source/okta/client/testing.go @@ -62,7 +62,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createServices func(*mux. zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var clientSpec Spec if err := spec.UnmarshalSpec(&clientSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal client spec: %w", err) diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 45fcc3de2e3c29..4840689484e788 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/okta go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.1 github.com/rs/zerolog v1.28.0 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 2ae0e426c24e36..401f4b9b81085b 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -42,8 +42,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/pagerduty/client/client.go b/plugins/source/pagerduty/client/client.go index 6c3769ff59763e..341b054491666f 100644 --- a/plugins/source/pagerduty/client/client.go +++ b/plugins/source/pagerduty/client/client.go @@ -7,6 +7,7 @@ import ( "path" "github.com/PagerDuty/go-pagerduty" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -21,7 +22,7 @@ type Client struct { logger zerolog.Logger } -func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { authToken, err := getAuthToken() if err != nil { return nil, err diff --git a/plugins/source/pagerduty/client/testing.go b/plugins/source/pagerduty/client/testing.go index 75746c8d1e1ff9..12503bf7b9c07b 100644 --- a/plugins/source/pagerduty/client/testing.go +++ b/plugins/source/pagerduty/client/testing.go @@ -46,7 +46,7 @@ func PagerdutyMockTestHelper(t *testing.T, table *schema.Table, buildMockHttpCli version := "vDev" - configureTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + configureTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { pagerdutyClient := pagerduty.NewClient("test_auth_token") pagerdutyClient.HTTPClient = buildMockHttpClient() diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index d5a7cd7833fd24..fe291f2e4724f5 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -4,8 +4,7 @@ go 1.19 require ( github.com/PagerDuty/go-pagerduty v1.6.0 - github.com/cloudquery/plugin-sdk v1.23.0 - github.com/iancoleman/strcase v0.2.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 gopkg.in/yaml.v3 v3.0.1 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index a5a983530c9932..55772e80b52e72 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -44,8 +44,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -136,8 +136,6 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/salesforce/client/client.go b/plugins/source/salesforce/client/client.go index b36bf8ea87edd5..4806e701f8b6d8 100644 --- a/plugins/source/salesforce/client/client.go +++ b/plugins/source/salesforce/client/client.go @@ -10,6 +10,7 @@ import ( "net/url" "time" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -54,7 +55,7 @@ type ListObjectsResponse struct { Sobject []Sobject `json:"sobjects"` } -func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { cqClient := Client{ logger: logger, } diff --git a/plugins/source/salesforce/client/testing.go b/plugins/source/salesforce/client/testing.go index e4aeec1fbc2868..b827bbd04f42c4 100644 --- a/plugins/source/salesforce/client/testing.go +++ b/plugins/source/salesforce/client/testing.go @@ -27,7 +27,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createServices func(*mux. h := httptest.NewServer(router) defer h.Close() - configureTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + configureTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { err := createServices(router) if err != nil { return nil, err diff --git a/plugins/source/salesforce/go.mod b/plugins/source/salesforce/go.mod index fc15754497ad50..a38a4512976aa4 100644 --- a/plugins/source/salesforce/go.mod +++ b/plugins/source/salesforce/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/salesforce go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/salesforce/go.sum b/plugins/source/salesforce/go.sum index f6f180e34bf706..cce7dfdcbaab29 100644 --- a/plugins/source/salesforce/go.sum +++ b/plugins/source/salesforce/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/slack/client/client.go b/plugins/source/slack/client/client.go index 73c10e6f0f417e..0c00400a6124ec 100644 --- a/plugins/source/slack/client/client.go +++ b/plugins/source/slack/client/client.go @@ -6,6 +6,7 @@ import ( "time" "github.com/cloudquery/cloudquery/plugins/source/slack/client/services" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -49,7 +50,7 @@ func (c *Client) withTeamID(teamID string) schema.ClientMeta { } } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var config Spec err := s.UnmarshalSpec(&config) if err != nil { diff --git a/plugins/source/slack/client/testing.go b/plugins/source/slack/client/testing.go index 78362d85ec9821..af9304c648e42e 100644 --- a/plugins/source/slack/client/testing.go +++ b/plugins/source/slack/client/testing.go @@ -25,7 +25,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, l := zerolog.New(zerolog.NewTestWriter(t)).Output( zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { return &Client{ logger: l, Slack: builder(t, ctrl), diff --git a/plugins/source/slack/go.mod b/plugins/source/slack/go.mod index a18dbbf7cfdbd0..be52c01f443125 100644 --- a/plugins/source/slack/go.mod +++ b/plugins/source/slack/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/slack go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 github.com/slack-go/slack v0.12.1 diff --git a/plugins/source/slack/go.sum b/plugins/source/slack/go.sum index a9561e298e2f82..7087514d9456ec 100644 --- a/plugins/source/slack/go.sum +++ b/plugins/source/slack/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/snyk/client/client.go b/plugins/source/snyk/client/client.go index 0fa858c0d7d489..c90bafa8594087 100644 --- a/plugins/source/snyk/client/client.go +++ b/plugins/source/snyk/client/client.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/pavel-snyk/snyk-sdk-go/snyk" @@ -29,7 +30,7 @@ func (c *Client) Logger() *zerolog.Logger { return &c.logger } -func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { snykSpec := new(Spec) err := spec.UnmarshalSpec(snykSpec) if err != nil { diff --git a/plugins/source/snyk/client/testing.go b/plugins/source/snyk/client/testing.go index 2c6e0017025c6c..d37b7ef4db170f 100644 --- a/plugins/source/snyk/client/testing.go +++ b/plugins/source/snyk/client/testing.go @@ -24,7 +24,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createService func(*httpr ts := httptest.NewUnstartedServer(mux) defer ts.Close() - newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, _ specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, logger zerolog.Logger, _ specs.Source, _ ...source.Option) (schema.ClientMeta, error) { err := createService(mux) if err != nil { return nil, fmt.Errorf("failed to createService: %w", err) diff --git a/plugins/source/snyk/go.mod b/plugins/source/snyk/go.mod index 781d07fc4a50eb..405c41e75da82a 100644 --- a/plugins/source/snyk/go.mod +++ b/plugins/source/snyk/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/snyk go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/google/uuid v1.3.0 github.com/julienschmidt/httprouter v1.3.0 github.com/pavel-snyk/snyk-sdk-go v0.4.1 diff --git a/plugins/source/snyk/go.sum b/plugins/source/snyk/go.sum index 2402e3a4c1d5e4..cda9adc2bfb34b 100644 --- a/plugins/source/snyk/go.sum +++ b/plugins/source/snyk/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cloudquery/snyk-sdk-go v0.1.0 h1:lJ/3EhLwUAdcR/sukSA+EzAnRE1jRRxm8ewLESCNW5Q= github.com/cloudquery/snyk-sdk-go v0.1.0/go.mod h1:LRL1TRuuM925gnyGp54WtS9p8S4yJMd0oS4JpLg+n7Y= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/plugins/source/tailscale/client/client.go b/plugins/source/tailscale/client/client.go index 2d08ddbdc6d481..b91e50244b2f60 100644 --- a/plugins/source/tailscale/client/client.go +++ b/plugins/source/tailscale/client/client.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -26,7 +27,7 @@ func (c *Client) Logger() *zerolog.Logger { return &c.logger } -func Configure(_ context.Context, logger zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { +func Configure(_ context.Context, logger zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { tsSpec := new(Spec) err := spec.UnmarshalSpec(tsSpec) if err != nil { diff --git a/plugins/source/tailscale/client/testing.go b/plugins/source/tailscale/client/testing.go index 25fe90674df967..f9684a6280b9ef 100644 --- a/plugins/source/tailscale/client/testing.go +++ b/plugins/source/tailscale/client/testing.go @@ -24,7 +24,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, createService func(*httpr ts := httptest.NewUnstartedServer(mux) defer ts.Close() - newTestExecutionClient := func(_ context.Context, logger zerolog.Logger, _ specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(_ context.Context, logger zerolog.Logger, _ specs.Source, _ ...source.Option) (schema.ClientMeta, error) { err := createService(mux) if err != nil { return nil, fmt.Errorf("failed to createService: %w", err) diff --git a/plugins/source/tailscale/go.mod b/plugins/source/tailscale/go.mod index c18596088e075f..bd8eed4fad92a2 100644 --- a/plugins/source/tailscale/go.mod +++ b/plugins/source/tailscale/go.mod @@ -3,13 +3,15 @@ module github.com/cloudquery/cloudquery/plugins/source/tailscale go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 - github.com/iancoleman/strcase v0.2.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.28.0 github.com/tailscale/tailscale-client-go v1.8.0 - golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 - golang.org/x/sync v0.1.0 +) + +require ( + golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 // indirect + golang.org/x/sync v0.1.0 // indirect ) require ( diff --git a/plugins/source/tailscale/go.sum b/plugins/source/tailscale/go.sum index 89a6981fb7c76c..681dfcc559a1b5 100644 --- a/plugins/source/tailscale/go.sum +++ b/plugins/source/tailscale/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -126,8 +126,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/plugins/source/terraform/client/client.go b/plugins/source/terraform/client/client.go index b3178ea0f28d3e..ff487683a543c6 100644 --- a/plugins/source/terraform/client/client.go +++ b/plugins/source/terraform/client/client.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -33,7 +34,7 @@ func (c *Client) ID() string { return c.CurrentBackend } -func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func Configure(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { tfSpec := &Spec{} if err := s.UnmarshalSpec(tfSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal terraform spec: %w", err) diff --git a/plugins/source/terraform/client/testing.go b/plugins/source/terraform/client/testing.go index aa2af6e1477764..4dc65f93739ca0 100644 --- a/plugins/source/terraform/client/testing.go +++ b/plugins/source/terraform/client/testing.go @@ -30,7 +30,7 @@ func MockTestHelper(t *testing.T, table *schema.Table, builder func(*testing.T, zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.StampMicro}, ).Level(zerolog.DebugLevel).With().Timestamp().Logger() - newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source) (schema.ClientMeta, error) { + newTestExecutionClient := func(ctx context.Context, _ zerolog.Logger, spec specs.Source, _ ...source.Option) (schema.ClientMeta, error) { var tfSpec Spec if err := spec.UnmarshalSpec(&tfSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal terraform spec: %w", err) diff --git a/plugins/source/terraform/go.mod b/plugins/source/terraform/go.mod index 6d958e5321a717..5fce2a0ef27c13 100644 --- a/plugins/source/terraform/go.mod +++ b/plugins/source/terraform/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.47 github.com/aws/aws-sdk-go-v2/service/s3 v1.30.0 github.com/aws/aws-sdk-go-v2/service/sts v1.18.0 - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/terraform/go.sum b/plugins/source/terraform/go.sum index 41c64c0c09d4c9..c590320f9d6c23 100644 --- a/plugins/source/terraform/go.sum +++ b/plugins/source/terraform/go.sum @@ -78,8 +78,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/test/client/client.go b/plugins/source/test/client/client.go index a46b365118a59f..42bb86b00ad2d4 100644 --- a/plugins/source/test/client/client.go +++ b/plugins/source/test/client/client.go @@ -3,6 +3,7 @@ package client import ( "context" + "github.com/cloudquery/plugin-sdk/plugins/source" "github.com/cloudquery/plugin-sdk/schema" "github.com/cloudquery/plugin-sdk/specs" "github.com/rs/zerolog" @@ -20,6 +21,6 @@ func (*TestClient) ID() string { return "TestClient" } -func New(ctx context.Context, logger zerolog.Logger, s specs.Source) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger, s specs.Source, _ ...source.Option) (schema.ClientMeta, error) { return &TestClient{}, nil } diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 4f6658432cb47b..239158731b29e6 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/test go 1.19 require ( - github.com/cloudquery/plugin-sdk v1.23.0 + github.com/cloudquery/plugin-sdk v1.24.1 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index c3cec0377735fc..ce244f243952ec 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= +github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= +github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/plugins/source/vercel/go.mod b/plugins/source/vercel/go.mod index a7ed06b5e64452..9b8f7c48a2200d 100644 --- a/plugins/source/vercel/go.mod +++ b/plugins/source/vercel/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/cloudquery/plugin-sdk v1.24.1 - github.com/gertd/go-pluralize v0.2.1 github.com/gorilla/mux v1.8.0 github.com/rs/zerolog v1.28.0 ) diff --git a/plugins/source/vercel/go.sum b/plugins/source/vercel/go.sum index 4df3cae30184f9..1d2f239d710f71 100644 --- a/plugins/source/vercel/go.sum +++ b/plugins/source/vercel/go.sum @@ -40,8 +40,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/plugin-sdk v1.23.0 h1:pjgxQdozJ9fgD1v7r+d4YQR73bhC0t7fjT52C5HTpkg= -github.com/cloudquery/plugin-sdk v1.23.0/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cloudquery/plugin-sdk v1.24.1 h1:h5ZMsnkveav0Hl8M9GcA/19uaOItMRDpTOsx8SyKE3k= github.com/cloudquery/plugin-sdk v1.24.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -57,8 +55,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= -github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= From 2f9f1a45cf9e5087e13f7c9b6ec7ea71c096d2c9 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:13:20 +0200 Subject: [PATCH 194/221] chore(main): Release plugins-destination-bigquery v2.0.4 (#6590) :robot: I have created a release *beep* *boop* --- ## [2.0.4](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.3...plugins-destination-bigquery-v2.0.4) (2023-01-10) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/destination/bigquery/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 147fb89a2e059a..64e0bf53f901fe 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -37,7 +37,7 @@ "plugins/source/gandi+FILLER": "0.0.0", "plugins/source/datadog": "1.0.5", "plugins/source/datadog+FILLER": "0.0.0", - "plugins/destination/bigquery": "2.0.3", + "plugins/destination/bigquery": "2.0.4", "plugins/destination/bigquery+FILLER": "0.0.0", "plugins/source/tailscale": "1.1.0", "plugins/source/tailscale+FILLER": "0.0.0", diff --git a/plugins/destination/bigquery/CHANGELOG.md b/plugins/destination/bigquery/CHANGELOG.md index 40111ef1f0f86c..96236be825c144 100644 --- a/plugins/destination/bigquery/CHANGELOG.md +++ b/plugins/destination/bigquery/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.0.4](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.3...plugins-destination-bigquery-v2.0.4) (2023-01-10) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) + ## [2.0.3](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v2.0.2...plugins-destination-bigquery-v2.0.3) (2023-01-09) From b0f77ca50bcef156ce6de06540bd4e51c68eb3ba Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:14:42 +0200 Subject: [PATCH 195/221] chore(main): Release plugins-source-hackernews v1.0.0 (#6556) :robot: I have created a release *beep* *boop* --- ## 1.0.0 (2023-01-10) ### Features * Hacker News source plugin ([#6336](https://github.com/cloudquery/cloudquery/issues/6336)) ([183299e](https://github.com/cloudquery/cloudquery/commit/183299e8f24c67ed7212e5285b69729d9f591afd)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 3 ++- plugins/source/hackernews/CHANGELOG.md | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 plugins/source/hackernews/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 64e0bf53f901fe..d4448300940386 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -71,5 +71,6 @@ "plugins/destination/neo4j": "1.0.1", "plugins/destination/neo4j+FILLER": "0.0.0", "plugins/destination/kafka": "1.0.0", - "plugins/destination/kafka+FILLER": "0.0.0" + "plugins/destination/kafka+FILLER": "0.0.0", + "plugins/source/hackernews": "1.0.0" } diff --git a/plugins/source/hackernews/CHANGELOG.md b/plugins/source/hackernews/CHANGELOG.md new file mode 100644 index 00000000000000..6cf2493f1d2ec9 --- /dev/null +++ b/plugins/source/hackernews/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +## 1.0.0 (2023-01-10) + + +### Features + +* Hacker News source plugin ([#6336](https://github.com/cloudquery/cloudquery/issues/6336)) ([183299e](https://github.com/cloudquery/cloudquery/commit/183299e8f24c67ed7212e5285b69729d9f591afd)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) From 4b9477bb488d1186c17400054697d18a0d0e2f4c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:17:24 +0200 Subject: [PATCH 196/221] chore(main): Release plugins-source-gandi v1.1.5 (#6347) :robot: I have created a release *beep* *boop* --- ## [1.1.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-gandi-v1.1.4...plugins-source-gandi-v1.1.5) (2023-01-10) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * **gandi:** Remove codegen, upgrade SDK ([#6570](https://github.com/cloudquery/cloudquery/issues/6570)) ([18b2c25](https://github.com/cloudquery/cloudquery/commit/18b2c2569deed9e165b239393c3c926f6c0ae27e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/gandi/CHANGELOG.md | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d4448300940386..a5e1477b115c11 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -33,7 +33,7 @@ "plugins/destination/sqlite+FILLER": "0.0.0", "plugins/destination/snowflake": "1.1.4", "plugins/destination/snowflake+FILLER": "0.0.0", - "plugins/source/gandi": "1.1.4", + "plugins/source/gandi": "1.1.5", "plugins/source/gandi+FILLER": "0.0.0", "plugins/source/datadog": "1.0.5", "plugins/source/datadog+FILLER": "0.0.0", diff --git a/plugins/source/gandi/CHANGELOG.md b/plugins/source/gandi/CHANGELOG.md index 3935c02ed5243c..63615390d02644 100644 --- a/plugins/source/gandi/CHANGELOG.md +++ b/plugins/source/gandi/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.1.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-gandi-v1.1.4...plugins-source-gandi-v1.1.5) (2023-01-10) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* **gandi:** Remove codegen, upgrade SDK ([#6570](https://github.com/cloudquery/cloudquery/issues/6570)) ([18b2c25](https://github.com/cloudquery/cloudquery/commit/18b2c2569deed9e165b239393c3c926f6c0ae27e)) + ## [1.1.4](https://github.com/cloudquery/cloudquery/compare/plugins-source-gandi-v1.1.3...plugins-source-gandi-v1.1.4) (2023-01-03) From e203d0f5af4ff1edf37fbf430f80674271e65bf3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:26:37 +0200 Subject: [PATCH 197/221] chore(main): Release plugins-source-pagerduty v1.2.0 (#6300) :robot: I have created a release *beep* *boop* --- ## [1.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v1.1.2...plugins-source-pagerduty-v1.2.0) (2023-01-10) ### Features * **pagerduty:** Migrate pagerduty codegen to transformations ([#6441](https://github.com/cloudquery/cloudquery/issues/6441)) ([d5f18c9](https://github.com/cloudquery/cloudquery/commit/d5f18c9bbe80e9e5ae8bf49a08f0cf46f0d19de2)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/pagerduty/CHANGELOG.md | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index a5e1477b115c11..bba588b9ace98a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -47,7 +47,7 @@ "plugins/source/slack+FILLER": "0.0.0", "plugins/source/crowdstrike": "1.0.2", "plugins/source/crowdstrike+FILLER": "0.0.0", - "plugins/source/pagerduty": "1.1.2", + "plugins/source/pagerduty": "1.2.0", "plugins/destination/mongodb": "1.0.4", "plugins/destination/mongodb+FILLTER": "0.0.0", "plugins/source/gitlab": "1.1.0", diff --git a/plugins/source/pagerduty/CHANGELOG.md b/plugins/source/pagerduty/CHANGELOG.md index 646938239d31c9..0d34960ab1e957 100644 --- a/plugins/source/pagerduty/CHANGELOG.md +++ b/plugins/source/pagerduty/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v1.1.2...plugins-source-pagerduty-v1.2.0) (2023-01-10) + + +### Features + +* **pagerduty:** Migrate pagerduty codegen to transformations ([#6441](https://github.com/cloudquery/cloudquery/issues/6441)) ([d5f18c9](https://github.com/cloudquery/cloudquery/commit/d5f18c9bbe80e9e5ae8bf49a08f0cf46f0d19de2)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) + ## [1.1.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v1.1.1...plugins-source-pagerduty-v1.1.2) (2023-01-03) From 9dc303941082041afa2b0cdcb623e0c99c5fbb13 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:28:13 +0200 Subject: [PATCH 198/221] chore(main): Release plugins-source-terraform v1.3.5 (#6304) :robot: I have created a release *beep* *boop* --- ## [1.3.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-terraform-v1.3.4...plugins-source-terraform-v1.3.5) (2023-01-10) ### Bug Fixes * **deps:** Update module github.com/aws/aws-sdk-go-v2/config to v1.18.8 ([#6393](https://github.com/cloudquery/cloudquery/issues/6393)) ([ffba44f](https://github.com/cloudquery/cloudquery/commit/ffba44f1318eb401d2b7ce2fa91c155d8925d90d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.47 ([#6395](https://github.com/cloudquery/cloudquery/issues/6395)) ([71ec9b9](https://github.com/cloudquery/cloudquery/commit/71ec9b99328ae4b7b0739a0c22258a805b586948)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/terraform/CHANGELOG.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index bba588b9ace98a..26f5ff06061ba8 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -19,7 +19,7 @@ "plugins/source/k8s+FILLER": "0.0.0", "plugins/source/okta": "2.0.2", "plugins/source/okta+FILLER": "0.0.0", - "plugins/source/terraform": "1.3.4", + "plugins/source/terraform": "1.3.5", "plugins/source/terraform+FILLER": "0.0.0", "plugins/source/test": "1.3.27", "plugins/source/test+FILLER": "0.0.0", diff --git a/plugins/source/terraform/CHANGELOG.md b/plugins/source/terraform/CHANGELOG.md index a7777a7b20c171..cc4ce9cd50668e 100644 --- a/plugins/source/terraform/CHANGELOG.md +++ b/plugins/source/terraform/CHANGELOG.md @@ -5,6 +5,22 @@ All notable changes to this provider will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-terraform-v1.3.4...plugins-source-terraform-v1.3.5) (2023-01-10) + + +### Bug Fixes + +* **deps:** Update module github.com/aws/aws-sdk-go-v2/config to v1.18.8 ([#6393](https://github.com/cloudquery/cloudquery/issues/6393)) ([ffba44f](https://github.com/cloudquery/cloudquery/commit/ffba44f1318eb401d2b7ce2fa91c155d8925d90d)) +* **deps:** Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.47 ([#6395](https://github.com/cloudquery/cloudquery/issues/6395)) ([71ec9b9](https://github.com/cloudquery/cloudquery/commit/71ec9b99328ae4b7b0739a0c22258a805b586948)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) + ## [1.3.4](https://github.com/cloudquery/cloudquery/compare/plugins-source-terraform-v1.3.3...plugins-source-terraform-v1.3.4) (2023-01-03) From 62fca7ca905463ba304c4eff1ec67be9b695f87c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:38:14 +0200 Subject: [PATCH 199/221] chore(main): Release plugins-source-okta v2.1.0 (#6301) :robot: I have created a release *beep* *boop* --- ## [2.1.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-okta-v2.0.2...plugins-source-okta-v2.1.0) (2023-01-10) ### Features * **okta:** Migrate codegen to transformations ([#6432](https://github.com/cloudquery/cloudquery/issues/6432)) ([2403fdb](https://github.com/cloudquery/cloudquery/commit/2403fdb24250549268c7cc1db0d4b2ff3d942476)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/okta/CHANGELOG.md | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 26f5ff06061ba8..7b7c45b34cf40c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -17,7 +17,7 @@ "plugins/source/heroku+FILLER": "0.0.0", "plugins/source/k8s": "2.5.4", "plugins/source/k8s+FILLER": "0.0.0", - "plugins/source/okta": "2.0.2", + "plugins/source/okta": "2.1.0", "plugins/source/okta+FILLER": "0.0.0", "plugins/source/terraform": "1.3.5", "plugins/source/terraform+FILLER": "0.0.0", diff --git a/plugins/source/okta/CHANGELOG.md b/plugins/source/okta/CHANGELOG.md index f5d3f282c96282..bb63e3f08a5818 100644 --- a/plugins/source/okta/CHANGELOG.md +++ b/plugins/source/okta/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [2.1.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-okta-v2.0.2...plugins-source-okta-v2.1.0) (2023-01-10) + + +### Features + +* **okta:** Migrate codegen to transformations ([#6432](https://github.com/cloudquery/cloudquery/issues/6432)) ([2403fdb](https://github.com/cloudquery/cloudquery/commit/2403fdb24250549268c7cc1db0d4b2ff3d942476)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.17.2 ([#6260](https://github.com/cloudquery/cloudquery/issues/6260)) ([805972a](https://github.com/cloudquery/cloudquery/commit/805972aa67ce54e3358501c6b7ee5d85e5f65cac)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.18.0 ([#6339](https://github.com/cloudquery/cloudquery/issues/6339)) ([158365a](https://github.com/cloudquery/cloudquery/commit/158365a78dfa4389074f716a0f581f18fedc1080)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.19.0 ([#6363](https://github.com/cloudquery/cloudquery/issues/6363)) ([ae6967c](https://github.com/cloudquery/cloudquery/commit/ae6967c22002c554a083f444eb611ac3e6d2698f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.20.0 ([#6376](https://github.com/cloudquery/cloudquery/issues/6376)) ([d6187ec](https://github.com/cloudquery/cloudquery/commit/d6187ec584f13be4fe9362dd393385b19d386113)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.21.0 ([#6382](https://github.com/cloudquery/cloudquery/issues/6382)) ([5baea40](https://github.com/cloudquery/cloudquery/commit/5baea40d2aec4e807db839c928be2e037d572bef)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.22.0 ([#6516](https://github.com/cloudquery/cloudquery/issues/6516)) ([b7e4e73](https://github.com/cloudquery/cloudquery/commit/b7e4e737a5f4d8f254960426ea8ba555d8f9b944)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.23.0 ([#6522](https://github.com/cloudquery/cloudquery/issues/6522)) ([ce24f1d](https://github.com/cloudquery/cloudquery/commit/ce24f1d64394cbb5ab07dcaa4af66c53f77f700f)) +* **deps:** Update module github.com/cloudquery/plugin-sdk to v1.24.1 ([#6553](https://github.com/cloudquery/cloudquery/issues/6553)) ([392b848](https://github.com/cloudquery/cloudquery/commit/392b848b3124f9cf28f6234fdb9a43d671069879)) + ## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-okta-v2.0.1...plugins-source-okta-v2.0.2) (2023-01-03) From d8f704e86d51d2edecb66f48301c126a91e199c7 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Tue, 10 Jan 2023 16:45:52 +0200 Subject: [PATCH 200/221] fix(k8s): Update to new SDK (#6589) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary Updates to latest SDK. Detailed changelog in a markdown comment of this PR ⬇️ (edit this description to see) #### Summary --- plugins/source/gcp/docs/tables/README.md | 3 +- .../docs/tables/gcp_workflows_workflows.md | 24 +++++++++++++ plugins/source/gcp/go.mod | 1 + plugins/source/gcp/go.sum | 2 ++ plugins/source/gcp/resources/plugin/tables.go | 2 ++ .../resources/services/workflows/workflows.go | 36 +++++++++++++++++++ .../services/workflows/workflows_fetch.go | 36 +++++++++++++++++++ .../services/workflows/workflows_mock_test.go | 36 +++++++++++++++++++ .../pages/docs/plugins/sources/gcp/tables.md | 3 +- 9 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 plugins/source/gcp/docs/tables/gcp_workflows_workflows.md create mode 100644 plugins/source/gcp/resources/services/workflows/workflows.go create mode 100644 plugins/source/gcp/resources/services/workflows/workflows_fetch.go create mode 100644 plugins/source/gcp/resources/services/workflows/workflows_mock_test.go diff --git a/plugins/source/gcp/docs/tables/README.md b/plugins/source/gcp/docs/tables/README.md index d2b02cfe5a8398..c298f41e3316d5 100644 --- a/plugins/source/gcp/docs/tables/README.md +++ b/plugins/source/gcp/docs/tables/README.md @@ -136,4 +136,5 @@ - [gcp_sql_instances](gcp_sql_instances.md) - [gcp_sql_users](gcp_sql_users.md) - [gcp_storage_buckets](gcp_storage_buckets.md) - - [gcp_storage_bucket_policies](gcp_storage_bucket_policies.md) \ No newline at end of file + - [gcp_storage_bucket_policies](gcp_storage_bucket_policies.md) +- [gcp_workflows_workflows](gcp_workflows_workflows.md) \ No newline at end of file diff --git a/plugins/source/gcp/docs/tables/gcp_workflows_workflows.md b/plugins/source/gcp/docs/tables/gcp_workflows_workflows.md new file mode 100644 index 00000000000000..82c2a212907206 --- /dev/null +++ b/plugins/source/gcp/docs/tables/gcp_workflows_workflows.md @@ -0,0 +1,24 @@ +# Table: gcp_workflows_workflows + +https://cloud.google.com/workflows/docs/reference/rest/v1/projects.locations.workflows#resource:-workflow + +The composite primary key for this table is (**project_id**, **name**). + +## Columns + +| Name | Type | +| ------------- | ------------- | +|_cq_source_name|String| +|_cq_sync_time|Timestamp| +|_cq_id|UUID| +|_cq_parent_id|UUID| +|project_id (PK)|String| +|name (PK)|String| +|description|String| +|state|String| +|revision_id|String| +|create_time|Timestamp| +|update_time|Timestamp| +|revision_create_time|Timestamp| +|labels|JSON| +|service_account|String| \ No newline at end of file diff --git a/plugins/source/gcp/go.mod b/plugins/source/gcp/go.mod index 89e314f3496983..d43d1b6f7ae2f6 100644 --- a/plugins/source/gcp/go.mod +++ b/plugins/source/gcp/go.mod @@ -34,6 +34,7 @@ require ( cloud.google.com/go/secretmanager v1.9.0 cloud.google.com/go/serviceusage v1.4.0 cloud.google.com/go/storage v1.28.0 + cloud.google.com/go/workflows v1.9.0 github.com/cloudquery/plugin-sdk v1.24.1 github.com/golang/mock v1.6.0 github.com/googleapis/gax-go/v2 v2.7.0 diff --git a/plugins/source/gcp/go.sum b/plugins/source/gcp/go.sum index 77827d97993a6d..dd12cad326df31 100644 --- a/plugins/source/gcp/go.sum +++ b/plugins/source/gcp/go.sum @@ -96,6 +96,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.28.0 h1:DLrIZ6xkeZX6K70fU/boWx5INJumt6f+nwwWSHXzzGY= cloud.google.com/go/storage v1.28.0/go.mod h1:qlgZML35PXA3zoEnIkiPLY4/TOkUleufRlu6qmcf7sI= +cloud.google.com/go/workflows v1.9.0 h1:7Chpin9p50NTU8Tb7qk+I11U/IwVXmDhEoSsdccvInE= +cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/plugins/source/gcp/resources/plugin/tables.go b/plugins/source/gcp/resources/plugin/tables.go index 4a328f7d56d4d6..3dff93533becff 100644 --- a/plugins/source/gcp/resources/plugin/tables.go +++ b/plugins/source/gcp/resources/plugin/tables.go @@ -35,6 +35,7 @@ import ( "github.com/cloudquery/plugins/source/gcp/resources/services/serviceusage" "github.com/cloudquery/plugins/source/gcp/resources/services/sql" "github.com/cloudquery/plugins/source/gcp/resources/services/storage" + "github.com/cloudquery/plugins/source/gcp/resources/services/workflows" ) func PluginAutoGeneratedTables() []*schema.Table { @@ -128,5 +129,6 @@ func PluginAutoGeneratedTables() []*schema.Table { serviceusage.Services(), sql.Instances(), storage.Buckets(), + workflows.Workflows(), } } diff --git a/plugins/source/gcp/resources/services/workflows/workflows.go b/plugins/source/gcp/resources/services/workflows/workflows.go new file mode 100644 index 00000000000000..6170bd13530c3d --- /dev/null +++ b/plugins/source/gcp/resources/services/workflows/workflows.go @@ -0,0 +1,36 @@ +package workflows + +import ( + pb "cloud.google.com/go/workflows/apiv1/workflowspb" + "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugin-sdk/transformers" + "github.com/cloudquery/plugins/source/gcp/client" +) + +func Workflows() *schema.Table { + return &schema.Table{ + Name: "gcp_workflows_workflows", + Description: `https://cloud.google.com/workflows/docs/reference/rest/v1/projects.locations.workflows#resource:-workflow`, + Resolver: fetchWorkflows, + Multiplex: client.ProjectMultiplexEnabledServices("workflows.googleapis.com"), + Transform: transformers.TransformWithStruct(&pb.Workflow{}, client.Options()...), + Columns: []schema.Column{ + { + Name: "project_id", + Type: schema.TypeString, + Resolver: client.ResolveProject, + CreationOptions: schema.ColumnCreationOptions{ + PrimaryKey: true, + }, + }, + { + Name: "name", + Type: schema.TypeString, + Resolver: schema.PathResolver("Name"), + CreationOptions: schema.ColumnCreationOptions{ + PrimaryKey: true, + }, + }, + }, + } +} diff --git a/plugins/source/gcp/resources/services/workflows/workflows_fetch.go b/plugins/source/gcp/resources/services/workflows/workflows_fetch.go new file mode 100644 index 00000000000000..f9c2d86d2e2d8b --- /dev/null +++ b/plugins/source/gcp/resources/services/workflows/workflows_fetch.go @@ -0,0 +1,36 @@ +package workflows + +import ( + "context" + + workflows "cloud.google.com/go/workflows/apiv1" + pb "cloud.google.com/go/workflows/apiv1/workflowspb" + "github.com/cloudquery/plugin-sdk/schema" + "github.com/cloudquery/plugins/source/gcp/client" + "google.golang.org/api/iterator" +) + +func fetchWorkflows(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { + c := meta.(*client.Client) + + gcpClient, err := workflows.NewClient(ctx, c.ClientOptions...) + if err != nil { + return err + } + + it := gcpClient.ListWorkflows(ctx, &pb.ListWorkflowsRequest{ + Parent: "projects/" + c.ProjectId + "/locations/-", + }, c.CallOptions...) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + return err + } + + res <- resp + } + return nil +} diff --git a/plugins/source/gcp/resources/services/workflows/workflows_mock_test.go b/plugins/source/gcp/resources/services/workflows/workflows_mock_test.go new file mode 100644 index 00000000000000..087595d63d5f64 --- /dev/null +++ b/plugins/source/gcp/resources/services/workflows/workflows_mock_test.go @@ -0,0 +1,36 @@ +package workflows + +import ( + "context" + "fmt" + "testing" + + "github.com/cloudquery/plugin-sdk/faker" + "github.com/cloudquery/plugins/source/gcp/client" + "google.golang.org/grpc" + + pb "cloud.google.com/go/workflows/apiv1/workflowspb" +) + +func createServer(gsrv *grpc.Server) error { + fakeServer := &fakeServer{} + pb.RegisterWorkflowsServer(gsrv, fakeServer) + return nil +} + +type fakeServer struct { + pb.UnimplementedWorkflowsServer +} + +func (*fakeServer) ListWorkflows(context.Context, *pb.ListWorkflowsRequest) (*pb.ListWorkflowsResponse, error) { + resp := pb.ListWorkflowsResponse{} + if err := faker.FakeObject(&resp); err != nil { + return nil, fmt.Errorf("failed to fake data: %w", err) + } + resp.NextPageToken = "" + return &resp, nil +} + +func TestInstances(t *testing.T) { + client.MockTestGrpcHelper(t, Workflows(), createServer, client.TestOptions{}) +} diff --git a/website/pages/docs/plugins/sources/gcp/tables.md b/website/pages/docs/plugins/sources/gcp/tables.md index 71399ccb94635b..cc99c98422dd41 100644 --- a/website/pages/docs/plugins/sources/gcp/tables.md +++ b/website/pages/docs/plugins/sources/gcp/tables.md @@ -136,4 +136,5 @@ - [gcp_sql_instances](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_sql_instances.md) - [gcp_sql_users](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_sql_users.md) - [gcp_storage_buckets](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_storage_buckets.md) - - [gcp_storage_bucket_policies](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_storage_bucket_policies.md) \ No newline at end of file + - [gcp_storage_bucket_policies](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_storage_bucket_policies.md) +- [gcp_workflows_workflows](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/gcp/docs/tables/gcp_workflows_workflows.md) \ No newline at end of file From b821650a9d4e97aa7eb8fa0fe210c835cea4146b Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Tue, 10 Jan 2023 16:56:25 +0200 Subject: [PATCH 202/221] fix(gitlab): Update to new SDK (#6588) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary Updates to latest SDK. Detailed changelog in a markdown comment of this PR ⬇️ (edit this description to see)