From 738e89f2c969a8a3f1698a8686aeaddb358e7a23 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:49:12 +0200 Subject: [PATCH 01/78] fix(deps): Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 (#16430) 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/v4](https://togithub.com/cloudquery/plugin-sdk) | require | patch | `v4.29.0` -> `v4.29.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/plugin-sdk (github.com/cloudquery/plugin-sdk/v4) ### [`v4.29.1`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.29.1) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.29.0...v4.29.1) ##### Bug Fixes - **deps:** Update golang.org/x/exp digest to [`1b97071`](https://togithub.com/cloudquery/plugin-sdk/commit/1b97071) ([#​1505](https://togithub.com/cloudquery/plugin-sdk/issues/1505)) ([14d8545](https://togithub.com/cloudquery/plugin-sdk/commit/14d8545ac6c39d64f893c60d97dc19d2e144bdbc)) - **deps:** Update google.golang.org/genproto/googleapis/api digest to [`1f4bbc5`](https://togithub.com/cloudquery/plugin-sdk/commit/1f4bbc5) ([#​1506](https://togithub.com/cloudquery/plugin-sdk/issues/1506)) ([4021d65](https://togithub.com/cloudquery/plugin-sdk/commit/4021d65d966363f5efc37c16626c81f1e4b2f435)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`1f4bbc5`](https://togithub.com/cloudquery/plugin-sdk/commit/1f4bbc5) ([#​1507](https://togithub.com/cloudquery/plugin-sdk/issues/1507)) ([b1316a8](https://togithub.com/cloudquery/plugin-sdk/commit/b1316a8423902b454505bc67f0582df9282ae0c1)) - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.2 ([#​1501](https://togithub.com/cloudquery/plugin-sdk/issues/1501)) ([f5ecd8e](https://togithub.com/cloudquery/plugin-sdk/commit/f5ecd8e65e00a44b85cad183277d6cf448b721d2)) - **deps:** Update module github.com/kataras/iris/v12 to v12.2.10 ([#​1508](https://togithub.com/cloudquery/plugin-sdk/issues/1508)) ([611982b](https://togithub.com/cloudquery/plugin-sdk/commit/611982b154ddd56c4722c809422dc394b1be2bef)) - **deps:** Update module github.com/klauspost/compress to v1.17.5 ([#​1509](https://togithub.com/cloudquery/plugin-sdk/issues/1509)) ([e8d3c6b](https://togithub.com/cloudquery/plugin-sdk/commit/e8d3c6b2f4b518d05d5bf2f5b7a8415a064e79e0)) - **deps:** Update module github.com/pierrec/lz4/v4 to v4.1.21 ([#​1510](https://togithub.com/cloudquery/plugin-sdk/issues/1510)) ([8af0e4e](https://togithub.com/cloudquery/plugin-sdk/commit/8af0e4e47fcebb0ef888ecdc364a1df1467418d0)) - **deps:** Update module github.com/tdewolff/minify/v2 to v2.20.16 ([#​1511](https://togithub.com/cloudquery/plugin-sdk/issues/1511)) ([b1433cc](https://togithub.com/cloudquery/plugin-sdk/commit/b1433cc85889209d18c4c264a78b15d7bfd5c1dc)) - **deps:** Update module github.com/tdewolff/parse/v2 to v2.7.11 ([#​1512](https://togithub.com/cloudquery/plugin-sdk/issues/1512)) ([401fa4a](https://togithub.com/cloudquery/plugin-sdk/commit/401fa4a27048f61cb2cb659e8340866466f9acf3)) - Handle PrimaryKeyComponents in packaging ([#​1503](https://togithub.com/cloudquery/plugin-sdk/issues/1503)) ([8c8fdc9](https://togithub.com/cloudquery/plugin-sdk/commit/8c8fdc918569a04dbfb779f1134d273ffc1d9b1e))
--- ### 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 | 14 ++++----- cli/go.sum | 35 ++++++++++----------- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 +-- plugins/destination/bigquery/go.mod | 16 +++++----- plugins/destination/bigquery/go.sum | 39 ++++++++++++------------ plugins/destination/clickhouse/go.mod | 16 +++++----- plugins/destination/clickhouse/go.sum | 39 ++++++++++++------------ plugins/destination/duckdb/go.mod | 16 +++++----- plugins/destination/duckdb/go.sum | 39 ++++++++++++------------ plugins/destination/elasticsearch/go.mod | 16 +++++----- plugins/destination/elasticsearch/go.sum | 39 ++++++++++++------------ plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 +-- plugins/destination/firehose/go.mod | 16 +++++----- plugins/destination/firehose/go.sum | 39 ++++++++++++------------ plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 4 +-- plugins/destination/gremlin/go.mod | 18 +++++------ plugins/destination/gremlin/go.sum | 39 ++++++++++++------------ plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 +-- plugins/destination/meilisearch/go.mod | 16 +++++----- plugins/destination/meilisearch/go.sum | 39 ++++++++++++------------ plugins/destination/mongodb/go.mod | 16 +++++----- plugins/destination/mongodb/go.sum | 39 ++++++++++++------------ plugins/destination/mssql/go.mod | 16 +++++----- plugins/destination/mssql/go.sum | 39 ++++++++++++------------ plugins/destination/mysql/go.mod | 16 +++++----- plugins/destination/mysql/go.sum | 39 ++++++++++++------------ plugins/destination/neo4j/go.mod | 16 +++++----- plugins/destination/neo4j/go.sum | 39 ++++++++++++------------ plugins/destination/postgresql/go.mod | 16 +++++----- plugins/destination/postgresql/go.sum | 39 ++++++++++++------------ plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 +-- plugins/destination/snowflake/go.mod | 10 +++--- plugins/destination/snowflake/go.sum | 20 ++++++------ plugins/destination/sqlite/go.mod | 16 +++++----- plugins/destination/sqlite/go.sum | 39 ++++++++++++------------ plugins/destination/test/go.mod | 16 +++++----- plugins/destination/test/go.sum | 39 ++++++++++++------------ plugins/source/alicloud/go.mod | 16 +++++----- plugins/source/alicloud/go.sum | 39 ++++++++++++------------ plugins/source/awspricing/go.mod | 16 +++++----- plugins/source/awspricing/go.sum | 39 ++++++++++++------------ plugins/source/cloudflare/go.mod | 16 +++++----- plugins/source/cloudflare/go.sum | 39 ++++++++++++------------ plugins/source/datadog/go.mod | 16 +++++----- plugins/source/datadog/go.sum | 39 ++++++++++++------------ plugins/source/digitalocean/go.mod | 16 +++++----- plugins/source/digitalocean/go.sum | 39 ++++++++++++------------ plugins/source/firestore/go.mod | 16 +++++----- plugins/source/firestore/go.sum | 39 ++++++++++++------------ plugins/source/github/go.mod | 16 +++++----- plugins/source/github/go.sum | 39 ++++++++++++------------ plugins/source/gitlab/go.mod | 16 +++++----- plugins/source/gitlab/go.sum | 39 ++++++++++++------------ plugins/source/hackernews/go.mod | 16 +++++----- plugins/source/hackernews/go.sum | 39 ++++++++++++------------ plugins/source/hubspot/go.mod | 16 +++++----- plugins/source/hubspot/go.sum | 39 ++++++++++++------------ plugins/source/k8s/go.mod | 10 +++--- plugins/source/k8s/go.sum | 20 ++++++------ plugins/source/notion/go.mod | 16 +++++----- plugins/source/notion/go.sum | 39 ++++++++++++------------ plugins/source/okta/go.mod | 16 +++++----- plugins/source/okta/go.sum | 39 ++++++++++++------------ plugins/source/oracle/go.mod | 16 +++++----- plugins/source/oracle/go.sum | 39 ++++++++++++------------ plugins/source/pagerduty/go.mod | 16 +++++----- plugins/source/pagerduty/go.sum | 39 ++++++++++++------------ plugins/source/test/go.mod | 16 +++++----- plugins/source/test/go.sum | 39 ++++++++++++------------ scaffold/cmd/templates/source/go.mod.tpl | 2 +- 75 files changed, 884 insertions(+), 854 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index da718e6aafd3a1..aaf1afc28065de 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -9,7 +9,7 @@ require ( github.com/cloudquery/cloudquery-api-go v1.7.2 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-pb-go v1.16.7 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v24.0.7+incompatible @@ -46,7 +46,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/avast/retry-go/v4 v4.5.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -86,11 +86,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -107,7 +107,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.11.1 // indirect @@ -120,8 +120,8 @@ require ( github.com/schollz/closestmatch v2.1.0+incompatible // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index f473021996c8f0..263e073f16b753 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -25,8 +25,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= @@ -70,8 +70,8 @@ github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDV github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/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= @@ -170,8 +170,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -198,8 +198,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -208,8 +208,8 @@ github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -271,8 +271,8 @@ github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrB github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= @@ -348,12 +348,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index ba74211692c545..9f9defb9063b1b 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -9,7 +9,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/cloudquery/filetypes/v4 v4.2.9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index d5326384b0c77e..7f27f09bb100dc 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -73,8 +73,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index 9401bb464982e6..62358cde9fc464 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( cloud.google.com/go/bigquery v1.58.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 golang.org/x/sync v0.6.0 @@ -21,7 +21,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -32,7 +32,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -60,12 +60,12 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -78,15 +78,15 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/schollz/closestmatch v2.1.0+incompatible // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 7af7cd24ce8f42..9333600366ff72 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -35,8 +35,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= @@ -71,14 +71,14 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -184,8 +184,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -210,8 +210,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -220,8 +220,8 @@ github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -264,8 +264,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -309,12 +309,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/clickhouse/go.mod b/plugins/destination/clickhouse/go.mod index 0fc72e7b1578e0..5e0c3f996829d6 100644 --- a/plugins/destination/clickhouse/go.mod +++ b/plugins/destination/clickhouse/go.mod @@ -6,7 +6,7 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.10.1 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -23,7 +23,7 @@ require ( github.com/CloudyKit/jet/v6 v6.2.0 // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -33,7 +33,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -66,11 +66,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -84,7 +84,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/paulmach/orb v0.9.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -95,8 +95,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/clickhouse/go.sum b/plugins/destination/clickhouse/go.sum index ae2dbc9b6e2804..8f223f86fe2d0d 100644 --- a/plugins/destination/clickhouse/go.sum +++ b/plugins/destination/clickhouse/go.sum @@ -19,8 +19,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -49,8 +49,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -59,8 +59,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -132,8 +132,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -155,8 +155,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -166,8 +166,8 @@ github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwf github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -211,8 +211,8 @@ github.com/paulmach/orb v0.9.2/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/Enu github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -260,12 +260,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= diff --git a/plugins/destination/duckdb/go.mod b/plugins/destination/duckdb/go.mod index 16f448785b3c0f..490bb26294a093 100644 --- a/plugins/destination/duckdb/go.mod +++ b/plugins/destination/duckdb/go.mod @@ -6,7 +6,7 @@ require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/uuid v1.5.0 github.com/marcboeker/go-duckdb v1.5.6 github.com/rs/zerolog v1.31.0 @@ -20,7 +20,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apache/thrift v0.19.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -30,7 +30,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -62,12 +62,12 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -83,7 +83,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -92,8 +92,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/duckdb/go.sum b/plugins/destination/duckdb/go.sum index 2e1862d83f73a0..8f8b3184219e6c 100644 --- a/plugins/destination/duckdb/go.sum +++ b/plugins/destination/duckdb/go.sum @@ -17,8 +17,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -49,8 +49,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -59,8 +59,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -125,8 +125,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -149,8 +149,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -159,8 +159,8 @@ github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -207,8 +207,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -252,12 +252,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/elasticsearch/go.mod b/plugins/destination/elasticsearch/go.mod index 58ea2447151673..e051377d1d125b 100644 --- a/plugins/destination/elasticsearch/go.mod +++ b/plugins/destination/elasticsearch/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/elastic/go-elasticsearch/v8 v8.6.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 @@ -21,14 +21,14 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -60,11 +60,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -77,7 +77,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -86,8 +86,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/elasticsearch/go.sum b/plugins/destination/elasticsearch/go.sum index 5fc55a2a99367a..094e18171eedc2 100644 --- a/plugins/destination/elasticsearch/go.sum +++ b/plugins/destination/elasticsearch/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -41,14 +41,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +117,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -141,16 +141,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -189,8 +189,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -235,12 +235,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index dac35e02357a2a..e88905b17ddc73 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -8,7 +8,7 @@ require ( github.com/apache/arrow/go/v15 v15.0.0 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/filetypes/v4 v4.2.9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/invopop/jsonschema v0.12.0 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 4d43b38c11ea64..f3a57198e5ae1a 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -61,8 +61,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/plugins/destination/firehose/go.mod b/plugins/destination/firehose/go.mod index e0cf9ab39c0be0..0b0af0a54df492 100644 --- a/plugins/destination/firehose/go.mod +++ b/plugins/destination/firehose/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/firehose v1.24.0 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -20,7 +20,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect @@ -39,7 +39,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -70,11 +70,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -87,7 +87,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -95,8 +95,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index 184a639591e35d..476c841785224d 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -69,14 +69,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -141,8 +141,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -165,16 +165,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -213,8 +213,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -257,12 +257,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index de03db53eadf9d..56b59a6d99d30c 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -8,7 +8,7 @@ require ( cloud.google.com/go/storage v1.36.0 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/cloudquery/filetypes/v4 v4.2.9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 8e582397a4816a..07233ce457175b 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -75,8 +75,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index a3ada92604f836..36430ff2d53b5f 100644 --- a/plugins/destination/gremlin/go.mod +++ b/plugins/destination/gremlin/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 ) @@ -20,7 +20,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect @@ -38,7 +38,7 @@ require ( github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -62,7 +62,7 @@ require ( github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/uuid v1.5.0 // indirect github.com/gorilla/css v1.0.1 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/gorilla/websocket v1.5.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -71,11 +71,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -89,7 +89,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/nicksnyder/go-i18n/v2 v2.2.1 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -97,8 +97,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index e34d256f8fcf80..22d9229cb7095a 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -16,8 +16,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -70,14 +70,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -142,8 +142,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -166,16 +166,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -216,8 +216,8 @@ github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -261,12 +261,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 1117311b046f2f..5bbd3b42b8be69 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -8,7 +8,7 @@ require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/cloudquery/filetypes/v4 v4.2.9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 84ee7c84f2bd91..1e52fd04768602 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -65,8 +65,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/plugins/destination/meilisearch/go.mod b/plugins/destination/meilisearch/go.mod index 2ab9ffc6e8aa05..9a03cee4fb7a42 100644 --- a/plugins/destination/meilisearch/go.mod +++ b/plugins/destination/meilisearch/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/meilisearch/meilisearch-go v0.24.0 @@ -19,7 +19,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -29,7 +29,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -61,11 +61,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -78,7 +78,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -87,8 +87,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index c14fb4ffd80cbd..eeecd151a1d7df 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -16,8 +16,8 @@ github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -46,14 +46,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -120,8 +120,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -146,8 +146,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -156,8 +156,8 @@ github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -198,8 +198,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -242,12 +242,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 71532b0e3a1045..8c9c2740e34506 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 go.mongodb.org/mongo-driver v1.12.1 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -28,7 +28,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -60,11 +60,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -78,7 +78,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -87,8 +87,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 5d74ac83d8ca38..327ba85691c1c8 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -123,8 +123,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -147,8 +147,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -156,8 +156,8 @@ github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIR github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -198,8 +198,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -242,12 +242,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index 540dfd5e0475ef..08be940deec742 100644 --- a/plugins/destination/mssql/go.mod +++ b/plugins/destination/mssql/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/microsoft/go-mssqldb v1.5.0 @@ -23,7 +23,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -33,7 +33,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -67,11 +67,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect @@ -85,7 +85,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -94,8 +94,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index 0f552d3d45fb90..0c40f595f604c5 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -27,8 +27,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -57,14 +57,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -143,8 +143,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -177,16 +177,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -231,8 +231,8 @@ github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= @@ -278,12 +278,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/mysql/go.mod b/plugins/destination/mysql/go.mod index 5b627d51d12427..50a66617463c19 100644 --- a/plugins/destination/mysql/go.mod +++ b/plugins/destination/mysql/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -26,7 +26,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -57,11 +57,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -74,7 +74,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -83,8 +83,8 @@ require ( github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index c390a571f5fe48..4cff0d1ab76f4a 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -41,14 +41,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -115,8 +115,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -138,16 +138,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -186,8 +186,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -230,12 +230,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 0d4e71af640f16..d9db29f940339f 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/neo4j/neo4j-go-driver/v5 v5.6.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -28,7 +28,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -61,11 +61,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -78,7 +78,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -86,8 +86,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 18fd936c128093..b3a77a343a3526 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -121,8 +121,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -145,16 +145,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -195,8 +195,8 @@ github.com/neo4j/neo4j-go-driver/v5 v5.6.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rb github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -239,12 +239,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 3962ce99651afc..d2d7c4d80d2dee 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb github.com/jackc/pgx/v5 v5.3.1 @@ -19,7 +19,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -29,7 +29,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -65,11 +65,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -82,7 +82,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -90,8 +90,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index c95bac882629cd..69d9d9a6812f6f 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +117,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -153,16 +153,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -201,8 +201,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -245,12 +245,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 4fee7dc2a8f85d..5253735e9567d5 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -11,7 +11,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 github.com/cloudquery/filetypes/v4 v4.2.9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index c5199bef310c52..0414ff80515e5c 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -99,8 +99,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index c8dd5e1e701276..1d89e68d7ed13b 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -5,7 +5,7 @@ go 1.21.6 require ( github.com/apache/arrow/go/v15 v15.0.0 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/snowflakedb/gosnowflake v1.7.2 @@ -50,7 +50,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/danieljoos/wincred v1.2.1 // indirect @@ -92,7 +92,7 @@ require ( github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -115,8 +115,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.14 // indirect - github.com/tdewolff/parse/v2 v2.7.9 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index f819e5cc3a6f41..f3a5c24885cd20 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -103,8 +103,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -113,8 +113,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= @@ -227,8 +227,8 @@ github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -320,10 +320,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.14 h1:sktSuVixRwk0ryQjqvKBu/uYS+MWmkwEFMEWtFZ+TdE= -github.com/tdewolff/minify/v2 v2.20.14/go.mod h1:qnIJbnG2dSzk7LIa/UUwgN2OjS8ir6RRlqc0T/1q2xY= -github.com/tdewolff/parse/v2 v2.7.9 h1:4u8nNXNmEGCRVd/slZmZHFL1mv/EVEpHMhSinxdDCqw= -github.com/tdewolff/parse/v2 v2.7.9/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 8d95741997b95b..2a2d12caec33c2 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.31.0 ) @@ -17,7 +17,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -27,7 +27,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -60,11 +60,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -77,7 +77,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -86,8 +86,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index 1e8c2a4d57b1ae..cefb88b69121b5 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -121,8 +121,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -145,16 +145,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -195,8 +195,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -239,12 +239,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index db6ce49e7dadac..2bb3423b804c68 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 ) @@ -17,7 +17,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -27,7 +27,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -59,11 +59,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -76,7 +76,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -85,8 +85,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index 582cb6e6fad6ba..dcb45026df1864 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -121,8 +121,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -145,16 +145,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -193,8 +193,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -237,12 +237,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index 902d8cdd2608db..2a291a79b883da 100644 --- a/plugins/source/alicloud/go.mod +++ b/plugins/source/alicloud/go.mod @@ -7,7 +7,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/golang/mock v1.5.0 github.com/invopop/jsonschema v0.12.0 github.com/pkg/errors v0.9.1 @@ -22,7 +22,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -32,7 +32,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -66,11 +66,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -84,7 +84,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -93,8 +93,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index 54b61996b40aa1..f8a21f3c7feadd 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -29,8 +29,8 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.62.266 h1:KpDhGuvJMRVugaW5B+ZgwBxGne9J github.com/aliyun/alibaba-cloud-sdk-go v1.62.266/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs= github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible h1:KpbJFXwhVeuxNtBJ74MCGbIoaBok2uZvkD7QXp2+Wis= github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -59,8 +59,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -69,8 +69,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -138,8 +138,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -170,16 +170,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -222,8 +222,8 @@ github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:Ff github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -266,12 +266,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/awspricing/go.mod b/plugins/source/awspricing/go.mod index c91654ca8714ea..975553872ddf56 100644 --- a/plugins/source/awspricing/go.mod +++ b/plugins/source/awspricing/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/awspricing go 1.21.4 require ( - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) @@ -14,7 +14,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -25,7 +25,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,11 +58,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -75,7 +75,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -84,8 +84,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/awspricing/go.sum b/plugins/source/awspricing/go.sum index 7c273ab961808e..f5d263952cffa3 100644 --- a/plugins/source/awspricing/go.sum +++ b/plugins/source/awspricing/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +117,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -143,16 +143,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -191,8 +191,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -235,12 +235,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 88bdc31dca86b1..759b5c6b1b5a57 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -6,7 +6,7 @@ require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudflare/cloudflare-go v0.84.0 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.31.0 github.com/thoas/go-funk v0.9.3 @@ -19,7 +19,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -29,7 +29,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -65,11 +65,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -82,7 +82,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -91,8 +91,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 6eea8921f926f0..4f9e0c496237a8 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -47,8 +47,8 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudflare/cloudflare-go v0.84.0 h1:1jQPJfq3nPdjKF+oqjTOSRAWcTCA6u5fcCVx7xGhLpg= github.com/cloudflare/cloudflare-go v0.84.0/go.mod h1:5pkAzpoWJYI5NekLZoRryQAcghYDhdbUxdcal1f7lu4= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -57,8 +57,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -126,8 +126,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -157,16 +157,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -205,8 +205,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -249,12 +249,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index e859ae086b2e98..4d73d0545a3df2 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -6,7 +6,7 @@ require ( github.com/DataDog/datadog-api-client-go/v2 v2.17.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/golang/mock v1.6.0 github.com/invopop/jsonschema v0.12.0 github.com/pkg/errors v0.9.1 @@ -24,7 +24,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -34,7 +34,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -66,11 +66,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -83,7 +83,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -91,8 +91,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 016e5606d7fe7c..2c3d29de418348 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -19,8 +19,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -49,8 +49,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -59,8 +59,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -128,8 +128,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -152,16 +152,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -200,8 +200,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -244,12 +244,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index f0e627c22ed185..3c929a486c09f4 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 github.com/aws/smithy-go v1.19.0 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/digitalocean/godo v1.99.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 @@ -24,7 +24,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect @@ -48,7 +48,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -82,11 +82,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -99,7 +99,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -108,8 +108,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index e81728f28fc246..b181eba51e29a3 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -83,14 +83,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -161,8 +161,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -187,16 +187,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -235,8 +235,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -279,12 +279,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/firestore/go.mod b/plugins/source/firestore/go.mod index 0e66324f58e279..81395db6ee2ad5 100644 --- a/plugins/source/firestore/go.mod +++ b/plugins/source/firestore/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go/firestore v1.14.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/invopop/jsonschema v0.11.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -25,7 +25,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -35,7 +35,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -72,11 +72,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -89,7 +89,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -97,8 +97,8 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/firestore/go.sum b/plugins/source/firestore/go.sum index dff50f9305696d..04e0386878dd66 100644 --- a/plugins/source/firestore/go.sum +++ b/plugins/source/firestore/go.sum @@ -27,8 +27,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -59,8 +59,8 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -69,8 +69,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -174,8 +174,8 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -198,16 +198,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -246,8 +246,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -291,12 +291,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index a4cc2f412f9f36..133ae19767c99b 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/beatlabs/github-auth v0.0.0-20240122214848-98862c3ce8f9 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/gofri/go-github-ratelimit v1.0.3 github.com/golang/mock v1.6.0 github.com/google/go-github/v49 v49.0.0 @@ -21,7 +21,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -31,7 +31,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -65,11 +65,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -82,7 +82,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -91,8 +91,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 9ba043ae2c96e5..947be0f35015f4 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -47,14 +47,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -127,8 +127,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -153,16 +153,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -201,8 +201,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -245,12 +245,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index f8ef4f889ddba1..90370f674eaf2b 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 github.com/xanzy/go-gitlab v0.83.0 @@ -17,7 +17,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -27,7 +27,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -64,11 +64,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -81,7 +81,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -90,8 +90,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 110375f853c66d..49b35c785eaab8 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -120,8 +120,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -155,16 +155,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -207,8 +207,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -252,12 +252,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/hackernews/go.mod b/plugins/source/hackernews/go.mod index f43b5222c3878f..1d329260032531 100644 --- a/plugins/source/hackernews/go.mod +++ b/plugins/source/hackernews/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/golang/mock v1.6.0 github.com/hermanschaaf/hackernews v1.0.1 github.com/rs/zerolog v1.31.0 @@ -20,7 +20,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -30,7 +30,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -63,11 +63,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -80,7 +80,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -89,8 +89,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/hackernews/go.sum b/plugins/source/hackernews/go.sum index b7e0b5f8da5d53..b83f7ebcc3f5f5 100644 --- a/plugins/source/hackernews/go.sum +++ b/plugins/source/hackernews/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -119,8 +119,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -147,16 +147,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -195,8 +195,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -239,12 +239,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/hubspot/go.mod b/plugins/source/hubspot/go.mod index 2f8ea585770c1c..905fb9105d6913 100644 --- a/plugins/source/hubspot/go.mod +++ b/plugins/source/hubspot/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/time v0.5.0 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -28,7 +28,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -61,11 +61,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -78,7 +78,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -87,8 +87,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum index 183513fb46ebab..e5f70233ecf7f8 100644 --- a/plugins/source/hubspot/go.sum +++ b/plugins/source/hubspot/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -47,14 +47,14 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 h1:pjhz1KktkBAqkDsEucv4vbJicT6V5yGbFsStfR3seio= github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126/go.mod h1:hedWyunNqr3OeTCQPjIMBjrJq/RImLOkIj37puh6oIE= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -120,8 +120,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -146,16 +146,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -194,8 +194,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -238,12 +238,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 1a2c08ced8ad8a..140168d85c3c72 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/golang/mock v1.6.0 github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 github.com/rs/zerolog v1.31.0 @@ -34,7 +34,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -78,7 +78,7 @@ require ( github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -102,8 +102,8 @@ require ( github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.14 // indirect - github.com/tdewolff/parse/v2 v2.7.9 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 7ace5104800053..e4d06b1683ec8c 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -176,8 +176,8 @@ github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -267,10 +267,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.14 h1:sktSuVixRwk0ryQjqvKBu/uYS+MWmkwEFMEWtFZ+TdE= -github.com/tdewolff/minify/v2 v2.20.14/go.mod h1:qnIJbnG2dSzk7LIa/UUwgN2OjS8ir6RRlqc0T/1q2xY= -github.com/tdewolff/parse/v2 v2.7.9 h1:4u8nNXNmEGCRVd/slZmZHFL1mv/EVEpHMhSinxdDCqw= -github.com/tdewolff/parse/v2 v2.7.9/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= diff --git a/plugins/source/notion/go.mod b/plugins/source/notion/go.mod index 2af4f809f7e99b..70487265231397 100644 --- a/plugins/source/notion/go.mod +++ b/plugins/source/notion/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/notion go 1.21.4 require ( - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) @@ -14,7 +14,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -25,7 +25,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,11 +58,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -75,7 +75,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -84,8 +84,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/notion/go.sum b/plugins/source/notion/go.sum index 7c273ab961808e..f5d263952cffa3 100644 --- a/plugins/source/notion/go.sum +++ b/plugins/source/notion/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +117,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -143,16 +143,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -191,8 +191,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -235,12 +235,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 468aa83b940477..064cba10f7e4bf 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.2 github.com/rs/zerolog v1.31.0 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -28,7 +28,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -61,12 +61,12 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -80,7 +80,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -89,8 +89,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 60fc9575b88de5..edd8daf2c68a82 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -50,8 +50,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -86,14 +86,14 @@ 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/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -214,8 +214,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -247,8 +247,8 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -258,8 +258,8 @@ github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwf github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -304,8 +304,8 @@ github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 h1:pSCLCl6joCFR github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -350,12 +350,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index f473e3cde64702..aa7100277b0016 100644 --- a/plugins/source/oracle/go.mod +++ b/plugins/source/oracle/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/oracle/oci-go-sdk/v65 v65.28.3 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -19,7 +19,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -29,7 +29,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -63,11 +63,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -80,7 +80,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -89,8 +89,8 @@ require ( github.com/sony/gobreaker v0.5.0 // indirect github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/oracle/go.sum b/plugins/source/oracle/go.sum index ed24b3ca2b41a6..b8f126a8c3bd59 100644 --- a/plugins/source/oracle/go.sum +++ b/plugins/source/oracle/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -55,8 +55,8 @@ github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1J github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -123,8 +123,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -147,16 +147,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -197,8 +197,8 @@ github.com/oracle/oci-go-sdk/v65 v65.28.3 h1:LOuUI2gf0Q2ygrWFBjE14dWYExvZu/Wq5Iu github.com/oracle/oci-go-sdk/v65 v65.28.3/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -245,12 +245,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index fd6e0ab5073069..d680f4d331ab08 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/PagerDuty/go-pagerduty v1.6.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 @@ -18,7 +18,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -28,7 +28,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -62,11 +62,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -79,7 +79,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -88,8 +88,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 32a8cffba18c3a..94d31dfc00b25b 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -17,8 +17,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -49,14 +49,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -125,8 +125,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -153,16 +153,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -206,8 +206,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -253,12 +253,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 88c2866a0bbe55..874a4ca9780610 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) @@ -15,7 +15,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -25,7 +25,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -58,11 +58,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -75,7 +75,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -84,8 +84,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 7c273ab961808e..f5d263952cffa3 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,14 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.1 h1:q4pxS7EXKqAPh8DSDBU3bE/vnCQXs4jUM3zcoAlGdL8= -github.com/cloudquery/cloudquery-api-go v1.7.1/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.0 h1:PBK363ZaDIC7QMSjLkFB8dQFSmHO1fBYHFRHWUuuecU= -github.com/cloudquery/plugin-sdk/v4 v4.29.0/go.mod h1:uXDeMTqip32aypf2gbYufYDoCeZNSJjoLPvoiBioy14= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +117,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -143,16 +143,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -191,8 +191,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -235,12 +235,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index cbe00823e7a9ff..8afbbe968d1ddc 100644 --- a/scaffold/cmd/templates/source/go.mod.tpl +++ b/scaffold/cmd/templates/source/go.mod.tpl @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 bcaeaa8c2d97 github.com/cloudquery/plugin-pb-go v1.16.7 - github.com/cloudquery/plugin-sdk/v4 v4.29.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.29.0 ) From 464a531b74254ca2ab1f4f1e4e1743c62dcbe027 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:06:25 +0200 Subject: [PATCH 02/78] chore: Update CLI version to v5.3.0 (#16431) Updates the CLI latest version to v5.3.0 --- 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 5e7a6c2d8b9a9f..85423c4966a501 100644 --- a/website/versions/cli.json +++ b/website/versions/cli.json @@ -1 +1 @@ -{ "latest": "cli-v5.2.0" } +{ "latest": "cli-v5.3.0" } From 9be9539ae6728136923cd7a1e1e4026661828a50 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:47:07 +0200 Subject: [PATCH 03/78] chore(deps): Update dependency cli to v5.3.0 (#16433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cli](https://togithub.com/cloudquery/cloudquery) | minor | `v5.2.0` -> `v5.3.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/cloudquery (cli) ### [`v5.3.0`](https://togithub.com/cloudquery/cloudquery/releases/tag/cli-v5.3.0) [Compare Source](https://togithub.com/cloudquery/cloudquery/compare/cli-v5.2.0...cli-v5.3.0) ##### Features - Support `PrimaryKeyComponents` in documentation ([#​16337](https://togithub.com/cloudquery/cloudquery/issues/16337)) ([fbde53c](https://togithub.com/cloudquery/cloudquery/commit/fbde53c0102ef61b683686a0f5f7f42bc6ffeb23)) ##### Bug Fixes - **deps:** Update github.com/pkg/browser digest to [`5ac0b6a`](https://togithub.com/cloudquery/cloudquery/commit/5ac0b6a) ([#​16418](https://togithub.com/cloudquery/cloudquery/issues/16418)) ([daefd21](https://togithub.com/cloudquery/cloudquery/commit/daefd21a266ed68163cf2d072836f465a75629e8)) - **deps:** Update golang.org/x/exp digest to [`1b97071`](https://togithub.com/cloudquery/cloudquery/commit/1b97071) ([#​16419](https://togithub.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://togithub.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`1f4bbc5`](https://togithub.com/cloudquery/cloudquery/commit/1f4bbc5) ([#​16422](https://togithub.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://togithub.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.2 ([#​16387](https://togithub.com/cloudquery/cloudquery/issues/16387)) ([a9d1cf0](https://togithub.com/cloudquery/cloudquery/commit/a9d1cf0d3463e80231a53644fba319f12cd537b4)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.7 ([#​16384](https://togithub.com/cloudquery/cloudquery/issues/16384)) ([2782bdb](https://togithub.com/cloudquery/cloudquery/commit/2782bdb1d5ba0d01718a9c69fbec4c8b780184fc)) - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#​16395](https://togithub.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://togithub.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513))
--- ### 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). --- .github/workflows/manual_commands_triggers.yml | 2 +- .github/workflows/publish_plugin_to_hub.yml | 6 +++--- .github/workflows/publish_plugin_to_hub_duckdb.yml | 2 +- .github/workflows/publish_plugin_to_hub_snowflake.yml | 2 +- .github/workflows/publish_plugin_to_hub_sqlite.yml | 2 +- .github/workflows/source_alicloud.yml | 2 +- .github/workflows/source_aws.yml | 2 +- .github/workflows/source_awspricing.yml | 2 +- .github/workflows/source_azure.yml | 2 +- .github/workflows/source_cloudflare.yml | 2 +- .github/workflows/source_datadog.yml | 2 +- .github/workflows/source_digitalocean.yml | 2 +- .github/workflows/source_gcp.yml | 4 ++-- .github/workflows/source_github.yml | 2 +- .github/workflows/source_gitlab.yml | 2 +- .github/workflows/source_hackernews.yml | 2 +- .github/workflows/source_hubspot.yml | 2 +- .github/workflows/source_k8s.yml | 4 ++-- .github/workflows/source_notion.yml | 2 +- .github/workflows/source_okta.yml | 2 +- .github/workflows/source_oracle.yml | 2 +- .github/workflows/source_pagerduty.yml | 2 +- .github/workflows/source_test.yml | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/manual_commands_triggers.yml b/.github/workflows/manual_commands_triggers.yml index c0e738914c4871..5db8d80a60d7d5 100644 --- a/.github/workflows/manual_commands_triggers.yml +++ b/.github/workflows/manual_commands_triggers.yml @@ -32,7 +32,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Set up Go 1.x uses: actions/setup-go@v4 diff --git a/.github/workflows/publish_plugin_to_hub.yml b/.github/workflows/publish_plugin_to_hub.yml index 447dd6537abc55..e5c5fa38b41dac 100644 --- a/.github/workflows/publish_plugin_to_hub.yml +++ b/.github/workflows/publish_plugin_to_hub.yml @@ -132,7 +132,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} @@ -206,7 +206,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} @@ -287,7 +287,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} diff --git a/.github/workflows/publish_plugin_to_hub_duckdb.yml b/.github/workflows/publish_plugin_to_hub_duckdb.yml index 4263ee657e6065..333f576bb63d8f 100644 --- a/.github/workflows/publish_plugin_to_hub_duckdb.yml +++ b/.github/workflows/publish_plugin_to_hub_duckdb.yml @@ -106,7 +106,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} diff --git a/.github/workflows/publish_plugin_to_hub_snowflake.yml b/.github/workflows/publish_plugin_to_hub_snowflake.yml index e63054ba350a3b..485507d7f6201b 100644 --- a/.github/workflows/publish_plugin_to_hub_snowflake.yml +++ b/.github/workflows/publish_plugin_to_hub_snowflake.yml @@ -107,7 +107,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} diff --git a/.github/workflows/publish_plugin_to_hub_sqlite.yml b/.github/workflows/publish_plugin_to_hub_sqlite.yml index da8be9bdc6bfe6..77c698d2bca8bd 100644 --- a/.github/workflows/publish_plugin_to_hub_sqlite.yml +++ b/.github/workflows/publish_plugin_to_hub_sqlite.yml @@ -106,7 +106,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Publish plugin to hub working-directory: ${{ needs.prepare.outputs.plugin_dir }} diff --git a/.github/workflows/source_alicloud.yml b/.github/workflows/source_alicloud.yml index 6cdeaee2923749..2d70d24c77bb71 100644 --- a/.github/workflows/source_alicloud.yml +++ b/.github/workflows/source_alicloud.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_aws.yml b/.github/workflows/source_aws.yml index 277d8ce7230e9e..2b77f1c38ae278 100644 --- a/.github/workflows/source_aws.yml +++ b/.github/workflows/source_aws.yml @@ -49,7 +49,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_awspricing.yml b/.github/workflows/source_awspricing.yml index efad1614f1bf3d..d6e621837e908b 100644 --- a/.github/workflows/source_awspricing.yml +++ b/.github/workflows/source_awspricing.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_azure.yml b/.github/workflows/source_azure.yml index a8493b11d86762..0f441e9994dcd7 100644 --- a/.github/workflows/source_azure.yml +++ b/.github/workflows/source_azure.yml @@ -47,7 +47,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_cloudflare.yml b/.github/workflows/source_cloudflare.yml index 734651772671a7..89c0364bde5db3 100644 --- a/.github/workflows/source_cloudflare.yml +++ b/.github/workflows/source_cloudflare.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_datadog.yml b/.github/workflows/source_datadog.yml index 3b9956ba8ffb5f..3fc89e8e230255 100644 --- a/.github/workflows/source_datadog.yml +++ b/.github/workflows/source_datadog.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_digitalocean.yml b/.github/workflows/source_digitalocean.yml index 3c000e26906534..ce0c81918f46d8 100644 --- a/.github/workflows/source_digitalocean.yml +++ b/.github/workflows/source_digitalocean.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_gcp.yml b/.github/workflows/source_gcp.yml index 8acf3be8a1a78a..6d84bc4b2f0416 100644 --- a/.github/workflows/source_gcp.yml +++ b/.github/workflows/source_gcp.yml @@ -47,7 +47,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen @@ -130,7 +130,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Migrate DB run: cloudquery migrate test/policy_cq_config.yml env: diff --git a/.github/workflows/source_github.yml b/.github/workflows/source_github.yml index 94248cb41d1281..c212390243511d 100644 --- a/.github/workflows/source_github.yml +++ b/.github/workflows/source_github.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_gitlab.yml b/.github/workflows/source_gitlab.yml index 1347f66a7e4aa0..a0212ea43ae438 100644 --- a/.github/workflows/source_gitlab.yml +++ b/.github/workflows/source_gitlab.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_hackernews.yml b/.github/workflows/source_hackernews.yml index 523a3114ae40c8..524ff69e036d09 100644 --- a/.github/workflows/source_hackernews.yml +++ b/.github/workflows/source_hackernews.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_hubspot.yml b/.github/workflows/source_hubspot.yml index 086acb4b0e30b3..5a01cdf29d9916 100644 --- a/.github/workflows/source_hubspot.yml +++ b/.github/workflows/source_hubspot.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_k8s.yml b/.github/workflows/source_k8s.yml index d029076eb778a8..18072a6bca07ff 100644 --- a/.github/workflows/source_k8s.yml +++ b/.github/workflows/source_k8s.yml @@ -47,7 +47,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen @@ -130,7 +130,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: Migrate DB run: cloudquery migrate test/policy_cq_config.yml env: diff --git a/.github/workflows/source_notion.yml b/.github/workflows/source_notion.yml index 7434f9c001166d..96180b92bb8796 100644 --- a/.github/workflows/source_notion.yml +++ b/.github/workflows/source_notion.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_okta.yml b/.github/workflows/source_okta.yml index f0f1a3542054f5..136ea22450bd3e 100644 --- a/.github/workflows/source_okta.yml +++ b/.github/workflows/source_okta.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_oracle.yml b/.github/workflows/source_oracle.yml index a0b6c09561dcb8..5fb0c862194ff7 100644 --- a/.github/workflows/source_oracle.yml +++ b/.github/workflows/source_oracle.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen-docs if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_pagerduty.yml b/.github/workflows/source_pagerduty.yml index d7ad8225206f62..a0709b507261fe 100644 --- a/.github/workflows/source_pagerduty.yml +++ b/.github/workflows/source_pagerduty.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/.github/workflows/source_test.yml b/.github/workflows/source_test.yml index 410bf4e248d094..057767f5bd38e6 100644 --- a/.github/workflows/source_test.yml +++ b/.github/workflows/source_test.yml @@ -46,7 +46,7 @@ jobs: if: github.event_name == 'pull_request' uses: cloudquery/setup-cloudquery@v3 with: - version: v5.2.0 + version: v5.3.0 - name: gen if: github.event_name == 'pull_request' run: make gen From cc90a9a8a4ffc42b9a2a78977723c474d1ed64f0 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:50:53 -0800 Subject: [PATCH 04/78] feat: Add JSON schema to Gremlin destination plugin (#16389) Implements https://github.com/cloudquery/cloudquery/issues/16350 --- .github/workflows/dest_gremlin.yml | 6 + plugins/destination/gremlin/Makefile | 8 + .../destination/gremlin/client/schema.json | 208 ++++++++++++++++++ plugins/destination/gremlin/client/spec.go | 157 +++++++++++-- .../gremlin/client/spec/gen/main.go | 26 +++ .../destination/gremlin/client/spec_test.go | 127 +++++++++++ plugins/destination/gremlin/docs/overview.md | 4 +- plugins/destination/gremlin/go.mod | 8 + plugins/destination/gremlin/go.sum | 10 + plugins/destination/gremlin/main.go | 1 + 10 files changed, 537 insertions(+), 18 deletions(-) create mode 100644 plugins/destination/gremlin/client/schema.json create mode 100644 plugins/destination/gremlin/client/spec/gen/main.go create mode 100644 plugins/destination/gremlin/client/spec_test.go diff --git a/.github/workflows/dest_gremlin.yml b/.github/workflows/dest_gremlin.yml index 3806e64ad809ae..6487a0b11824e6 100644 --- a/.github/workflows/dest_gremlin.yml +++ b/.github/workflows/dest_gremlin.yml @@ -47,6 +47,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test Gremlin diff --git a/plugins/destination/gremlin/Makefile b/plugins/destination/gremlin/Makefile index c957b06653ed16..a803c132c3b248 100644 --- a/plugins/destination/gremlin/Makefile +++ b/plugins/destination/gremlin/Makefile @@ -7,3 +7,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/gremlin/client/schema.json b/plugins/destination/gremlin/client/schema.json new file mode 100644 index 00000000000000..e250e6b39528dd --- /dev/null +++ b/plugins/destination/gremlin/client/schema.json @@ -0,0 +1,208 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/gremlin/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "allOf": [ + { + "if": { + "properties": { + "auth_mode": { + "type": "string", + "const": "aws", + "description": "Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication.", + "default": "none" + } + }, + "required": [ + "auth_mode" + ] + }, + "then": { + "properties": { + "aws_region": { + "type": "string", + "minLength": 1, + "description": "AWS region to use for AWS IAM authentication. Required when `auth_mode` is `aws`." + } + }, + "required": [ + "aws_region" + ] + }, + "title": "auth_mode:aws requires aws_region to be set" + }, + { + "if": { + "properties": { + "auth_mode": { + "type": "string", + "const": "basic", + "description": "Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication.", + "default": "none" + } + }, + "required": [ + "auth_mode" + ] + }, + "then": { + "properties": { + "username": { + "type": "string", + "minLength": 1, + "description": "Username to connect to the database. Required when `auth_mode` is `basic`." + }, + "password": { + "type": "string", + "minLength": 1, + "description": "Password to connect to the database. Required when `auth_mode` is `basic`." + } + }, + "required": [ + "username", + "password" + ] + }, + "title": "auth_mode:basic requires username and password to be set" + }, + { + "if": { + "properties": { + "username": { + "type": "string", + "minLength": 1, + "description": "Username to connect to the database. Required when `auth_mode` is `basic`." + } + }, + "required": [ + "username" + ] + }, + "then": { + "properties": { + "password": { + "type": "string", + "minLength": 1, + "description": "Password to connect to the database. Required when `auth_mode` is `basic`." + }, + "auth_mode": { + "type": "string", + "const": "basic", + "description": "Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication.", + "default": "none" + } + }, + "required": [ + "password", + "auth_mode" + ] + }, + "title": "username requires password to be set and auth_mode:basic" + }, + { + "if": { + "properties": { + "password": { + "type": "string", + "minLength": 1, + "description": "Password to connect to the database. Required when `auth_mode` is `basic`." + } + }, + "required": [ + "password" + ] + }, + "then": { + "properties": { + "username": { + "type": "string", + "minLength": 1, + "description": "Username to connect to the database. Required when `auth_mode` is `basic`." + }, + "auth_mode": { + "type": "string", + "const": "basic", + "description": "Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication.", + "default": "none" + } + }, + "required": [ + "username", + "auth_mode" + ] + }, + "title": "password requires username to be set and auth_mode:basic" + } + ], + "properties": { + "endpoint": { + "type": "string", + "pattern": "^wss?://[^\n]+$", + "description": "Endpoint for the database. Supported schemes are `wss://` and `ws://`, the default port is `8182`." + }, + "insecure": { + "type": "boolean", + "description": "Whether to skip TLS verification. Defaults to `false`. This should be set on a macOS environment when connecting to an AWS Neptune endpoint.", + "default": false + }, + "auth_mode": { + "type": "string", + "enum": [ + "none", + "basic", + "aws" + ], + "description": "Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication.", + "default": "none" + }, + "username": { + "type": "string", + "description": "Username to connect to the database. Required when `auth_mode` is `basic`." + }, + "password": { + "type": "string", + "description": "Password to connect to the database. Required when `auth_mode` is `basic`." + }, + "max_retries": { + "type": "integer", + "minimum": 1, + "description": "Number of retries on `ConcurrentModificationException` before giving up for each batch.\nRetries are exponentially backed off.", + "default": 5 + }, + "aws_region": { + "type": "string", + "description": "AWS region to use for AWS IAM authentication. Required when `auth_mode` is `aws`." + }, + "max_concurrent_connections": { + "type": "integer", + "minimum": 1, + "description": "Maximum number of concurrent connections to the database. Defaults to the number of CPUs." + }, + "complete_types": { + "type": "boolean", + "description": "Whether to use all Gremlin types or just a basic subset.\nShould remain `false` for Amazon Neptune compatibility.", + "default": false + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Number of records to batch together before sending to the database.", + "default": 200 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Number of bytes (as Arrow buffer size) to batch together before sending to the database.", + "default": 4194304 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "endpoint" + ] + } + } +} diff --git a/plugins/destination/gremlin/client/spec.go b/plugins/destination/gremlin/client/spec.go index 34e7dbd8ca355c..7ea71792543b55 100644 --- a/plugins/destination/gremlin/client/spec.go +++ b/plugins/destination/gremlin/client/spec.go @@ -1,35 +1,50 @@ package client import ( + _ "embed" "fmt" "runtime" "strings" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" ) type Spec struct { - Endpoint string `json:"endpoint"` - Insecure bool `json:"insecure"` + // Endpoint for the database. Supported schemes are `wss://` and `ws://`, the default port is `8182`. + Endpoint string `json:"endpoint" jsonschema:"required,pattern=^wss?://[^\n]+$"` + + // Whether to skip TLS verification. Defaults to `false`. This should be set on a macOS environment when connecting to an AWS Neptune endpoint. + Insecure bool `json:"insecure" jsonschema:"default=false"` - AuthMode authMode `json:"auth_mode"` + // Authentication mode to use. `basic` uses static credentials, `aws` uses AWS IAM authentication. + AuthMode authMode `json:"auth_mode" jsonschema:"default=none"` - // Static credentials + // Username to connect to the database. Required when `auth_mode` is `basic`. Username string `json:"username"` + + // Password to connect to the database. Required when `auth_mode` is `basic`. Password string `json:"password"` - // Backoff - MaxRetries int `json:"max_retries"` + // Number of retries on `ConcurrentModificationException` before giving up for each batch. + // Retries are exponentially backed off. + MaxRetries int `json:"max_retries" jsonschema:"minimum=1,default=5"` - // AWS specific settings + // AWS region to use for AWS IAM authentication. Required when `auth_mode` is `aws`. AWSRegion string `json:"aws_region"` - // Connection settings - MaxConcurrentConnections int `json:"max_concurrent_connections"` + // Maximum number of concurrent connections to the database. Defaults to the number of CPUs. + MaxConcurrentConnections int `json:"max_concurrent_connections" jsonschema:"minimum=1"` - // Whether to use all Gremlin types or just a basic subset - CompleteTypes bool `json:"complete_types"` + // Whether to use all Gremlin types or just a basic subset. + // Should remain `false` for Amazon Neptune compatibility. + CompleteTypes bool `json:"complete_types" jsonschema:"default=false"` - BatchSize int `json:"batch_size"` - BatchSizeBytes int `json:"batch_size_bytes"` + // Number of records to batch together before sending to the database. + BatchSize int `json:"batch_size" jsonschema:"minimum=1,default=200"` + + // Number of bytes (as Arrow buffer size) to batch together before sending to the database. + BatchSizeBytes int `json:"batch_size_bytes" jsonschema:"minimum=1,default=4194304"` } type authMode string @@ -40,6 +55,9 @@ const ( authModeAWS = authMode("aws") ) +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults() { if s.Endpoint != "" { // Default to "wss://:8182" where "wss://" and ":8182" are optional @@ -59,7 +77,7 @@ func (s *Spec) SetDefaults() { s.AuthMode = authMode(strings.ToLower(string(s.AuthMode))) } - if s.MaxRetries <= 0 { + if s.MaxRetries < 1 { s.MaxRetries = 5 // 5 retries by default } @@ -67,10 +85,10 @@ func (s *Spec) SetDefaults() { s.MaxConcurrentConnections = runtime.NumCPU() } - if s.BatchSize <= 0 { + if s.BatchSize < 1 { s.BatchSize = 200 } - if s.BatchSizeBytes <= 0 { + if s.BatchSizeBytes < 1 { s.BatchSizeBytes = 1024 * 1024 * 4 } } @@ -91,3 +109,110 @@ func (s *Spec) Validate() error { return nil } + +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + forceAuthMode := func(sc *jsonschema.Schema, value authMode) *jsonschema.Schema { + authMode := *sc.Properties.Value("auth_mode") + authMode.Enum = nil + authMode.Const = value + return &authMode + } + forceMinLength := func(sc *jsonschema.Schema, field string) *jsonschema.Schema { + one := uint64(1) + val := *sc.Properties.Value(field) + val.MinLength = &one + return &val + } + + sc.AllOf = append(sc.AllOf, []*jsonschema.Schema{ + { + Title: "auth_mode:aws requires aws_region to be set", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("auth_mode", forceAuthMode(sc, authModeAWS)) + return properties + }(), + Required: []string{"auth_mode"}, + }, + Then: &jsonschema.Schema{ + // require properties not to be empty or null + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("aws_region", forceMinLength(sc, "aws_region")) + return properties + }(), + Required: []string{"aws_region"}, + }, + }, + + { + Title: "auth_mode:basic requires username and password to be set", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("auth_mode", forceAuthMode(sc, authModeBasic)) + return properties + }(), + Required: []string{"auth_mode"}, + }, + Then: &jsonschema.Schema{ + // require properties not to be empty or null + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("username", forceMinLength(sc, "username")) + properties.Set("password", forceMinLength(sc, "password")) + return properties + }(), + Required: []string{"username", "password"}, + }, + }, + { + Title: "username requires password to be set and auth_mode:basic", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("username", forceMinLength(sc, "username")) + return properties + }(), + Required: []string{"username"}, + }, + Then: &jsonschema.Schema{ + // require properties not to be empty or null + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("password", forceMinLength(sc, "password")) + properties.Set("auth_mode", forceAuthMode(sc, authModeBasic)) + return properties + }(), + Required: []string{"password", "auth_mode"}, + }, + }, + { + Title: "password requires username to be set and auth_mode:basic", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("password", forceMinLength(sc, "password")) + return properties + }(), + Required: []string{"password"}, + }, + Then: &jsonschema.Schema{ + // require properties not to be empty or null + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("username", forceMinLength(sc, "username")) + properties.Set("auth_mode", forceAuthMode(sc, authModeBasic)) + return properties + }(), + Required: []string{"username", "auth_mode"}, + }, + }, + }...) +} + +func (authMode) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = []any{authModeNone, authModeBasic, authModeAWS} +} diff --git a/plugins/destination/gremlin/client/spec/gen/main.go b/plugins/destination/gremlin/client/spec/gen/main.go new file mode 100644 index 00000000000000..7116511f6185f7 --- /dev/null +++ b/plugins/destination/gremlin/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/gremlin/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/gremlin/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/gremlin/client/spec_test.go b/plugins/destination/gremlin/client/spec_test.go new file mode 100644 index 00000000000000..10dd1e28db925f --- /dev/null +++ b/plugins/destination/gremlin/client/spec_test.go @@ -0,0 +1,127 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with endpoint", + Spec: `{"endpoint": "ws://localhost:8182"}`, + }, + { + Name: "spec with wss endpoint, without port", + Spec: `{"endpoint": "wss://localhost"}`, + }, + { + Name: "spec with bad endpoint 1", + Spec: `{"endpoint": "http://localhost:8182"}`, + Err: true, + }, + { + Name: "spec with bad endpoint 2", + Spec: `{"endpoint": "wss://"}`, + Err: true, + }, + { + Name: "spec with bad endpoint 3", + Spec: `{"endpoint": "ws://"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode basic, username/password", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "basic", "username": "abc", "password": "def"}`, + }, + { + Name: "spec with endpoint, auth_mode basic, username but no password", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "basic", "username": "abc"}`, + Err: true, + }, + { + Name: "spec with endpoint, none auth_mode", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "none"}`, + }, + { + Name: "spec with endpoint, invalid auth_mode", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "invalid"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, username", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws", "aws_region":"reg", "username": "abc"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, password", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws", "aws_region":"reg", "password": "abc"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, username/password", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws", "aws_region":"reg", "username": "abc", "password": "def"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, no region", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws"}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, empty region", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws", "aws_region":""}`, + Err: true, + }, + { + Name: "spec with endpoint, auth_mode aws, region", + Spec: `{"endpoint": "ws://localhost:8182", "auth_mode": "aws", "aws_region":"reg"}`, + }, + { + Name: "spec with bool endpoint", + Spec: `{"endpoint": true}`, + Err: true, + }, + { + Name: "spec with null endpoint", + Spec: `{"endpoint": null}`, + Err: true, + }, + { + Name: "spec with int endpoint", + Spec: `{"endpoint": 123}`, + Err: true, + }, + { + Name: "spec with bool batch_size", + Spec: `{"endpoint": "ws://localhost:8182", "batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"endpoint": "ws://localhost:8182", "batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"endpoint": "ws://localhost:8182", "batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"endpoint": "ws://localhost:8182", "batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"endpoint": "ws://localhost:8182", "unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/gremlin/docs/overview.md b/plugins/destination/gremlin/docs/overview.md index 10c3f1e9a33d7b..8f3b4ac1606f8c 100644 --- a/plugins/destination/gremlin/docs/overview.md +++ b/plugins/destination/gremlin/docs/overview.md @@ -50,7 +50,7 @@ This is the (nested) spec used by the Gremlin destination Plugin. - `insecure` (`boolean`) (optional) - Whether to skip TLS verification. Defaults to `false`. This should be set on a MacOS environment when connecting to an AWS Neptune endpoint. + Whether to skip TLS verification. Defaults to `false`. This should be set on a macOS environment when connecting to an AWS Neptune endpoint. - `auth_mode` (`string`) (optional) (default: `none`) @@ -87,6 +87,6 @@ This is the (nested) spec used by the Gremlin destination Plugin. Number of records to batch together before sending to the database. -- `batch_size_bytes` (`intege`r) (optional) (default: `4194304` (4 MiB)) +- `batch_size_bytes` (`integer`) (optional) (default: `4194304` (4 MiB)) Number of bytes (as Arrow buffer size) to batch together before sending to the database. diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index 36430ff2d53b5f..9c0f22ec6a983d 100644 --- a/plugins/destination/gremlin/go.mod +++ b/plugins/destination/gremlin/go.mod @@ -8,9 +8,12 @@ require ( github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/cenkalti/backoff/v4 v4.2.1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 + github.com/invopop/jsonschema v0.11.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 + github.com/wk8/go-ordered-map/v2 v2.1.8 ) require ( @@ -35,6 +38,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect github.com/aws/smithy-go v1.19.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect @@ -134,3 +139,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index 22d9229cb7095a..0b55e2ba5ca7e1 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -54,9 +54,13 @@ github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -72,6 +76,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -282,6 +290,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= diff --git a/plugins/destination/gremlin/main.go b/plugins/destination/gremlin/main.go index 9cec9034535daa..98dfb5680848c5 100644 --- a/plugins/destination/gremlin/main.go +++ b/plugins/destination/gremlin/main.go @@ -18,6 +18,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatalf("failed to serve plugin: %v", err) From dc8df9d3db093f3abde8bded407a280a78a66d02 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:59:10 -0800 Subject: [PATCH 05/78] feat: Add JSON schema to mysql destination plugin (#16437) Closes https://github.com/cloudquery/cloudquery/issues/16435 --- .github/workflows/dest_mysql.yml | 6 ++ plugins/destination/mysql/Makefile | 8 +++ plugins/destination/mysql/client/schema.json | 33 ++++++++++ plugins/destination/mysql/client/spec.go | 21 +++++-- .../destination/mysql/client/spec/gen/main.go | 26 ++++++++ plugins/destination/mysql/client/spec_test.go | 61 +++++++++++++++++++ .../destination/mysql/docs/configuration.md | 6 +- plugins/destination/mysql/go.mod | 8 +++ plugins/destination/mysql/go.sum | 10 +++ plugins/destination/mysql/main.go | 1 + 10 files changed, 172 insertions(+), 8 deletions(-) create mode 100644 plugins/destination/mysql/client/schema.json create mode 100644 plugins/destination/mysql/client/spec/gen/main.go create mode 100644 plugins/destination/mysql/client/spec_test.go diff --git a/.github/workflows/dest_mysql.yml b/.github/workflows/dest_mysql.yml index 8d58a6f47cf035..07ccc2c66c72a4 100644 --- a/.github/workflows/dest_mysql.yml +++ b/.github/workflows/dest_mysql.yml @@ -42,6 +42,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . # We don't use services as we need to pass additional arguments to the container diff --git a/plugins/destination/mysql/Makefile b/plugins/destination/mysql/Makefile index c957b06653ed16..a803c132c3b248 100644 --- a/plugins/destination/mysql/Makefile +++ b/plugins/destination/mysql/Makefile @@ -7,3 +7,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/mysql/client/schema.json b/plugins/destination/mysql/client/schema.json new file mode 100644 index 00000000000000..42c1e0ae4efedf --- /dev/null +++ b/plugins/destination/mysql/client/schema.json @@ -0,0 +1,33 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/mysql/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "connection_string": { + "type": "string", + "minLength": 1, + "description": "Connection string to connect to the database. See the [Go driver documentation](https://github.com/go-sql-driver/mysql#dsn-data-source-name) for details." + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "default": 1000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Maximum size of items that may be grouped together to be written in a single write.", + "default": 4194304 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "connection_string" + ] + } + } +} diff --git a/plugins/destination/mysql/client/spec.go b/plugins/destination/mysql/client/spec.go index 96e7bfd51e3bc9..e82c24a5255de1 100644 --- a/plugins/destination/mysql/client/spec.go +++ b/plugins/destination/mysql/client/spec.go @@ -1,18 +1,29 @@ package client -import "fmt" +import ( + _ "embed" + "fmt" +) const ( batchSize = 1000 - batchSizeBytes = 4 * 1024 * 1024 + batchSizeBytes = 4 * 1024 * 1024 // 4 MB ) type Spec struct { - BatchSize int `json:"batch_size,omitempty"` - BatchSizeBytes int `json:"batch_size_bytes,omitempty"` - ConnectionString string `json:"connection_string,omitempty"` + // Connection string to connect to the database. See the [Go driver documentation](https://github.com/go-sql-driver/mysql#dsn-data-source-name) for details. + ConnectionString string `json:"connection_string" jsonschema:"required,minLength=1"` + + // Maximum amount of items that may be grouped together to be written in a single write. + BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` + + // Maximum size of items that may be grouped together to be written in a single write. + BatchSizeBytes int `json:"batch_size_bytes,omitempty" jsonschema:"minimum=1,default=4194304"` } +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults() { if s.BatchSize == 0 { s.BatchSize = batchSize diff --git a/plugins/destination/mysql/client/spec/gen/main.go b/plugins/destination/mysql/client/spec/gen/main.go new file mode 100644 index 00000000000000..d81e3de7d187cc --- /dev/null +++ b/plugins/destination/mysql/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/mysql/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/mysql/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/mysql/client/spec_test.go b/plugins/destination/mysql/client/spec_test.go new file mode 100644 index 00000000000000..092ab161b4694f --- /dev/null +++ b/plugins/destination/mysql/client/spec_test.go @@ -0,0 +1,61 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with connection_string", + Spec: `{"connection_string": "string"}`, + }, + { + Name: "spec with bool connection_string", + Spec: `{"connection_string": true}`, + Err: true, + }, + { + Name: "spec with null connection_string", + Spec: `{"connection_string": null}`, + Err: true, + }, + { + Name: "spec with int connection_string", + Spec: `{"connection_string": 123}`, + Err: true, + }, + { + Name: "spec with bool batch_size", + Spec: `{"connection_string": "abc", "batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"connection_string": "abc", "batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"connection_string": "abc", "batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"connection_string": "abc", "batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"connection_string": "abc", "unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/mysql/docs/configuration.md b/plugins/destination/mysql/docs/configuration.md index a76d5054503464..675e4965dc5a41 100644 --- a/plugins/destination/mysql/docs/configuration.md +++ b/plugins/destination/mysql/docs/configuration.md @@ -18,12 +18,12 @@ This is the (nested) spec used by the MySQL destination plugin. - `connection_string` (`string`) (required) - Connection string to connect to the database. See the [Go driver documentation](https://github.com/go-sql-driver/mysql#dsn-data-source-name) for more details. + Connection string to connect to the database. See the [Go driver documentation](https://github.com/go-sql-driver/mysql#dsn-data-source-name) for details. - `batch_size` (`integer`) (optional) (default: `1000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum amount of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `4194304` (= 4 MiB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. diff --git a/plugins/destination/mysql/go.mod b/plugins/destination/mysql/go.mod index 50a66617463c19..36bef0d9f7ddc9 100644 --- a/plugins/destination/mysql/go.mod +++ b/plugins/destination/mysql/go.mod @@ -4,6 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.5.0 @@ -22,6 +23,8 @@ require ( github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect @@ -52,6 +55,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/invopop/jsonschema v0.11.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -92,6 +96,7 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect @@ -119,3 +124,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index 4cff0d1ab76f4a..6267805a958371 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -25,9 +25,13 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7D github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -43,6 +47,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -251,6 +259,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= diff --git a/plugins/destination/mysql/main.go b/plugins/destination/mysql/main.go index 15a9d3f2785e27..80eb79f5200ba2 100644 --- a/plugins/destination/mysql/main.go +++ b/plugins/destination/mysql/main.go @@ -22,6 +22,7 @@ func main() { client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), ), serve.WithDestinationV0V1Server(), serve.WithPluginSentryDSN(sentryDSN), From e3c566caffbb58c69e6966e23410af288b4ffe8d Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Thu, 1 Feb 2024 17:09:31 +0200 Subject: [PATCH 06/78] feat: Add JSON schema to `azblob` destination plugin (#16429) Closes https://github.com/cloudquery/cloudquery/issues/16405 Basically, an adapted version of https://github.com/cloudquery/cloudquery/pull/16404 --- .github/workflows/dest_azblob.yml | 6 + plugins/destination/azblob/Makefile | 10 + plugins/destination/azblob/client/client.go | 9 +- .../destination/azblob/client/client_test.go | 25 +- plugins/destination/azblob/client/spec.go | 71 ------ .../azblob/client/spec/gen/main.go | 30 +++ .../destination/azblob/client/spec/schema.go | 48 ++++ .../azblob/client/spec/schema.json | 232 ++++++++++++++++++ .../azblob/client/spec/schema_test.go | 220 +++++++++++++++++ .../destination/azblob/client/spec/spec.go | 96 ++++++++ .../azblob/client/spec/spec_test.go | 74 ++++++ .../destination/azblob/client/spec_test.go | 69 ------ plugins/destination/azblob/client/write.go | 6 +- plugins/destination/azblob/docs/overview.md | 5 + 14 files changed, 741 insertions(+), 160 deletions(-) delete mode 100644 plugins/destination/azblob/client/spec.go create mode 100644 plugins/destination/azblob/client/spec/gen/main.go create mode 100644 plugins/destination/azblob/client/spec/schema.go create mode 100644 plugins/destination/azblob/client/spec/schema.json create mode 100644 plugins/destination/azblob/client/spec/schema_test.go create mode 100644 plugins/destination/azblob/client/spec/spec.go create mode 100644 plugins/destination/azblob/client/spec/spec_test.go delete mode 100644 plugins/destination/azblob/client/spec_test.go diff --git a/.github/workflows/dest_azblob.yml b/.github/workflows/dest_azblob.yml index 34c0bc874273a6..685659779a1d4c 100644 --- a/.github/workflows/dest_azblob.yml +++ b/.github/workflows/dest_azblob.yml @@ -42,6 +42,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test azblob plugin diff --git a/plugins/destination/azblob/Makefile b/plugins/destination/azblob/Makefile index f9ab6c2eac145b..0693013f2cba0d 100644 --- a/plugins/destination/azblob/Makefile +++ b/plugins/destination/azblob/Makefile @@ -5,3 +5,13 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + # required for loading comments from filetypes + go mod vendor + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/azblob/client/client.go b/plugins/destination/azblob/client/client.go index e323875b4bf104..085e21532f224f 100644 --- a/plugins/destination/azblob/client/client.go +++ b/plugins/destination/azblob/client/client.go @@ -8,6 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" + "github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/writers/streamingbatchwriter" @@ -21,14 +22,14 @@ type Client struct { streamingbatchwriter.UnimplementedDeleteRecords logger zerolog.Logger - spec *Spec + spec *spec.Spec *filetypes.Client writer *streamingbatchwriter.StreamingBatchWriter storageClient *azblob.Client } -func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewClientOptions) (plugin.Client, error) { +func New(ctx context.Context, logger zerolog.Logger, s []byte, opts plugin.NewClientOptions) (plugin.Client, error) { c := &Client{ logger: logger.With().Str("module", "azb").Logger(), } @@ -36,7 +37,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.Ne return c, nil } - if err := json.Unmarshal(spec, &c.spec); err != nil { + if err := json.Unmarshal(s, &c.spec); err != nil { return nil, fmt.Errorf("failed to unmarshal azblob spec: %w", err) } if err := c.spec.Validate(); err != nil { @@ -44,7 +45,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.Ne } c.spec.SetDefaults() - filetypesClient, err := filetypes.NewClient(c.spec.FileSpec) + filetypesClient, err := filetypes.NewClient(&c.spec.FileSpec) if err != nil { return nil, fmt.Errorf("failed to create filetypes client: %w", err) } diff --git a/plugins/destination/azblob/client/client_test.go b/plugins/destination/azblob/client/client_test.go index d47c270545b6f1..ca9a47186a1ba6 100644 --- a/plugins/destination/azblob/client/client_test.go +++ b/plugins/destination/azblob/client/client_test.go @@ -10,6 +10,7 @@ import ( "github.com/apache/arrow/go/v15/arrow" "github.com/apache/arrow/go/v15/arrow/array" "github.com/apache/arrow/go/v15/arrow/memory" + "github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" @@ -19,8 +20,8 @@ import ( ) const ( - storage_account = "cqdestinationazblob" - container = "test" + storageAccount = "cqdestinationazblob" + container = "test" ) func TestPlugin(t *testing.T) { @@ -29,30 +30,28 @@ func TestPlugin(t *testing.T) { filetypes.FormatTypeJSON, filetypes.FormatTypeParquet, } { - spec := Spec{ - StorageAccount: storage_account, + s := spec.Spec{ + StorageAccount: storageAccount, Container: container, Path: t.TempDir(), NoRotate: true, - FileSpec: &filetypes.FileSpec{ - Format: ft, - }, + FileSpec: filetypes.FileSpec{Format: ft}, } t.Run("generic/"+string(ft), func(t *testing.T) { - testPlugin(t, &spec) + testPlugin(t, &s) }) t.Run("write/"+string(ft), func(t *testing.T) { - testPluginCustom(t, &spec) + testPluginCustom(t, &s) }) } } -func testPlugin(t *testing.T, spec *Spec) { +func testPlugin(t *testing.T, s *spec.Spec) { ctx := context.Background() p := plugin.NewPlugin("azblob", "development", New) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } @@ -71,7 +70,7 @@ func testPlugin(t *testing.T, spec *Spec) { ) } -func testPluginCustom(t *testing.T, spec *Spec) { +func testPluginCustom(t *testing.T, s *spec.Spec) { ctx := context.Background() var client plugin.Client @@ -81,7 +80,7 @@ func testPluginCustom(t *testing.T, spec *Spec) { client, err = New(ctx, logger, spec, opts) return client, err }) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } diff --git a/plugins/destination/azblob/client/spec.go b/plugins/destination/azblob/client/spec.go deleted file mode 100644 index c3e326c9462b67..00000000000000 --- a/plugins/destination/azblob/client/spec.go +++ /dev/null @@ -1,71 +0,0 @@ -package client - -import ( - "fmt" - "time" - - "github.com/cloudquery/filetypes/v4" - "github.com/cloudquery/plugin-sdk/v4/configtype" -) - -type Spec struct { - StorageAccount string `json:"storage_account,omitempty"` - Container string `json:"container,omitempty"` - Path string `json:"path,omitempty"` - NoRotate bool `json:"no_rotate,omitempty"` - *filetypes.FileSpec - - BatchSize *int64 `json:"batch_size"` - BatchSizeBytes *int64 `json:"batch_size_bytes"` - BatchTimeout *configtype.Duration `json:"batch_timeout"` -} - -func (s *Spec) SetDefaults() { - if s.BatchSize == nil { - if s.NoRotate { - s.BatchSize = int64ptr(0) - } else { - s.BatchSize = int64ptr(10000) - } - } - if s.BatchSizeBytes == nil { - if s.NoRotate { - s.BatchSizeBytes = int64ptr(0) - } else { - s.BatchSizeBytes = int64ptr(50 * 1024 * 1024) // 50 MiB - } - } - if s.BatchTimeout == nil { - if s.NoRotate { - d := configtype.NewDuration(0) - s.BatchTimeout = &d - } else { - d := configtype.NewDuration(30 * time.Second) - s.BatchTimeout = &d - } - } -} - -func (s *Spec) Validate() error { - if s.StorageAccount == "" { - return fmt.Errorf("`storage_account` is required") - } - if s.Container == "" { - return fmt.Errorf("`container` is required") - } - if s.Path == "" { - return fmt.Errorf("`path` is required") - } - if s.Format == "" { - return fmt.Errorf("`format` is required") - } - if s.NoRotate && ((s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0)) { - return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`") - } - - return nil -} - -func int64ptr(i int64) *int64 { - return &i -} diff --git a/plugins/destination/azblob/client/spec/gen/main.go b/plugins/destination/azblob/client/spec/gen/main.go new file mode 100644 index 00000000000000..51933b75593bd4 --- /dev/null +++ b/plugins/destination/azblob/client/spec/gen/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec" + "github.com/cloudquery/codegen/jsonschema" + "github.com/cloudquery/filetypes/v4" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + append(filetypes.FileSpec{}.JSONSchemaOptions(), + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec", path.Join(currDir(), "..")), + jsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), + )..., + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/azblob/client/spec/schema.go b/plugins/destination/azblob/client/spec/schema.go new file mode 100644 index 00000000000000..4d029a8f32e9b7 --- /dev/null +++ b/plugins/destination/azblob/client/spec/schema.go @@ -0,0 +1,48 @@ +package spec + +import ( + _ "embed" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" +) + +func (s Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + s.FileSpec.JSONSchemaExtend(sc) // need to call manually + + batchTimeout := sc.Properties.Value("batch_timeout").OneOf[0] // 0 - val, 1 - null + batchTimeout.Default = "30s" + + // no_rotate:true -> only nulls for batch options + noRotateNoBatch := &jsonschema.Schema{ + Title: "Disallow batching when using no_rotate", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + noRotate := *sc.Properties.Value("no_rotate") + noRotate.Default = nil + noRotate.Const = true + noRotate.Description = "" + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("no_rotate", &noRotate) + return properties + }(), + Required: []string{"no_rotate"}, + }, + Then: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + // we make the non-zero requirement, so we want to allow only null here + null := &jsonschema.Schema{Type: "null"} + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("batch_size", null) + properties.Set("batch_size_bytes", null) + properties.Set("batch_timeout", null) + return properties + }(), + }, + } + + sc.AllOf = append(sc.AllOf, noRotateNoBatch) +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/azblob/client/spec/schema.json b/plugins/destination/azblob/client/spec/schema.json new file mode 100644 index 00000000000000..49d94aca60a70c --- /dev/null +++ b/plugins/destination/azblob/client/spec/schema.json @@ -0,0 +1,232 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "CSVSpec": { + "properties": { + "skip_header": { + "type": "boolean", + "description": "Specifies if the first line of a file should be the header.", + "default": false + }, + "delimiter": { + "type": "string", + "pattern": "^.$", + "description": "Character that will be used as the delimiter.", + "default": "," + } + }, + "additionalProperties": false, + "type": "object", + "description": "CloudQuery CSV file output spec." + }, + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "JSONSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery JSON file output spec." + }, + "ParquetSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery Parquet file output spec." + }, + "Spec": { + "allOf": [ + { + "if": { + "properties": { + "no_rotate": { + "type": "boolean", + "const": true + } + }, + "required": [ + "no_rotate" + ] + }, + "then": { + "properties": { + "batch_size": { + "type": "null" + }, + "batch_size_bytes": { + "type": "null" + }, + "batch_timeout": { + "type": "null" + } + } + }, + "title": "Disallow batching when using no_rotate" + } + ], + "oneOf": [ + { + "properties": { + "format": { + "type": "string", + "const": "csv" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "json" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/JSONSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "parquet" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/ParquetSpec" + }, + { + "type": "null" + } + ] + } + } + } + ], + "properties": { + "format": { + "type": "string", + "enum": [ + "csv", + "json", + "parquet" + ], + "description": "Output format." + }, + "format_spec": { + "oneOf": [ + { + "anyOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "$ref": "#/$defs/JSONSpec" + }, + { + "$ref": "#/$defs/ParquetSpec" + } + ] + }, + { + "type": "null" + } + ] + }, + "compression": { + "type": "string", + "enum": [ + "", + "gzip" + ], + "description": "Compression type.\nEmpty or missing stands for no compression." + }, + "storage_account": { + "type": "string", + "minLength": 1, + "description": "Storage account where to sync the files." + }, + "container": { + "type": "string", + "minLength": 1, + "description": "Storage container inside the storage account where to sync the files." + }, + "path": { + "type": "string", + "minLength": 1, + "description": "Path to where the files will be uploaded in the storage container." + }, + "no_rotate": { + "type": "boolean", + "description": "If set to `true`, the plugin will write to one file per table.\nOtherwise, for every batch a new file will be created with a different `.\u003cUUID\u003e` suffix.", + "default": false + }, + "batch_size": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "This parameter controls the maximum amount of items may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "default": 10000 + }, + { + "type": "null" + } + ] + }, + "batch_size_bytes": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "This parameter controls the maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "default": 52428800 + }, + { + "type": "null" + } + ] + }, + "batch_timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "This parameter controls the maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "default": "30s" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "format", + "storage_account", + "container", + "path" + ] + } + } +} diff --git a/plugins/destination/azblob/client/spec/schema_test.go b/plugins/destination/azblob/client/spec/schema_test.go new file mode 100644 index 00000000000000..6123d6deac09d1 --- /dev/null +++ b/plugins/destination/azblob/client/spec/schema_test.go @@ -0,0 +1,220 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpecJSONSchema(t *testing.T) { + // cases about embedded filetypes.FileSpec are tested in the corresponding package + // However, we add some tests to verify that it actually is properly working + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "csv file spec", + Spec: `{ + "format": "csv", + "format_spec": { + "skip_header": true, + "delimiter": "#" + }, + "path": "abc", + "storage_account": "sa", + "container": "c" +}`, + }, + { + Name: "bad format value", // also a part of embedded FileSpec testing + Spec: `{"format": "cs22v", "path": "abc"}`, + Err: true, + }, + { + Name: "minimal", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c"}`, + }, + { + Name: "missing path", + Spec: `{"format": "csv", "storage_account": "sa", "container": "c"}`, + Err: true, + }, + { + Name: "empty path", + Spec: `{"format": "csv", "path": "", "storage_account": "sa", "container": "c"}`, + Err: true, + }, + { + Name: "null path", + Spec: `{"format": "csv", "path": null, "storage_account": "sa", "container": "c"}`, + Err: true, + }, + { + Name: "integer path", + Spec: `{"format": "csv", "path": 123, "storage_account": "sa", "container": "c"}`, + Err: true, + }, + { + Name: "missing storage_account", + Spec: `{"format": "csv", "path": "abc", "container": "c"}`, + Err: true, + }, + { + Name: "empty storage_account", + Spec: `{"format": "csv", "path": "abc", "storage_account": "", "container": "c"}`, + Err: true, + }, + { + Name: "null storage_account", + Spec: `{"format": "csv", "path": "abc", "storage_account": null, "container": "c"}`, + Err: true, + }, + { + Name: "integer storage_account", + Spec: `{"format": "csv", "path": "abc", "storage_account": 123, "container": "c"}`, + Err: true, + }, + { + Name: "missing container", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa"}`, + Err: true, + }, + { + Name: "empty container", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": ""}`, + Err: true, + }, + { + Name: "null container", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": null}`, + Err: true, + }, + { + Name: "integer container", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": 123}`, + Err: true, + }, + + { + Name: "null no_rotate", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate": null}`, + Err: true, + }, + { + Name: "bad no_rotate", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate": 123}`, + Err: true, + }, + { + Name: "no_rotate:true", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate": true}`, + }, + { + Name: "no_rotate:false", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate": false}`, + }, + { + Name: "zero batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size":0}`, + }, + { + Name: "float batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size":5.3}`, + }, + { + Name: "bad batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size":false}`, + }, + { + Name: "null batch_size", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size":null}`, + }, + { + Name: "proper batch_size", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size":123}`, + }, + { + Name: "zero batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size_bytes":0}`, + }, + { + Name: "float batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size_bytes":5.3}`, + }, + { + Name: "bad batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size_bytes":false}`, + }, + { + Name: "null batch_size_bytes", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size_bytes":null}`, + }, + { + Name: "proper batch_size_bytes", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_size_bytes":123}`, + }, + // configtype.Duration is tested in plugin-sdk + // test only null here + { + Name: "null batch_timeout", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "batch_timeout":null}`, + }, + + // no_rotate + batching + { + Name: "no_rotate:false & batch_size:100", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_size":100}`, + }, + { + Name: "no_rotate:true & batch_size:100", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_size":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_size":null}`, + }, + { + Name: "no_rotate:true & batch_size:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_size":null}`, + }, + { + Name: "no_rotate:false & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_size_bytes":100}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_size_bytes":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:false & batch_timeout:100s", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_timeout":"100s"}`, + }, + { + Name: "no_rotate:true & batch_timeout:100s", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_timeout":"100s"}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_timeout:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":false, "batch_timeout":null}`, + }, + { + Name: "no_rotate:true & batch_timeout:null", + Spec: `{"format": "csv", "path": "abc", "storage_account": "sa", "container": "c", "no_rotate":true, "batch_timeout":null}`, + }, + }) +} diff --git a/plugins/destination/azblob/client/spec/spec.go b/plugins/destination/azblob/client/spec/spec.go new file mode 100644 index 00000000000000..d524eba3fd9ed8 --- /dev/null +++ b/plugins/destination/azblob/client/spec/spec.go @@ -0,0 +1,96 @@ +package spec + +import ( + "fmt" + "time" + + "github.com/cloudquery/filetypes/v4" + "github.com/cloudquery/plugin-sdk/v4/configtype" +) + +type Spec struct { + filetypes.FileSpec + + // Storage account where to sync the files. + StorageAccount string `json:"storage_account,omitempty" jsonschema:"required,minLength=1"` + + // Storage container inside the storage account where to sync the files. + Container string `json:"container,omitempty" jsonschema:"required,minLength=1"` + + // Path to where the files will be uploaded in the storage container. + Path string `json:"path,omitempty" jsonschema:"required,minLength=1"` + + // If set to `true`, the plugin will write to one file per table. + // Otherwise, for every batch a new file will be created with a different `.` suffix. + NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` + + // This parameter controls the maximum amount of items may be grouped together to be written in a single object. + // + // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). + BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` + + // This parameter controls the maximum size of items that may be grouped together to be written in a single object. + // + // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). + BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` + + // This parameter controls the maximum interval between batch writes. + // + // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). + BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` +} + +func (s *Spec) SetDefaults() { + if s.BatchSize == nil { + if s.NoRotate { + s.BatchSize = int64ptr(0) + } else { + s.BatchSize = int64ptr(10000) + } + } + if s.BatchSizeBytes == nil { + if s.NoRotate { + s.BatchSizeBytes = int64ptr(0) + } else { + s.BatchSizeBytes = int64ptr(50 * 1024 * 1024) // 50 MiB + } + } + if s.BatchTimeout == nil { + if s.NoRotate { + d := configtype.NewDuration(0) + s.BatchTimeout = &d + } else { + d := configtype.NewDuration(30 * time.Second) + s.BatchTimeout = &d + } + } +} + +func (s *Spec) Validate() error { + if len(s.StorageAccount) == 0 { + return fmt.Errorf("`storage_account` is required") + } + if len(s.Container) == 0 { + return fmt.Errorf("`container` is required") + } + if len(s.Path) == 0 { + return fmt.Errorf("`path` is required") + } + + if s.NoRotate && ((s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0)) { + return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout`") + } + + // required for s.FileSpec.Validate call + err := s.FileSpec.UnmarshalSpec() + if err != nil { + return err + } + s.FileSpec.SetDefaults() + + return s.FileSpec.Validate() +} + +func int64ptr(i int64) *int64 { + return &i +} diff --git a/plugins/destination/azblob/client/spec/spec_test.go b/plugins/destination/azblob/client/spec/spec_test.go new file mode 100644 index 00000000000000..25e6343b9c4807 --- /dev/null +++ b/plugins/destination/azblob/client/spec/spec_test.go @@ -0,0 +1,74 @@ +package spec + +import ( + "fmt" + "testing" + "time" + + "github.com/cloudquery/filetypes/v4" + "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" +) + +const ( + storageAccount = "cqdestinationazblob" + container = "test" +) + +func TestSpec_SetDefaults(t *testing.T) { + dur0, dur30 := configtype.NewDuration(0), configtype.NewDuration(30*time.Second) + + cases := []struct { + Give Spec + Want Spec + }{ + + { + Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}}, + Want: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, + }, + { + Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true}, + Want: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, BatchSize: int64Ptr(0), BatchSizeBytes: int64Ptr(0), BatchTimeout: &dur0}, + }, + } + for _, tc := range cases { + got := tc.Give + got.SetDefaults() + if diff := cmp.Diff(tc.Want, got, cmpopts.IgnoreUnexported(filetypes.FileSpec{}, configtype.Duration{})); diff != "" { + t.Errorf("SetDefaults() mismatch (-want +got):\n%s", diff) + } + require.Equal(t, tc.Want.BatchTimeout, got.BatchTimeout) + } +} + +func TestSpec_Validate(t *testing.T) { + zero, one, dur0 := int64(0), int64(1), configtype.NewDuration(0) + cases := []struct { + Give Spec + WantErr bool + }{ + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, StorageAccount: storageAccount, Container: container, BatchSize: &zero, BatchSizeBytes: &zero}, WantErr: false}, + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, Container: container, BatchSize: &zero, BatchSizeBytes: &zero}, WantErr: true}, // no StorageAccount + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: false, StorageAccount: storageAccount, Container: container, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, StorageAccount: storageAccount, Container: container, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, StorageAccount: storageAccount, Container: container, BatchSize: &one, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, + } + for i, tc := range cases { + tc := tc + t.Run(fmt.Sprintf("Case %d", i+1), func(t *testing.T) { + err := tc.Give.Validate() + if tc.WantErr { + require.Error(t, err) + } else { + require.NoError(t, err) + } + }) + } +} + +func int64Ptr(i int64) *int64 { + return &i +} diff --git a/plugins/destination/azblob/client/spec_test.go b/plugins/destination/azblob/client/spec_test.go deleted file mode 100644 index 9875fbc77f7535..00000000000000 --- a/plugins/destination/azblob/client/spec_test.go +++ /dev/null @@ -1,69 +0,0 @@ -package client - -import ( - "fmt" - "testing" - "time" - - "github.com/cloudquery/filetypes/v4" - "github.com/cloudquery/plugin-sdk/v4/configtype" - "github.com/google/go-cmp/cmp" - "github.com/google/go-cmp/cmp/cmpopts" - "github.com/stretchr/testify/require" -) - -func TestSpec_SetDefaults(t *testing.T) { - dur0, dur30 := configtype.NewDuration(0), configtype.NewDuration(30*time.Second) - - cases := []struct { - Give Spec - Want Spec - }{ - - { - Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}}, - Want: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, - }, - { - Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true}, - Want: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, BatchSize: int64Ptr(0), BatchSizeBytes: int64Ptr(0), BatchTimeout: &dur0}, - }, - } - for _, tc := range cases { - got := tc.Give - got.SetDefaults() - if diff := cmp.Diff(tc.Want, got, cmpopts.IgnoreUnexported(filetypes.FileSpec{}, configtype.Duration{})); diff != "" { - t.Errorf("SetDefaults() mismatch (-want +got):\n%s", diff) - } - require.Equal(t, tc.Want.BatchTimeout, got.BatchTimeout) - } -} - -func TestSpec_Validate(t *testing.T) { - zero, one, dur0 := int64(0), int64(1), configtype.NewDuration(0) - cases := []struct { - Give Spec - WantErr bool - }{ - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, StorageAccount: storage_account, Container: container, BatchSize: &zero, BatchSizeBytes: &zero}, WantErr: false}, - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, Container: container, BatchSize: &zero, BatchSizeBytes: &zero}, WantErr: true}, // no StorageAccount - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: false, StorageAccount: storage_account, Container: container, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, StorageAccount: storage_account, Container: container, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, StorageAccount: storage_account, Container: container, BatchSize: &one, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, - } - for i, tc := range cases { - tc := tc - t.Run(fmt.Sprintf("Case %d", i+1), func(t *testing.T) { - err := tc.Give.Validate() - if tc.WantErr { - require.Error(t, err) - } else { - require.NoError(t, err) - } - }) - } -} - -func int64Ptr(i int64) *int64 { - return &i -} diff --git a/plugins/destination/azblob/client/write.go b/plugins/destination/azblob/client/write.go index e9f3eda3a21b9f..f20b99325e937e 100644 --- a/plugins/destination/azblob/client/write.go +++ b/plugins/destination/azblob/client/write.go @@ -18,9 +18,9 @@ func (c *Client) WriteTable(ctx context.Context, msgs <-chan *message.WriteInser if s == nil { table := msg.GetTable() - name := fmt.Sprintf("%s/%s.%s%s.%s", c.spec.Path, table.Name, c.spec.Format, c.spec.FileSpec.Compression.Extension(), uuid.NewString()) - if c.spec.NoRotate { - name = fmt.Sprintf("%s/%s.%s%s", c.spec.Path, table.Name, c.spec.Format, c.spec.FileSpec.Compression.Extension()) + name := fmt.Sprintf("%s/%s.%s%s", c.spec.Path, table.Name, c.spec.Format, c.spec.FileSpec.Compression.Extension()) + if !c.spec.NoRotate { + name += "." + uuid.NewString() } var err error diff --git a/plugins/destination/azblob/docs/overview.md b/plugins/destination/azblob/docs/overview.md index 44625d36f4e547..b12d1d0ec9f4f4 100644 --- a/plugins/destination/azblob/docs/overview.md +++ b/plugins/destination/azblob/docs/overview.md @@ -40,6 +40,11 @@ This is the (nested) spec used by the Azure blob destination Plugin. Path to where the files will be uploaded in the above bucket. +- `no_rotate` (`boolean`) (optional) (default: `false`) + + If set to `true`, the plugin will write to one file per table. + Otherwise, for every batch a new file will be created with a different `.` suffix. + - `format` (`string`) (required) Format of the output file. Supported values are `csv`, `json` and `parquet`. From 9eaedb7d6a675f19ec7b17b00ae529d09118e1f6 Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Thu, 1 Feb 2024 09:17:12 -0600 Subject: [PATCH 07/78] chore(ci): Update table diff (#16415) #### Summary This creates a special case where it will only log a message that says that all PKs have been replaced with `_cq_id` for a specific table... --- scripts/table_diff/changes/changes.go | 30 ++++++++++++++----- scripts/table_diff/changes/changes_test.go | 10 +++++++ .../changes/testdata/pr_100644_diff.txt | 29 ++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 scripts/table_diff/changes/testdata/pr_100644_diff.txt diff --git a/scripts/table_diff/changes/changes.go b/scripts/table_diff/changes/changes.go index d6a27452befe28..c10156b0d1a313 100644 --- a/scripts/table_diff/changes/changes.go +++ b/scripts/table_diff/changes/changes.go @@ -15,6 +15,9 @@ import ( var ( columnRegex = regexp.MustCompile(`^\|(?P.*)\|(?P.*)\|`) pkRegex = regexp.MustCompile(`^The composite primary key for this table is \(([^)]+)\)\.`) + + // There is a different message for single PKs + singlePKRegex = regexp.MustCompile(`^The primary key for this table is ([^)]+)\.`) ) type change struct { @@ -75,12 +78,17 @@ func parseColumnChange(line string) (name string, col column) { } func parsePKChange(line string) (names []string) { - match := pkRegex.FindStringSubmatch(line) - if len(match) != 2 { - return nil + matchMulti := pkRegex.FindStringSubmatch(line) + matchSingle := singlePKRegex.FindStringSubmatch(line) + if len(matchMulti) == 2 { + for _, part := range strings.Split(matchMulti[1], ", ") { + names = append(names, strings.Trim(part, "*")) + } } - for _, part := range strings.Split(match[1], ", ") { - names = append(names, strings.Trim(part, "*")) + if len(matchSingle) == 2 { + for _, part := range strings.Split(matchSingle[1], ", ") { + names = append(names, strings.Trim(part, "*")) + } } return } @@ -141,14 +149,14 @@ func getColumnChanges(file *gitdiff.File, table string) (changes []change) { continue } - if added.pk() && !deleted.pk() { + if added.pk() && !deleted.pk() && !(len(addedPK) == 1 && addedPK[0] == "_cq_id" && len(deletedPK) > 0) { changes = append(changes, change{ Text: fmt.Sprintf("Table %s: primary key constraint added to column %s", backtickStrings(table, name)...), Breaking: true, }) } - if !added.pk() && deleted.pk() { + if !added.pk() && deleted.pk() && !(len(addedPK) == 1 && addedPK[0] == "_cq_id" && len(deletedPK) > 0) { changes = append(changes, change{ Text: fmt.Sprintf("Table %s: primary key constraint removed from column %s", backtickStrings(table, name)...), Breaking: true, @@ -216,6 +224,14 @@ func getColumnChanges(file *gitdiff.File, table string) (changes []change) { return chI.Text < chJ.Text } }) + + if len(addedPK) == 1 && addedPK[0] == "_cq_id" && len(deletedPK) > 0 { + changes = append(changes, change{ + Text: fmt.Sprintf("Table %s: all existing primary key constraints have been removed and a primary key new constraint has been added to `_cq_id`", backtickStrings(table)...), + Breaking: true, + }) + } + return changes } diff --git a/scripts/table_diff/changes/changes_test.go b/scripts/table_diff/changes/changes_test.go index 671ba1f13245cc..43ec5cc34d2e60 100644 --- a/scripts/table_diff/changes/changes_test.go +++ b/scripts/table_diff/changes/changes_test.go @@ -261,6 +261,16 @@ func Test_getChanges(t *testing.T) { }, }, }, + { + name: "Special Case - don't report removal of pks, only end state", + diffDataFile: "testdata/pr_100644_diff.txt", + wantChanges: []change{ + { + Text: "Table `aws_accessanalyzer_analyzers`: all existing primary key constraints have been removed and a primary key new constraint has been added to `_cq_id`", + Breaking: true, + }, + }, + }, { name: "Should handle no backticks -> backticks", diffDataFile: "testdata/pr_11034_diff.txt", diff --git a/scripts/table_diff/changes/testdata/pr_100644_diff.txt b/scripts/table_diff/changes/testdata/pr_100644_diff.txt new file mode 100644 index 00000000000000..0d62436d7b2064 --- /dev/null +++ b/scripts/table_diff/changes/testdata/pr_100644_diff.txt @@ -0,0 +1,29 @@ +diff --git a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md +index 76569347f50fb9..88070ce42a78d0 100644 +--- a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md ++++ b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md +@@ -4,8 +4,8 @@ This table shows data for AWS Identity and Access Management (IAM) Access Analyz + + https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_AnalyzerSummary.html + +-The primary key for this table is **arn**. +- ++The primary key for this table is **_cq_id**. ++The following field is used to calculate the value of `_cq_id`: **arn**. + ## Relations + + The following tables depend on aws_accessanalyzer_analyzers: +@@ -16,11 +16,11 @@ The following tables depend on aws_accessanalyzer_analyzers: + + | Name | Type | + | ------------- | ------------- | +-|_cq_id|`uuid`| ++|_cq_id (PK)|`uuid`| + |_cq_parent_id|`uuid`| + |account_id|`utf8`| + |region|`utf8`| +-|arn (PK)|`utf8`| ++|arn|`utf8`| + |created_at|`timestamp[us, tz=UTC]`| + |name|`utf8`| + |status|`utf8`| From cd09032ea1f03ce1aefe8ff5c6b96231236018f5 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:31:01 -0800 Subject: [PATCH 08/78] feat: Add JSON schema to mssql destination plugin (#16438) Closes https://github.com/cloudquery/cloudquery/issues/16434 --- .github/workflows/dest_mssql.yml | 6 + plugins/destination/mssql/Makefile | 8 + plugins/destination/mssql/client/schema.json | 64 ++++++++ plugins/destination/mssql/client/spec.go | 49 ++++-- .../destination/mssql/client/spec/gen/main.go | 26 +++ plugins/destination/mssql/client/spec_test.go | 93 +++++++++++ .../destination/mssql/docs/configuration.md | 15 +- plugins/destination/mssql/go.mod | 68 +++++--- plugins/destination/mssql/go.sum | 152 +++++++++++++----- plugins/destination/mssql/main.go | 6 +- 10 files changed, 410 insertions(+), 77 deletions(-) create mode 100644 plugins/destination/mssql/client/schema.json create mode 100644 plugins/destination/mssql/client/spec/gen/main.go create mode 100644 plugins/destination/mssql/client/spec_test.go diff --git a/.github/workflows/dest_mssql.yml b/.github/workflows/dest_mssql.yml index 897d1d7b4c856c..619b120cfa04c9 100644 --- a/.github/workflows/dest_mssql.yml +++ b/.github/workflows/dest_mssql.yml @@ -70,6 +70,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - run: go mod tidy - name: Build run: go build . diff --git a/plugins/destination/mssql/Makefile b/plugins/destination/mssql/Makefile index c957b06653ed16..a803c132c3b248 100644 --- a/plugins/destination/mssql/Makefile +++ b/plugins/destination/mssql/Makefile @@ -7,3 +7,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/mssql/client/schema.json b/plugins/destination/mssql/client/schema.json new file mode 100644 index 00000000000000..2c644811062a3f --- /dev/null +++ b/plugins/destination/mssql/client/schema.json @@ -0,0 +1,64 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/mssql/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "Spec": { + "properties": { + "connection_string": { + "type": "string", + "minLength": 1, + "description": "Connection string to connect to the database.\nSee [SDK documentation](https://github.com/microsoft/go-mssqldb#connection-parameters-and-dsn) for details." + }, + "auth_mode": { + "type": "string", + "enum": [ + "azure", + "ms" + ], + "description": "If you need to authenticate via Azure Active Directory ensure you specify `azure` value.\n See [SDK documentation](https://github.com/microsoft/go-mssqldb#azure-active-directory-authentication) for more information.\n Supported values:\n\n - `ms` _connect to Microsoft SQL Server instance_\n - `azure` _connect to Azure SQL Server instance_", + "default": "ms" + }, + "schema": { + "type": "string", + "description": "By default, Microsoft SQL Server destination plugin will use the [default](https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/ownership-and-user-schema-separation?view=sql-server-ver16#the-dbo-schema) schema named `dbo`.", + "default": "dbo" + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "default": 1000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Maximum size of items that may be grouped together to be written in a single write.", + "default": 5242880 + }, + "batch_timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "Timeout for writing a single batch.", + "default": "20s" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "connection_string" + ] + } + } +} diff --git a/plugins/destination/mssql/client/spec.go b/plugins/destination/mssql/client/spec.go index 5d3b799b4e7695..0b239c1700fc9b 100644 --- a/plugins/destination/mssql/client/spec.go +++ b/plugins/destination/mssql/client/spec.go @@ -1,11 +1,13 @@ package client import ( + _ "embed" "errors" "strings" "time" "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/invopop/jsonschema" mssql "github.com/microsoft/go-mssqldb" "github.com/microsoft/go-mssqldb/azuread" ) @@ -13,20 +15,39 @@ import ( type AuthMode string const ( - AuthModeAzure = "azure" - AuthModeMS = "ms" + AuthModeAzure = AuthMode("azure") + AuthModeMS = AuthMode("ms") ) type Spec struct { - ConnectionString string `json:"connection_string,omitempty"` - AuthMode AuthMode `json:"auth_mode,omitempty"` - Schema string `json:"schema,omitempty"` + // Connection string to connect to the database. + // See [SDK documentation](https://github.com/microsoft/go-mssqldb#connection-parameters-and-dsn) for details. + ConnectionString string `json:"connection_string" jsonschema:"required,minLength=1"` - BatchSize int `json:"batch_size,omitempty"` - BatchSizeBytes int `json:"batch_size_bytes,omitempty"` - BatchTimeout *configtype.Duration `json:"batch_timeout,omitempty"` + // If you need to authenticate via Azure Active Directory ensure you specify `azure` value. + // See [SDK documentation](https://github.com/microsoft/go-mssqldb#azure-active-directory-authentication) for more information. + // Supported values: + // + // - `ms` _connect to Microsoft SQL Server instance_ + // - `azure` _connect to Azure SQL Server instance_ + AuthMode AuthMode `json:"auth_mode,omitempty" jsonschema:"default=ms"` + + // By default, Microsoft SQL Server destination plugin will use the [default](https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/ownership-and-user-schema-separation?view=sql-server-ver16#the-dbo-schema) schema named `dbo`. + Schema string `json:"schema,omitempty" jsonschema:"default=dbo"` + + // Maximum amount of items that may be grouped together to be written in a single write. + BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` + + // Maximum size of items that may be grouped together to be written in a single write. + BatchSizeBytes int `json:"batch_size_bytes,omitempty" jsonschema:"minimum=1,default=5242880"` + + // Timeout for writing a single batch. + BatchTimeout *configtype.Duration `json:"batch_timeout,omitempty"` } +//go:embed schema.json +var JSONSchema string + func (s *Spec) Validate() error { if len(s.ConnectionString) == 0 { return errors.New("missing required \"connection_string\" option") @@ -59,8 +80,18 @@ func (s *Spec) SetDefaults() { } func (s *Spec) Connector() (*mssql.Connector, error) { - if strings.EqualFold(string(s.AuthMode), AuthModeAzure) { + if strings.EqualFold(string(s.AuthMode), string(AuthModeAzure)) { return azuread.NewConnector(s.ConnectionString) } return mssql.NewConnector(s.ConnectionString) } + +func (AuthMode) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = []any{AuthModeAzure, AuthModeMS} +} + +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + batchTimeout := sc.Properties.Value("batch_timeout").OneOf[0] // 0 - val, 1 - null + batchTimeout.Default = "20s" +} diff --git a/plugins/destination/mssql/client/spec/gen/main.go b/plugins/destination/mssql/client/spec/gen/main.go new file mode 100644 index 00000000000000..2fe4a79fafc5da --- /dev/null +++ b/plugins/destination/mssql/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/mssql/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/mssql/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/mssql/client/spec_test.go b/plugins/destination/mssql/client/spec_test.go new file mode 100644 index 00000000000000..e068a2c2a7bb2d --- /dev/null +++ b/plugins/destination/mssql/client/spec_test.go @@ -0,0 +1,93 @@ +package client_test + +import ( + "testing" + + "github.com/cloudquery/cloudquery/plugins/destination/mssql/client" + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, client.JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with connection_string", + Spec: `{"connection_string": "conn"}`, + }, + { + Name: "spec with connection_string and schema", + Spec: `{"connection_string": "conn", "schema":"foo"}`, + }, + { + Name: "spec with connection_string and auth_mode azure", + Spec: `{"connection_string": "conn", "auth_mode":"azure"}`, + }, + { + Name: "spec with connection_string and auth_mode ms", + Spec: `{"connection_string": "conn", "auth_mode":"ms"}`, + }, + { + Name: "spec with connection_string and empty auth_mode", + Spec: `{"connection_string": "conn", "auth_mode":""}`, + Err: true, + }, + { + Name: "spec with connection_string and invalid auth_mode", + Spec: `{"connection_string": "conn", "auth_mode":"invalid"}`, + Err: true, + }, + { + Name: "spec with bool connection_string", + Spec: `{"connection_string": true}`, + Err: true, + }, + { + Name: "spec with null connection_string", + Spec: `{"connection_string": null}`, + Err: true, + }, + { + Name: "spec with int connection_string", + Spec: `{"connection_string": 123}`, + Err: true, + }, + { + Name: "spec with bool batch_size", + Spec: `{"connection_string": "abc", "batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"connection_string": "abc", "batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"connection_string": "abc", "batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"connection_string": "abc", "batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with proper batch_size", + Spec: `{"connection_string": "abc", "batch_size":7}`, + }, + { + Name: "spec with bool batch_timeout", + Spec: `{"connection_string": "abc", "batch_timeout":true}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"connection_string": "abc", "unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/mssql/docs/configuration.md b/plugins/destination/mssql/docs/configuration.md index 86e55d72a6ec51..a886046dc0b9e1 100644 --- a/plugins/destination/mssql/docs/configuration.md +++ b/plugins/destination/mssql/docs/configuration.md @@ -19,13 +19,12 @@ This is the (nested) spec used by the Microsoft SQL Server destination plugin. - `connection_string` (`string`) (required) Connection string to connect to the database. - See [SDK documentation](https://github.com/microsoft/go-mssqldb#connection-parameters-and-dsn) for more details. + See [SDK documentation](https://github.com/microsoft/go-mssqldb#connection-parameters-and-dsn) for details. - `auth_mode` (`string`) (optional) (default: `ms`) If you need to authenticate via Azure Active Directory ensure you specify `azure` value. - See [SDK documentation](https://github.com/microsoft/go-mssqldb#azure-active-directory-authentication) for more - information. + See [SDK documentation](https://github.com/microsoft/go-mssqldb#azure-active-directory-authentication) for more information. Supported values: - `ms` _connect to Microsoft SQL Server instance_ @@ -34,21 +33,19 @@ This is the (nested) spec used by the Microsoft SQL Server destination plugin. - `schema` (`string`) (optional) (default: `dbo`) Schema name to be used. - By default, Microsoft SQL Server destination plugin will use the - [default](https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/ownership-and-user-schema-separation?view=sql-server-ver16#the-dbo-schema) - schema named `dbo`. + By default, Microsoft SQL Server destination plugin will use the [default](https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/ownership-and-user-schema-separation?view=sql-server-ver16#the-dbo-schema) schema named `dbo`. - `batch_size` (`integer`) (optional) (default: `1000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum amount of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `5242880` (= 5 MiB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. - `batch_timeout` (`duration`) (optional) (default: `20s` (= 20 seconds)) - This parameter controls the timeout for writing a single batch. + Timeout for writing a single batch. ### Verbose logging for debug diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index 08be940deec742..465dc82d1315a3 100644 --- a/plugins/destination/mssql/go.mod +++ b/plugins/destination/mssql/go.mod @@ -1,31 +1,51 @@ module github.com/cloudquery/cloudquery/plugins/destination/mssql -go 1.21.4 +go 1.21.6 require ( - github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/apache/arrow/go/v15 v15.0.0 + github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 - github.com/google/uuid v1.5.0 + github.com/google/uuid v1.6.0 github.com/microsoft/go-mssqldb v1.5.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 ) require ( + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet/v6 v6.2.0 // indirect + github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect - github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect + github.com/apache/arrow/go/v13 v13.0.0 // indirect + github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 // indirect + github.com/aws/smithy-go v1.19.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/buger/jsonparser v1.1.1 // indirect @@ -36,20 +56,24 @@ require ( github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect + github.com/danieljoos/wincred v1.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect + github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/flosch/pongo2/v4 v4.0.2 // indirect + github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/getsentry/sentry-go v0.24.1 // indirect + github.com/getsentry/sentry-go v0.26.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/gin-gonic/gin v1.9.1 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.16.0 // indirect + github.com/go-playground/validator/v10 v10.17.0 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/golang-jwt/jwt/v5 v5.2.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect @@ -59,10 +83,12 @@ require ( github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/gorilla/css v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect @@ -84,6 +110,7 @@ require ( github.com/microcosm-cc/bluemonday v1.0.26 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect @@ -92,7 +119,8 @@ require ( github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/schollz/closestmatch v2.1.0+incompatible // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/spf13/cobra v1.6.1 // indirect + github.com/snowflakedb/gosnowflake v1.7.2 // indirect + github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tdewolff/minify/v2 v2.20.16 // indirect github.com/tdewolff/parse/v2 v2.7.11 // indirect @@ -106,29 +134,33 @@ require ( github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/otel v1.20.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0 // indirect - go.opentelemetry.io/otel/metric v1.20.0 // indirect - go.opentelemetry.io/otel/sdk v1.20.0 // indirect - go.opentelemetry.io/otel/trace v1.20.0 // indirect - go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/arch v0.6.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/sdk v1.22.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect + go.opentelemetry.io/proto/otlp v1.1.0 // indirect + golang.org/x/arch v0.7.0 // indirect golang.org/x/crypto v0.18.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/grpc v1.60.1 // indirect + google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index 0c40f595f604c5..108f22f3ea8b63 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -1,3 +1,7 @@ +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= +github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= +github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA= @@ -7,6 +11,10 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMiv github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA= github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 h1:AMf7YbZOZIW5b66cXNHMWWT/zkjhz5+a+k/3x40EO7E= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1/go.mod h1:uwfk06ZBcvL/g4VHNjurPfVln9NMbsk2XIZxJ+hu81k= github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= @@ -16,6 +24,8 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4s github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= @@ -29,12 +39,52 @@ github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= -github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk= +github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= +github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= +github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= +github.com/apache/arrow/go/v15 v15.0.0 h1:1zZACWf85oEZY5/kd9dsQS7i+2G5zVQcbKTHgslqHNA= +github.com/apache/arrow/go/v15 v15.0.0/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= +github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= +github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo= +github.com/aws/aws-sdk-go-v2/config v1.26.6 h1:Z/7w9bUqlRI0FFQpetVuFYEsjzE3h7fpU6HuGmfPL/o= +github.com/aws/aws-sdk-go-v2/config v1.26.6/go.mod h1:uKU6cnDmYCvJ+pxO9S4cWDb2yWWIH5hra+32hVh1MI4= +github.com/aws/aws-sdk-go-v2/credentials v1.16.16 h1:8q6Rliyv0aUFAVtzaldUEcS+T5gbadPbWdV1WcAddK8= +github.com/aws/aws-sdk-go-v2/credentials v1.16.16/go.mod h1:UHVZrdUsv63hPXFo1H7c5fEneoVo9UXiz36QG1GEPi0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 h1:2MUXyGW6dVaQz6aqycpbdLIH1NMcUI6kW6vQ0RabGYg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15/go.mod h1:aHbhbR6WEQgHAiRj41EQ2W47yOYwNtIkWTXmcAtYqj8= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 h1:n3GDfwqF2tzEkXlv5cuy4iy7LpKDtqDMcNLfZDu9rls= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 h1:5oE2WzJE56/mVveuDZPJESKlg/00AaS2pY2QZcnxg4M= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10/go.mod h1:FHbKWQtRBYUz4vO5WBWjzMD2by126ny5y/1EoaWoLfI= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 h1:L0ai8WICYHozIKK+OtPzVJBugL7culcuM4E4JOpIEm8= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10/go.mod h1:byqfyxJBshFk0fF9YmK0M0ugIO8OWjzH2T3bPG4eGuA= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 h1:KOxnQeWy5sXyS37fdKEvAsGHOr9fa/qvwxfJurR/BzE= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10/go.mod h1:jMx5INQFYFYB3lQD9W0D8Ohgq6Wnl7NYOJ2TQndbulI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 h1:5XNlsBsEvBZBMO6p82y+sqpWg8j5aBCe+5C2GBFgqBQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 h1:eajuO3nykDPdYicLlP3AGgOyVN3MOlFmZv7WGTuJPow= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.7/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 h1:QPMJf+Jw8E1l7zqhZmMlFw6w1NmfkfiSK8mS4zOx3BA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7/go.mod h1:ykf3COxYI0UJmxcfcxcVuz7b6uADi1FkiUz6Eb7AgM8= +github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0= +github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= +github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= +github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= @@ -59,6 +109,12 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff h1:OzRo1Ig/TPtTV+2vA/NYqoEkjqJcE9RXuRVBX9GFeT0= +github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff/go.mod h1:l8Y52S40WT2c/gt7chA6LryeZO2/Ri/dgaFAVV0MBHE= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -66,7 +122,9 @@ github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNa github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= +github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -75,16 +133,20 @@ github.com/deepmap/oapi-codegen v1.16.2/go.mod h1:rdYoEA2GE+riuZ91DvpmBX9hJbQpuY github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= +github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/getsentry/sentry-go v0.24.1 h1:W6/0GyTy8J6ge6lVCc94WB6Gx2ZuLrgopnn9w8Hiwuk= -github.com/getsentry/sentry-go v0.24.1/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.26.0 h1:IX3++sF6/4B5JcevhdZfdKIHfyvMmAq/UnqcyT2H6mA= +github.com/getsentry/sentry-go v0.26.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -94,8 +156,8 @@ github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SU github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -104,12 +166,14 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE= -github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74= +github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= +github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= @@ -119,8 +183,6 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -137,8 +199,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -147,17 +209,16 @@ github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/ github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= +github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= +github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= @@ -168,6 +229,10 @@ github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nD github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -228,6 +293,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= +github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= @@ -260,13 +327,16 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/snowflakedb/gosnowflake v1.7.2 h1:HRSwva8YXC64WUppfmHcMNVVzSE1+EwXXaJxgS0EkTo= +github.com/snowflakedb/gosnowflake v1.7.2/go.mod h1:03tW856vc3ceM4rJuj7KO4dzqN7qoezTm+xw7aPIIFo= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= 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/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= 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 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -321,23 +391,23 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= -go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0 h1:CsBiKCiQPdSjS+MlRiqeTI9JDDpSuk0Hb6QTRfwer8k= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0/go.mod h1:CMJYNAfooOwSZSAmAeMUV1M+TXld3BiK++z9fqIm2xk= -go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= -go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= -go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= -go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= -go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= -go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= +go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= +go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= +go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= -golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= +golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -397,6 +467,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -429,8 +501,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1: google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= diff --git a/plugins/destination/mssql/main.go b/plugins/destination/mssql/main.go index 5b166a465e5241..161b1097f46a21 100644 --- a/plugins/destination/mssql/main.go +++ b/plugins/destination/mssql/main.go @@ -15,7 +15,11 @@ const ( ) func main() { - p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team)) + p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, + plugin.WithKind(internalPlugin.Kind), + plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), + ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server(), From 967e4a702a4aa360aa0706b990f63845e117a65b Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Thu, 1 Feb 2024 17:37:44 +0200 Subject: [PATCH 09/78] fix: Use JSON schema (#16441) --- plugins/destination/azblob/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/destination/azblob/main.go b/plugins/destination/azblob/main.go index 31a6ab652c76e4..fe6f461eb01843 100644 --- a/plugins/destination/azblob/main.go +++ b/plugins/destination/azblob/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/azblob/client" + "github.com/cloudquery/cloudquery/plugins/destination/azblob/client/spec" internalPlugin "github.com/cloudquery/cloudquery/plugins/destination/azblob/resources/plugin" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -18,6 +19,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(spec.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatalf("failed to serve plugin: %v", err) From 0afd88349f1cb65cfd47ad83e91bfe5c24ba121a Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Thu, 1 Feb 2024 17:46:18 +0200 Subject: [PATCH 10/78] feat: Add JSON schema to `gcs` destination plugin (#16439) Closes https://github.com/cloudquery/cloudquery/issues/16407 Basically, an adapted version of https://github.com/cloudquery/cloudquery/pull/16404 --- .github/workflows/dest_gcs.yml | 16 +- plugins/destination/gcs/Makefile | 10 + plugins/destination/gcs/client/client.go | 9 +- plugins/destination/gcs/client/client_test.go | 19 +- plugins/destination/gcs/client/spec.go | 68 ------ .../destination/gcs/client/spec/gen/main.go | 30 +++ plugins/destination/gcs/client/spec/schema.go | 48 ++++ .../destination/gcs/client/spec/schema.json | 226 ++++++++++++++++++ .../gcs/client/spec/schema_test.go | 199 +++++++++++++++ plugins/destination/gcs/client/spec/spec.go | 90 +++++++ plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/main.go | 6 +- 12 files changed, 634 insertions(+), 89 deletions(-) delete mode 100644 plugins/destination/gcs/client/spec.go create mode 100644 plugins/destination/gcs/client/spec/gen/main.go create mode 100644 plugins/destination/gcs/client/spec/schema.go create mode 100644 plugins/destination/gcs/client/spec/schema.json create mode 100644 plugins/destination/gcs/client/spec/schema_test.go create mode 100644 plugins/destination/gcs/client/spec/spec.go diff --git a/.github/workflows/dest_gcs.yml b/.github/workflows/dest_gcs.yml index ede1553c99b253..629466fe07f322 100644 --- a/.github/workflows/dest_gcs.yml +++ b/.github/workflows/dest_gcs.yml @@ -31,11 +31,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 2 - - name: Authenticate to Google Cloud - uses: 'google-github-actions/auth@v1' - with: - workload_identity_provider: 'projects/151868820337/locations/global/workloadIdentityPools/integration-test-pool/providers/integration-test-provider' - service_account: 'integration-service-account@cq-integration-tests.iam.gserviceaccount.com' - name: Set up Go 1.x uses: actions/setup-go@v4 with: @@ -50,6 +45,17 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) + - name: Authenticate to Google Cloud + uses: 'google-github-actions/auth@v1' + with: + workload_identity_provider: 'projects/151868820337/locations/global/workloadIdentityPools/integration-test-pool/providers/integration-test-provider' + service_account: 'integration-service-account@cq-integration-tests.iam.gserviceaccount.com' - name: Build run: go build . - name: Test file plugin diff --git a/plugins/destination/gcs/Makefile b/plugins/destination/gcs/Makefile index f9ab6c2eac145b..0693013f2cba0d 100644 --- a/plugins/destination/gcs/Makefile +++ b/plugins/destination/gcs/Makefile @@ -5,3 +5,13 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + # required for loading comments from filetypes + go mod vendor + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/gcs/client/client.go b/plugins/destination/gcs/client/client.go index 1265df2c751daf..84cc24ec0b41f0 100644 --- a/plugins/destination/gcs/client/client.go +++ b/plugins/destination/gcs/client/client.go @@ -6,6 +6,7 @@ import ( "fmt" "cloud.google.com/go/storage" + "github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/writers/streamingbatchwriter" @@ -21,7 +22,7 @@ type Client struct { streamingbatchwriter.UnimplementedDeleteRecords logger zerolog.Logger - spec *Spec + spec *spec.Spec gcsClient *storage.Client bucket *storage.BucketHandle @@ -30,12 +31,12 @@ type Client struct { writer *streamingbatchwriter.StreamingBatchWriter } -func New(ctx context.Context, logger zerolog.Logger, spec []byte, _ plugin.NewClientOptions) (plugin.Client, error) { +func New(ctx context.Context, logger zerolog.Logger, s []byte, _ plugin.NewClientOptions) (plugin.Client, error) { c := &Client{ logger: logger.With().Str("module", "gcs").Logger(), } - if err := json.Unmarshal(spec, &c.spec); err != nil { + if err := json.Unmarshal(s, &c.spec); err != nil { return nil, fmt.Errorf("failed to unmarshal gcs spec: %w", err) } if err := c.spec.Validate(); err != nil { @@ -43,7 +44,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, _ plugin.NewCl } c.spec.SetDefaults() - filetypesClient, err := filetypes.NewClient(c.spec.FileSpec) + filetypesClient, err := filetypes.NewClient(&c.spec.FileSpec) if err != nil { return nil, fmt.Errorf("failed to create filetypes client: %w", err) } diff --git a/plugins/destination/gcs/client/client_test.go b/plugins/destination/gcs/client/client_test.go index 2103a7ace2e54f..0bdd7ef13c2873 100644 --- a/plugins/destination/gcs/client/client_test.go +++ b/plugins/destination/gcs/client/client_test.go @@ -10,6 +10,7 @@ import ( "github.com/apache/arrow/go/v15/arrow" "github.com/apache/arrow/go/v15/arrow/array" "github.com/apache/arrow/go/v15/arrow/memory" + spec "github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" @@ -26,29 +27,27 @@ func TestPlugin(t *testing.T) { filetypes.FormatTypeJSON, filetypes.FormatTypeParquet, } { - spec := Spec{ + s := spec.Spec{ Bucket: bucket, Path: t.TempDir(), NoRotate: true, - FileSpec: &filetypes.FileSpec{ - Format: ft, - }, + FileSpec: filetypes.FileSpec{Format: ft}, } t.Run("generic/"+string(ft), func(t *testing.T) { - testPlugin(t, &spec) + testPlugin(t, &s) }) t.Run("write/"+string(ft), func(t *testing.T) { - testPluginCustom(t, &spec) + testPluginCustom(t, &s) }) } } -func testPlugin(t *testing.T, spec *Spec) { +func testPlugin(t *testing.T, s *spec.Spec) { ctx := context.Background() p := plugin.NewPlugin("gcs", "development", New) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } @@ -67,7 +66,7 @@ func testPlugin(t *testing.T, spec *Spec) { ) } -func testPluginCustom(t *testing.T, spec *Spec) { +func testPluginCustom(t *testing.T, s *spec.Spec) { ctx := context.Background() var client plugin.Client @@ -77,7 +76,7 @@ func testPluginCustom(t *testing.T, spec *Spec) { client, err = New(ctx, logger, spec, opts) return client, err }) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } diff --git a/plugins/destination/gcs/client/spec.go b/plugins/destination/gcs/client/spec.go deleted file mode 100644 index 667dba7bf1c891..00000000000000 --- a/plugins/destination/gcs/client/spec.go +++ /dev/null @@ -1,68 +0,0 @@ -package client - -import ( - "fmt" - "time" - - "github.com/cloudquery/filetypes/v4" - "github.com/cloudquery/plugin-sdk/v4/configtype" -) - -type Spec struct { - Bucket string `json:"bucket,omitempty"` - Path string `json:"path,omitempty"` - NoRotate bool `json:"no_rotate,omitempty"` - *filetypes.FileSpec - - BatchSize *int64 `json:"batch_size"` - BatchSizeBytes *int64 `json:"batch_size_bytes"` - BatchTimeout *configtype.Duration `json:"batch_timeout"` -} - -func (s *Spec) SetDefaults() { - if s.BatchSize == nil { - if s.NoRotate { - s.BatchSize = int64ptr(0) - } else { - s.BatchSize = int64ptr(10000) - } - } - if s.BatchSizeBytes == nil { - if s.NoRotate { - s.BatchSizeBytes = int64ptr(0) - } else { - s.BatchSizeBytes = int64ptr(50 * 1024 * 1024) // 50 MiB - } - } - if s.BatchTimeout == nil { - if s.NoRotate { - d := configtype.NewDuration(0) - s.BatchTimeout = &d - } else { - d := configtype.NewDuration(30 * time.Second) - s.BatchTimeout = &d - } - } -} - -func (s *Spec) Validate() error { - if s.Bucket == "" { - return fmt.Errorf("`bucket` is required") - } - if s.Path == "" { - return fmt.Errorf("`path` is required") - } - if s.Format == "" { - return fmt.Errorf("`format` is required") - } - - if s.NoRotate && ((s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0)) { - return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`") - } - - return nil -} - -func int64ptr(i int64) *int64 { - return &i -} diff --git a/plugins/destination/gcs/client/spec/gen/main.go b/plugins/destination/gcs/client/spec/gen/main.go new file mode 100644 index 00000000000000..d63ce07d3a17a1 --- /dev/null +++ b/plugins/destination/gcs/client/spec/gen/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec" + "github.com/cloudquery/codegen/jsonschema" + "github.com/cloudquery/filetypes/v4" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + append(filetypes.FileSpec{}.JSONSchemaOptions(), + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec", path.Join(currDir(), "..")), + jsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), + )..., + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/gcs/client/spec/schema.go b/plugins/destination/gcs/client/spec/schema.go new file mode 100644 index 00000000000000..4d029a8f32e9b7 --- /dev/null +++ b/plugins/destination/gcs/client/spec/schema.go @@ -0,0 +1,48 @@ +package spec + +import ( + _ "embed" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" +) + +func (s Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + s.FileSpec.JSONSchemaExtend(sc) // need to call manually + + batchTimeout := sc.Properties.Value("batch_timeout").OneOf[0] // 0 - val, 1 - null + batchTimeout.Default = "30s" + + // no_rotate:true -> only nulls for batch options + noRotateNoBatch := &jsonschema.Schema{ + Title: "Disallow batching when using no_rotate", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + noRotate := *sc.Properties.Value("no_rotate") + noRotate.Default = nil + noRotate.Const = true + noRotate.Description = "" + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("no_rotate", &noRotate) + return properties + }(), + Required: []string{"no_rotate"}, + }, + Then: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + // we make the non-zero requirement, so we want to allow only null here + null := &jsonschema.Schema{Type: "null"} + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("batch_size", null) + properties.Set("batch_size_bytes", null) + properties.Set("batch_timeout", null) + return properties + }(), + }, + } + + sc.AllOf = append(sc.AllOf, noRotateNoBatch) +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/gcs/client/spec/schema.json b/plugins/destination/gcs/client/spec/schema.json new file mode 100644 index 00000000000000..432d251cd52721 --- /dev/null +++ b/plugins/destination/gcs/client/spec/schema.json @@ -0,0 +1,226 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "CSVSpec": { + "properties": { + "skip_header": { + "type": "boolean", + "description": "Specifies if the first line of a file should be the header.", + "default": false + }, + "delimiter": { + "type": "string", + "pattern": "^.$", + "description": "Character that will be used as the delimiter.", + "default": "," + } + }, + "additionalProperties": false, + "type": "object", + "description": "CloudQuery CSV file output spec." + }, + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "JSONSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery JSON file output spec." + }, + "ParquetSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery Parquet file output spec." + }, + "Spec": { + "allOf": [ + { + "if": { + "properties": { + "no_rotate": { + "type": "boolean", + "const": true + } + }, + "required": [ + "no_rotate" + ] + }, + "then": { + "properties": { + "batch_size": { + "type": "null" + }, + "batch_size_bytes": { + "type": "null" + }, + "batch_timeout": { + "type": "null" + } + } + }, + "title": "Disallow batching when using no_rotate" + } + ], + "oneOf": [ + { + "properties": { + "format": { + "type": "string", + "const": "csv" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "json" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/JSONSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "parquet" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/ParquetSpec" + }, + { + "type": "null" + } + ] + } + } + } + ], + "properties": { + "format": { + "type": "string", + "enum": [ + "csv", + "json", + "parquet" + ], + "description": "Output format." + }, + "format_spec": { + "oneOf": [ + { + "anyOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "$ref": "#/$defs/JSONSpec" + }, + { + "$ref": "#/$defs/ParquetSpec" + } + ] + }, + { + "type": "null" + } + ] + }, + "compression": { + "type": "string", + "enum": [ + "", + "gzip" + ], + "description": "Compression type.\nEmpty or missing stands for no compression." + }, + "bucket": { + "type": "string", + "minLength": 1, + "description": "Bucket where to sync the files." + }, + "path": { + "type": "string", + "minLength": 1, + "description": "Path to where the files will be uploaded in the above bucket." + }, + "no_rotate": { + "type": "boolean", + "description": "If set to `true`, the plugin will write to one file per table.\nOtherwise, for every batch a new file will be created with a different `.\u003cUUID\u003e` suffix.", + "default": false + }, + "batch_size": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "This parameter controls the maximum amount of items may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "default": 10000 + }, + { + "type": "null" + } + ] + }, + "batch_size_bytes": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "This parameter controls the maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "default": 52428800 + }, + { + "type": "null" + } + ] + }, + "batch_timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "This parameter controls the maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "default": "30s" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "format", + "bucket", + "path" + ] + } + } +} diff --git a/plugins/destination/gcs/client/spec/schema_test.go b/plugins/destination/gcs/client/spec/schema_test.go new file mode 100644 index 00000000000000..3bcf9db3e77941 --- /dev/null +++ b/plugins/destination/gcs/client/spec/schema_test.go @@ -0,0 +1,199 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpecJSONSchema(t *testing.T) { + // cases about embedded filetypes.FileSpec are tested in the corresponding package + // However, we add some tests to verify that it actually is properly working + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "csv file spec", + Spec: `{ + "format": "csv", + "format_spec": { + "skip_header": true, + "delimiter": "#" + }, + "path": "abc", + "bucket": "abc" +}`, + }, + { + Name: "bad format value", // also a part of embedded FileSpec testing + Spec: `{"format": "cs22v", "path": "abc"}`, + Err: true, + }, + { + Name: "minimal", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc"}`, + }, + { + Name: "missing path", + Spec: `{"format": "csv", "bucket": "abc"}`, + Err: true, + }, + { + Name: "empty path", + Spec: `{"format": "csv", "path": "", "bucket": "abc"}`, + Err: true, + }, + { + Name: "null path", + Spec: `{"format": "csv", "path": null, "bucket": "abc"}`, + Err: true, + }, + { + Name: "integer path", + Spec: `{"format": "csv", "path": 123, "bucket": "abc"}`, + Err: true, + }, + { + Name: "missing bucket", + Spec: `{"format": "csv", "path": "abc"}`, + Err: true, + }, + { + Name: "empty bucket", + Spec: `{"format": "csv", "path": "abc", "bucket": ""}`, + Err: true, + }, + { + Name: "null bucket", + Spec: `{"format": "csv", "path": "abc", "bucket": null}`, + Err: true, + }, + { + Name: "integer bucket", + Spec: `{"format": "csv", "path": "abc", "bucket": 123}`, + Err: true, + }, + + { + Name: "null no_rotate", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate": null}`, + Err: true, + }, + { + Name: "bad no_rotate", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate": 123}`, + Err: true, + }, + { + Name: "no_rotate:true", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate": true}`, + }, + { + Name: "no_rotate:false", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate": false}`, + }, + { + Name: "zero batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size":0}`, + }, + { + Name: "float batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size":5.3}`, + }, + { + Name: "bad batch_size", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size":false}`, + }, + { + Name: "null batch_size", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size":null}`, + }, + { + Name: "proper batch_size", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size":123}`, + }, + { + Name: "zero batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size_bytes":0}`, + }, + { + Name: "float batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size_bytes":5.3}`, + }, + { + Name: "bad batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size_bytes":false}`, + }, + { + Name: "null batch_size_bytes", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size_bytes":null}`, + }, + { + Name: "proper batch_size_bytes", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_size_bytes":123}`, + }, + // configtype.Duration is tested in plugin-sdk + // test only null here + { + Name: "null batch_timeout", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "batch_timeout":null}`, + }, + + // no_rotate + batching + { + Name: "no_rotate:false & batch_size:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_size":100}`, + }, + { + Name: "no_rotate:true & batch_size:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_size":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_size":null}`, + }, + { + Name: "no_rotate:true & batch_size:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_size":null}`, + }, + { + Name: "no_rotate:false & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_size_bytes":100}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_size_bytes":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:false & batch_timeout:100s", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_timeout":"100s"}`, + }, + { + Name: "no_rotate:true & batch_timeout:100s", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_timeout":"100s"}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_timeout:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":false, "batch_timeout":null}`, + }, + { + Name: "no_rotate:true & batch_timeout:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "abc", "no_rotate":true, "batch_timeout":null}`, + }, + }) +} diff --git a/plugins/destination/gcs/client/spec/spec.go b/plugins/destination/gcs/client/spec/spec.go new file mode 100644 index 00000000000000..4d3da2f8a6b32f --- /dev/null +++ b/plugins/destination/gcs/client/spec/spec.go @@ -0,0 +1,90 @@ +package spec + +import ( + "fmt" + "time" + + "github.com/cloudquery/filetypes/v4" + "github.com/cloudquery/plugin-sdk/v4/configtype" +) + +type Spec struct { + filetypes.FileSpec + + // Bucket where to sync the files. + Bucket string `json:"bucket,omitempty" jsonschema:"required,minLength=1"` + + // Path to where the files will be uploaded in the above bucket. + Path string `json:"path,omitempty" jsonschema:"required,minLength=1"` + + // If set to `true`, the plugin will write to one file per table. + // Otherwise, for every batch a new file will be created with a different `.` suffix. + NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` + + // This parameter controls the maximum amount of items may be grouped together to be written in a single object. + // + // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). + BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` + + // This parameter controls the maximum size of items that may be grouped together to be written in a single object. + // + // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). + BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` + + // This parameter controls the maximum interval between batch writes. + // + // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). + BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` +} + +func (s *Spec) SetDefaults() { + if s.BatchSize == nil { + if s.NoRotate { + s.BatchSize = int64ptr(0) + } else { + s.BatchSize = int64ptr(10000) + } + } + if s.BatchSizeBytes == nil { + if s.NoRotate { + s.BatchSizeBytes = int64ptr(0) + } else { + s.BatchSizeBytes = int64ptr(50 * 1024 * 1024) // 50 MiB + } + } + if s.BatchTimeout == nil { + if s.NoRotate { + d := configtype.NewDuration(0) + s.BatchTimeout = &d + } else { + d := configtype.NewDuration(30 * time.Second) + s.BatchTimeout = &d + } + } +} + +func (s *Spec) Validate() error { + if len(s.Bucket) == 0 { + return fmt.Errorf("`bucket` is required") + } + if len(s.Path) == 0 { + return fmt.Errorf("`path` is required") + } + + if s.NoRotate && ((s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0)) { + return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`") + } + + // required for s.FileSpec.Validate call + err := s.FileSpec.UnmarshalSpec() + if err != nil { + return err + } + s.FileSpec.SetDefaults() + + return s.FileSpec.Validate() +} + +func int64ptr(i int64) *int64 { + return &i +} diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 56b59a6d99d30c..daea99309bbd37 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -7,6 +7,7 @@ toolchain go1.21.6 require ( cloud.google.com/go/storage v1.36.0 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/filetypes/v4 v4.2.9 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/uuid v1.5.0 @@ -38,7 +39,6 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect - github.com/cloudquery/codegen v0.3.12 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/plugins/destination/gcs/main.go b/plugins/destination/gcs/main.go index 327b89df0a0b58..9d5ae32b401420 100644 --- a/plugins/destination/gcs/main.go +++ b/plugins/destination/gcs/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/gcs/client" + "github.com/cloudquery/cloudquery/plugins/destination/gcs/client/spec" internalPlugin "github.com/cloudquery/cloudquery/plugins/destination/gcs/resources/plugin" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -15,7 +16,10 @@ const ( ) func main() { - p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team)) + p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, + plugin.WithKind(internalPlugin.Kind), + plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(spec.JSONSchema)) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatalf("failed to serve plugin: %v", err) } From 7e13d248d172109214a3d1ab15aba407624794de Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:50:21 +0200 Subject: [PATCH 11/78] fix(deps): Update k8s.io/kube-openapi digest to 2919ad4 (#16423) 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 | |---|---|---|---| | [k8s.io/kube-openapi](https://togithub.com/kubernetes/kube-openapi) | indirect | digest | `2086090` -> `2919ad4` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (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/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 140168d85c3c72..84a88633e4f951 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -143,7 +143,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.120.1 // indirect - k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 // indirect + k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index e4d06b1683ec8c..b9a3dec3477cf3 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -456,8 +456,8 @@ k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15 h1:m6dl1pkxz3HuE2mP9MUYPCCGyy6IIFlv/vTlLBDxIwA= -k8s.io/kube-openapi v0.0.0-20240117194847-208609032b15/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= +k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec h1:iGTel2aR8vCZdxJDgmbeY0zrlXy9Qcvyw4R2sB4HLrA= +k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs= From 5b788fe8445e0f584c5b61dc65864308d911d49a Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:54:21 -0800 Subject: [PATCH 12/78] feat: Add JSON schema to meilisearch destination plugin (#16440) Closes https://github.com/cloudquery/cloudquery/issues/16436 --- .github/workflows/dest_meilisearch.yml | 6 ++ plugins/destination/meilisearch/Makefile | 8 ++ .../meilisearch/client/schema.json | 72 +++++++++++++++++ .../destination/meilisearch/client/spec.go | 50 ++++++++++-- .../meilisearch/client/spec/gen/main.go | 26 ++++++ .../meilisearch/client/spec_test.go | 81 +++++++++++++++++++ .../destination/meilisearch/docs/overview.md | 9 +-- plugins/destination/meilisearch/go.mod | 6 +- plugins/destination/meilisearch/go.sum | 6 +- plugins/destination/meilisearch/main.go | 1 + 10 files changed, 249 insertions(+), 16 deletions(-) create mode 100644 plugins/destination/meilisearch/client/schema.json create mode 100644 plugins/destination/meilisearch/client/spec/gen/main.go create mode 100644 plugins/destination/meilisearch/client/spec_test.go diff --git a/.github/workflows/dest_meilisearch.yml b/.github/workflows/dest_meilisearch.yml index 84371ef6e471b7..8ac192a87d5069 100644 --- a/.github/workflows/dest_meilisearch.yml +++ b/.github/workflows/dest_meilisearch.yml @@ -60,6 +60,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - run: go mod tidy - name: Build run: go build . diff --git a/plugins/destination/meilisearch/Makefile b/plugins/destination/meilisearch/Makefile index c957b06653ed16..a803c132c3b248 100644 --- a/plugins/destination/meilisearch/Makefile +++ b/plugins/destination/meilisearch/Makefile @@ -7,3 +7,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/meilisearch/client/schema.json b/plugins/destination/meilisearch/client/schema.json new file mode 100644 index 00000000000000..dc58e66a1b44d7 --- /dev/null +++ b/plugins/destination/meilisearch/client/schema.json @@ -0,0 +1,72 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/meilisearch/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "Spec": { + "properties": { + "host": { + "type": "string", + "minLength": 1, + "description": "A Meilisearch instance host \u0026 port to use.\nIf your Meilisearch instance uses private SSL certificate, make sure to specify `ca_cert` option, too." + }, + "api_key": { + "type": "string", + "minLength": 1, + "description": "Meilisearch API key, granted the following actions:\n\n - `documents.add`\n - `indexes.create`\n - `indexes.get`\n - `indexes.update`\n - `tasks.get`\n - `settings.get`\n - `settings.update`\n - `version`" + }, + "timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "Meilisearch API client timeout.", + "default": "5m" + }, + { + "type": "null" + } + ] + }, + "ca_cert": { + "type": "string", + "description": "PEM-encoded certificate authorities.\n When set, a certificate pool will be created by appending the certificates to the system pool.\n See [file variable substitution](/docs/advanced-topics/environment-variable-substitution#file-variable-substitution-example) for how to read this value from a file." + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "default": 1000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Maximum size of items that may be grouped together to be written in a single write.", + "default": 4194304 + }, + "batch_timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "Timeout for writing a single batch.", + "default": "20s" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "host", + "api_key" + ] + } + } +} diff --git a/plugins/destination/meilisearch/client/spec.go b/plugins/destination/meilisearch/client/spec.go index 95c5e1e074c73d..abad88d14fb70d 100644 --- a/plugins/destination/meilisearch/client/spec.go +++ b/plugins/destination/meilisearch/client/spec.go @@ -3,26 +3,49 @@ package client import ( "crypto/tls" "crypto/x509" + _ "embed" "fmt" "time" "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/invopop/jsonschema" "github.com/meilisearch/meilisearch-go" "github.com/valyala/fasthttp" ) type Spec struct { - // required - Host string `json:"host,omitempty"` - APIKey string `json:"api_key,omitempty"` + // A Meilisearch instance host & port to use. + // If your Meilisearch instance uses private SSL certificate, make sure to specify `ca_cert` option, too. + Host string `json:"host" jsonschema:"required,minLength=1"` - // optional + // Meilisearch API key, granted the following actions: + // + // - `documents.add` + // - `indexes.create` + // - `indexes.get` + // - `indexes.update` + // - `tasks.get` + // - `settings.get` + // - `settings.update` + // - `version` + APIKey string `json:"api_key" jsonschema:"required,minLength=1"` + + // Meilisearch API client timeout. Timeout *configtype.Duration `json:"timeout,omitempty"` - CACert string `json:"ca_cert,omitempty"` - BatchSize int `json:"batch_size,omitempty"` - BatchSizeBytes int `json:"batch_size_bytes,omitempty"` - BatchTimeout *configtype.Duration `json:"batch_timeout,omitempty"` + // PEM-encoded certificate authorities. + // When set, a certificate pool will be created by appending the certificates to the system pool. + // See [file variable substitution](/docs/advanced-topics/environment-variable-substitution#file-variable-substitution-example) for how to read this value from a file. + CACert string `json:"ca_cert,omitempty"` + + // Maximum amount of items that may be grouped together to be written in a single write. + BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` + + // Maximum size of items that may be grouped together to be written in a single write. + BatchSizeBytes int `json:"batch_size_bytes,omitempty" jsonschema:"minimum=1,default=4194304"` + + // Timeout for writing a single batch. + BatchTimeout *configtype.Duration `json:"batch_timeout,omitempty"` } func (s *Spec) validate() error { @@ -86,3 +109,14 @@ func (s *Spec) getClient() (*meilisearch.Client, error) { return meilisearch.NewFastHTTPCustomClient(config, httpClient), nil } + +//go:embed schema.json +var JSONSchema string + +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + timeout := sc.Properties.Value("timeout").OneOf[0] // 0 - val, 1 - null + timeout.Default = "5m" + + batchTimeout := sc.Properties.Value("batch_timeout").OneOf[0] // 0 - val, 1 - null + batchTimeout.Default = "20s" +} diff --git a/plugins/destination/meilisearch/client/spec/gen/main.go b/plugins/destination/meilisearch/client/spec/gen/main.go new file mode 100644 index 00000000000000..deba6a17727eb6 --- /dev/null +++ b/plugins/destination/meilisearch/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/meilisearch/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/meilisearch/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/meilisearch/client/spec_test.go b/plugins/destination/meilisearch/client/spec_test.go new file mode 100644 index 00000000000000..0f50b1d560baf5 --- /dev/null +++ b/plugins/destination/meilisearch/client/spec_test.go @@ -0,0 +1,81 @@ +package client_test + +import ( + "testing" + + "github.com/cloudquery/cloudquery/plugins/destination/meilisearch/client" + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, client.JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with host", + Spec: `{"host": "conn"}`, + Err: true, + }, + { + Name: "spec with api_key", + Spec: `{"api_key": "foo"}`, + Err: true, + }, + { + Name: "spec with host and api_key", + Spec: `{"host": "conn", "api_key":"foo"}`, + }, + { + Name: "spec with bool host", + Spec: `{"host": true, "api_key": "foo"}`, + Err: true, + }, + { + Name: "spec with null host", + Spec: `{"host": null, "api_key": "foo"}`, + Err: true, + }, + { + Name: "spec with int host", + Spec: `{"host": 123, "api_key": "foo"}`, + Err: true, + }, + { + Name: "spec with bool batch_size", + Spec: `{"host": "abc", "api_key": "foo", "batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"host": "abc", "api_key": "foo", "batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"host": "abc", "api_key": "foo", "batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"host": "abc", "api_key": "foo", "batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with proper batch_size", + Spec: `{"host": "abc", "api_key": "foo", "batch_size":7}`, + }, + { + Name: "spec with bool batch_timeout", + Spec: `{"host": "abc", "api_key": "foo", "batch_timeout":true}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"host": "abc", "api_key": "foo", "unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/meilisearch/docs/overview.md b/plugins/destination/meilisearch/docs/overview.md index e27126560d5abd..9b789edd98b7d4 100644 --- a/plugins/destination/meilisearch/docs/overview.md +++ b/plugins/destination/meilisearch/docs/overview.md @@ -61,20 +61,19 @@ This is the spec used by the Meilisearch destination plugin. PEM-encoded certificate authorities. When set, a certificate pool will be created by appending the certificates to the system pool. - See [file variable substitution](/docs/advanced-topics/environment-variable-substitution#file-variable-substitution-example) - for how to read this value from a file. + See [file variable substitution](/docs/advanced-topics/environment-variable-substitution#file-variable-substitution-example) for how to read this value from a file. - `batch_size` (`integer`) (optional) (default: `1000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum amount of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `4194304` (= 4 MiB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. - `batch_timeout` (`duration`) (optional) (default: `20s`) - This parameter controls the timeout for writing a single batch. + Timeout for writing a single batch. ## Underlying library diff --git a/plugins/destination/meilisearch/go.mod b/plugins/destination/meilisearch/go.mod index 9a03cee4fb7a42..7ea71bc181743e 100644 --- a/plugins/destination/meilisearch/go.mod +++ b/plugins/destination/meilisearch/go.mod @@ -4,9 +4,11 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 + github.com/invopop/jsonschema v0.12.0 github.com/meilisearch/meilisearch-go v0.24.0 github.com/rs/zerolog v1.31.0 github.com/valyala/fasthttp v1.49.0 @@ -55,7 +57,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -125,3 +126,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index eeecd151a1d7df..f80de3e286fa37 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -48,6 +48,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -131,8 +135,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/destination/meilisearch/main.go b/plugins/destination/meilisearch/main.go index 1be45d57c911c8..69a1321330c8cf 100644 --- a/plugins/destination/meilisearch/main.go +++ b/plugins/destination/meilisearch/main.go @@ -18,6 +18,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), From 9933075da8c26966c4cd119c30e7a4b5063be9ae Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:14:19 +0200 Subject: [PATCH 13/78] fix(deps): Update module github.com/cloudquery/filetypes/v4 to v4.2.10 (#16445) 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/v4](https://togithub.com/cloudquery/filetypes) | require | patch | `v4.2.9` -> `v4.2.10` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/filetypes (github.com/cloudquery/filetypes/v4) ### [`v4.2.10`](https://togithub.com/cloudquery/filetypes/releases/tag/v4.2.10) [Compare Source](https://togithub.com/cloudquery/filetypes/compare/v4.2.9...v4.2.10) ##### Bug Fixes - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#​434](https://togithub.com/cloudquery/filetypes/issues/434)) ([5e23b07](https://togithub.com/cloudquery/filetypes/commit/5e23b07059379ba3a28de9bf11f84a4f2d21104c)) - **deps:** Update module github.com/deepmap/oapi-codegen to v1.16.2 ([#​432](https://togithub.com/cloudquery/filetypes/issues/432)) ([37a784b](https://togithub.com/cloudquery/filetypes/commit/37a784b0d04b0421d53ccb66142f2ceee9bf7b62)) - **deps:** Update module github.com/ugorji/go/codec to v1.2.12 ([#​431](https://togithub.com/cloudquery/filetypes/issues/431)) ([7375cce](https://togithub.com/cloudquery/filetypes/commit/7375ccea36a2305835e58bf819383b172b5b0059))
--- ### 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 | 8 ++++---- plugins/destination/azblob/go.sum | 4 ++-- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 ++-- plugins/destination/gcs/go.mod | 6 +++--- 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, 20 insertions(+), 20 deletions(-) diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 9f9defb9063b1b..b0355b44011aba 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -8,12 +8,15 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 - github.com/cloudquery/filetypes/v4 v4.2.9 + github.com/cloudquery/codegen v0.3.12 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 + github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 + github.com/wk8/go-ordered-map/v2 v2.1.8 ) require ( @@ -39,7 +42,6 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect - github.com/cloudquery/codegen v0.3.12 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -66,7 +68,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -111,7 +112,6 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 7f27f09bb100dc..8893256c9dc39e 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -65,8 +65,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.9 h1:GbGGqJj9DK0Ivv8fRcE4SVc0c/PujuW7G0nXUncH0p8= -github.com/cloudquery/filetypes/v4 v4.2.9/go.mod h1:l+68s0LyCjkoP6IT8G3b94pEIhC8rV0TcmTyeN30pt4= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index e88905b17ddc73..ff5ebcaf9815a5 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.6 require ( github.com/apache/arrow/go/v15 v15.0.0 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/filetypes/v4 v4.2.9 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index f3a57198e5ae1a..faff6507dad37b 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.9 h1:GbGGqJj9DK0Ivv8fRcE4SVc0c/PujuW7G0nXUncH0p8= -github.com/cloudquery/filetypes/v4 v4.2.9/go.mod h1:l+68s0LyCjkoP6IT8G3b94pEIhC8rV0TcmTyeN30pt4= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index daea99309bbd37..3f32c313de480b 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -8,11 +8,13 @@ require ( cloud.google.com/go/storage v1.36.0 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/filetypes/v4 v4.2.9 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/uuid v1.5.0 + github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 + github.com/wk8/go-ordered-map/v2 v2.1.8 ) require ( @@ -69,7 +71,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -112,7 +113,6 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opencensus.io v0.24.0 // indirect diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 07233ce457175b..73ef96bfb70b3b 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -67,8 +67,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.9 h1:GbGGqJj9DK0Ivv8fRcE4SVc0c/PujuW7G0nXUncH0p8= -github.com/cloudquery/filetypes/v4 v4.2.9/go.mod h1:l+68s0LyCjkoP6IT8G3b94pEIhC8rV0TcmTyeN30pt4= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 5bbd3b42b8be69..f4876150952866 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.6 require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 - github.com/cloudquery/filetypes/v4 v4.2.9 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 1e52fd04768602..dca0328f58bc66 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -57,8 +57,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.9 h1:GbGGqJj9DK0Ivv8fRcE4SVc0c/PujuW7G0nXUncH0p8= -github.com/cloudquery/filetypes/v4 v4.2.9/go.mod h1:l+68s0LyCjkoP6IT8G3b94pEIhC8rV0TcmTyeN30pt4= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 5253735e9567d5..0f1396ae6f82c0 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 - github.com/cloudquery/filetypes/v4 v4.2.9 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 0414ff80515e5c..c3d0bf98d73bcd 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -91,8 +91,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.9 h1:GbGGqJj9DK0Ivv8fRcE4SVc0c/PujuW7G0nXUncH0p8= -github.com/cloudquery/filetypes/v4 v4.2.9/go.mod h1:l+68s0LyCjkoP6IT8G3b94pEIhC8rV0TcmTyeN30pt4= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= From 69836081f7086ebe0701efcdb28b33b22d90fe63 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:20:21 -0800 Subject: [PATCH 14/78] chore: Fix mssql go.mod (#16444) --- plugins/destination/mssql/go.mod | 30 +------------ plugins/destination/mssql/go.sum | 73 -------------------------------- 2 files changed, 1 insertion(+), 102 deletions(-) diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index 465dc82d1315a3..c6a76d348188d9 100644 --- a/plugins/destination/mssql/go.mod +++ b/plugins/destination/mssql/go.mod @@ -4,48 +4,30 @@ go 1.21.6 require ( github.com/apache/arrow/go/v15 v15.0.0 - github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.6.0 + github.com/invopop/jsonschema v0.12.0 github.com/microsoft/go-mssqldb v1.5.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 ) require ( - github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/99designs/keyring v1.2.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet/v6 v6.2.0 // indirect - github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0 // indirect - github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect - github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 // indirect - github.com/aws/smithy-go v1.19.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/buger/jsonparser v1.1.1 // indirect @@ -56,13 +38,10 @@ require ( github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect - github.com/danieljoos/wincred v1.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect - github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/flosch/pongo2/v4 v4.0.2 // indirect - github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/getsentry/sentry-go v0.26.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -73,7 +52,6 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.17.0 // indirect - github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/golang-jwt/jwt/v5 v5.2.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect @@ -84,11 +62,8 @@ require ( github.com/gorilla/css v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect - github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect @@ -110,7 +85,6 @@ require ( github.com/microcosm-cc/bluemonday v1.0.26 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect @@ -119,7 +93,6 @@ require ( github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/schollz/closestmatch v2.1.0+incompatible // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/snowflakedb/gosnowflake v1.7.2 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tdewolff/minify/v2 v2.20.16 // indirect @@ -148,7 +121,6 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index 108f22f3ea8b63..e7801bfa88c854 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -1,7 +1,3 @@ -github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= -github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= -github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= -github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA= @@ -11,10 +7,6 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMiv github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA= github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 h1:AMf7YbZOZIW5b66cXNHMWWT/zkjhz5+a+k/3x40EO7E= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1/go.mod h1:uwfk06ZBcvL/g4VHNjurPfVln9NMbsk2XIZxJ+hu81k= github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= @@ -24,8 +16,6 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4s github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= @@ -41,50 +31,10 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk= github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= -github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/apache/arrow/go/v15 v15.0.0 h1:1zZACWf85oEZY5/kd9dsQS7i+2G5zVQcbKTHgslqHNA= github.com/apache/arrow/go/v15 v15.0.0/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= -github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= -github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo= -github.com/aws/aws-sdk-go-v2/config v1.26.6 h1:Z/7w9bUqlRI0FFQpetVuFYEsjzE3h7fpU6HuGmfPL/o= -github.com/aws/aws-sdk-go-v2/config v1.26.6/go.mod h1:uKU6cnDmYCvJ+pxO9S4cWDb2yWWIH5hra+32hVh1MI4= -github.com/aws/aws-sdk-go-v2/credentials v1.16.16 h1:8q6Rliyv0aUFAVtzaldUEcS+T5gbadPbWdV1WcAddK8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.16/go.mod h1:UHVZrdUsv63hPXFo1H7c5fEneoVo9UXiz36QG1GEPi0= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 h1:2MUXyGW6dVaQz6aqycpbdLIH1NMcUI6kW6vQ0RabGYg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15/go.mod h1:aHbhbR6WEQgHAiRj41EQ2W47yOYwNtIkWTXmcAtYqj8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 h1:n3GDfwqF2tzEkXlv5cuy4iy7LpKDtqDMcNLfZDu9rls= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 h1:5oE2WzJE56/mVveuDZPJESKlg/00AaS2pY2QZcnxg4M= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10/go.mod h1:FHbKWQtRBYUz4vO5WBWjzMD2by126ny5y/1EoaWoLfI= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 h1:L0ai8WICYHozIKK+OtPzVJBugL7culcuM4E4JOpIEm8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10/go.mod h1:byqfyxJBshFk0fF9YmK0M0ugIO8OWjzH2T3bPG4eGuA= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 h1:KOxnQeWy5sXyS37fdKEvAsGHOr9fa/qvwxfJurR/BzE= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10/go.mod h1:jMx5INQFYFYB3lQD9W0D8Ohgq6Wnl7NYOJ2TQndbulI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 h1:5XNlsBsEvBZBMO6p82y+sqpWg8j5aBCe+5C2GBFgqBQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 h1:eajuO3nykDPdYicLlP3AGgOyVN3MOlFmZv7WGTuJPow= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.7/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 h1:QPMJf+Jw8E1l7zqhZmMlFw6w1NmfkfiSK8mS4zOx3BA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7/go.mod h1:ykf3COxYI0UJmxcfcxcVuz7b6uADi1FkiUz6Eb7AgM8= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= -github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= -github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= @@ -109,8 +59,6 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff h1:OzRo1Ig/TPtTV+2vA/NYqoEkjqJcE9RXuRVBX9GFeT0= -github.com/cloudquery/cloudquery/plugins/destination/snowflake v0.0.0-20240201145053-cc90a9a8a4ff/go.mod h1:l8Y52S40WT2c/gt7chA6LryeZO2/Ri/dgaFAVV0MBHE= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= @@ -123,8 +71,6 @@ github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTe github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= -github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -133,16 +79,12 @@ github.com/deepmap/oapi-codegen v1.16.2/go.mod h1:rdYoEA2GE+riuZ91DvpmBX9hJbQpuY github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= -github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= -github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= -github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/getsentry/sentry-go v0.26.0 h1:IX3++sF6/4B5JcevhdZfdKIHfyvMmAq/UnqcyT2H6mA= @@ -172,8 +114,6 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= -github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= @@ -211,8 +151,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= -github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= -github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= @@ -229,10 +167,6 @@ github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nD github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -293,8 +227,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= -github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= @@ -327,8 +259,6 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/snowflakedb/gosnowflake v1.7.2 h1:HRSwva8YXC64WUppfmHcMNVVzSE1+EwXXaJxgS0EkTo= -github.com/snowflakedb/gosnowflake v1.7.2/go.mod h1:03tW856vc3ceM4rJuj7KO4dzqN7qoezTm+xw7aPIIFo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -336,7 +266,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= 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 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -467,8 +396,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From 3323d531fd9554f6c8a92cc1ed13913f1f765dc8 Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Thu, 1 Feb 2024 10:25:20 -0600 Subject: [PATCH 15/78] feat!: Move from `PrimaryKeys`to `PrimaryKeyComponents` (#16403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary This PR replaces all of the `PrimaryKey:` and `WithPrimaryKey() with `PrimaryKeyComponent` and `WithPrimaryKeyComponents(` The tests are failing because: - [x] `doc-changes` - Failing to summarize all of the changes because to many PKs changed- Will be fixed by https://github.com/cloudquery/cloudquery/pull/16415 - [x] `Source Plugin AWS Workflow` - I used an unreleased version of the CLI to generate the docs. Will be released in `v5.3.0` https://github.com/cloudquery/cloudquery/pull/16386 - [ ] `Wait for all required workflows to pass`- only allows 300 files to be changed in a single PR- This will require --- plugins/source/aws/client/columns.go | 40 +++++++++---------- ...s_accessanalyzer_analyzer_archive_rules.md | 10 ++--- .../aws_accessanalyzer_analyzer_findings.md | 10 ++--- .../tables/aws_accessanalyzer_analyzers.md | 8 ++-- .../tables/aws_account_alternate_contacts.md | 9 +++-- .../aws/docs/tables/aws_account_contacts.md | 7 ++-- .../aws/docs/tables/aws_acm_certificates.md | 7 ++-- .../aws_acmpca_certificate_authorities.md | 7 ++-- .../tables/aws_amp_rule_groups_namespaces.md | 8 ++-- .../aws/docs/tables/aws_amp_workspaces.md | 8 ++-- .../aws/docs/tables/aws_amplify_apps.md | 7 ++-- .../docs/tables/aws_apigateway_api_keys.md | 7 ++-- .../aws_apigateway_client_certificates.md | 7 ++-- ...igateway_domain_name_base_path_mappings.md | 10 ++--- .../tables/aws_apigateway_domain_names.md | 8 ++-- .../aws_apigateway_rest_api_authorizers.md | 10 ++--- .../aws_apigateway_rest_api_deployments.md | 10 ++--- ...apigateway_rest_api_documentation_parts.md | 10 ++--- ...gateway_rest_api_documentation_versions.md | 10 ++--- ...s_apigateway_rest_api_gateway_responses.md | 10 ++--- .../tables/aws_apigateway_rest_api_models.md | 10 ++--- ..._apigateway_rest_api_request_validators.md | 10 ++--- ...y_rest_api_resource_method_integrations.md | 10 ++--- ...ws_apigateway_rest_api_resource_methods.md | 10 ++--- .../aws_apigateway_rest_api_resources.md | 10 ++--- .../tables/aws_apigateway_rest_api_stages.md | 10 ++--- .../docs/tables/aws_apigateway_rest_apis.md | 8 ++-- .../tables/aws_apigateway_usage_plan_keys.md | 10 ++--- .../docs/tables/aws_apigateway_usage_plans.md | 10 ++--- .../docs/tables/aws_apigateway_vpc_links.md | 9 +++-- .../aws_apigatewayv2_api_authorizers.md | 10 ++--- .../aws_apigatewayv2_api_deployments.md | 10 ++--- ..._apigatewayv2_api_integration_responses.md | 10 ++--- .../aws_apigatewayv2_api_integrations.md | 10 ++--- .../tables/aws_apigatewayv2_api_models.md | 10 ++--- .../aws_apigatewayv2_api_route_responses.md | 10 ++--- .../tables/aws_apigatewayv2_api_routes.md | 10 ++--- .../tables/aws_apigatewayv2_api_stages.md | 10 ++--- .../aws/docs/tables/aws_apigatewayv2_apis.md | 10 ++--- ...gatewayv2_domain_name_rest_api_mappings.md | 10 ++--- .../tables/aws_apigatewayv2_domain_names.md | 10 ++--- .../docs/tables/aws_apigatewayv2_vpc_links.md | 9 +++-- .../docs/tables/aws_appconfig_applications.md | 8 ++-- .../aws_appconfig_configuration_profiles.md | 10 ++--- .../aws_appconfig_deployment_strategies.md | 7 ++-- .../docs/tables/aws_appconfig_environments.md | 10 ++--- ...appconfig_hosted_configuration_versions.md | 10 ++--- .../aws/docs/tables/aws_appflow_flows.md | 7 ++-- .../aws_applicationautoscaling_policies.md | 7 ++-- ...applicationautoscaling_scalable_targets.md | 11 ++--- ...plicationautoscaling_scaling_activities.md | 11 ++--- ...pplicationautoscaling_scheduled_actions.md | 7 ++-- .../aws/docs/tables/aws_appmesh_meshes.md | 12 +++--- .../tables/aws_appmesh_virtual_gateways.md | 14 +++---- .../docs/tables/aws_appmesh_virtual_nodes.md | 14 +++---- .../tables/aws_appmesh_virtual_routers.md | 14 +++---- .../tables/aws_appmesh_virtual_services.md | 14 +++---- ...s_apprunner_auto_scaling_configurations.md | 7 ++-- .../docs/tables/aws_apprunner_connections.md | 7 ++-- .../tables/aws_apprunner_custom_domains.md | 10 ++--- ..._apprunner_observability_configurations.md | 7 ++-- .../docs/tables/aws_apprunner_operations.md | 10 ++--- .../aws/docs/tables/aws_apprunner_services.md | 8 ++-- .../tables/aws_apprunner_vpc_connectors.md | 7 ++-- .../aws_apprunner_vpc_ingress_connections.md | 7 ++-- .../docs/tables/aws_appstream_app_blocks.md | 7 ++-- ...ppstream_application_fleet_associations.md | 10 ++--- .../docs/tables/aws_appstream_applications.md | 8 ++-- .../tables/aws_appstream_directory_configs.md | 11 ++--- .../aws/docs/tables/aws_appstream_fleets.md | 7 ++-- .../tables/aws_appstream_image_builders.md | 7 ++-- .../aws/docs/tables/aws_appstream_images.md | 11 ++--- .../aws_appstream_stack_entitlements.md | 14 +++---- .../aws_appstream_stack_user_associations.md | 16 ++++---- .../aws/docs/tables/aws_appstream_stacks.md | 8 ++-- ...ws_appstream_usage_report_subscriptions.md | 11 ++--- .../aws/docs/tables/aws_appstream_users.md | 7 ++-- .../docs/tables/aws_appsync_graphql_apis.md | 7 ++-- ...aws_athena_data_catalog_database_tables.md | 12 +++--- .../aws_athena_data_catalog_databases.md | 10 ++--- .../docs/tables/aws_athena_data_catalogs.md | 8 ++-- .../aws_athena_work_group_named_queries.md | 10 ++--- ...s_athena_work_group_prepared_statements.md | 10 ++--- .../aws_athena_work_group_query_executions.md | 10 ++--- .../aws/docs/tables/aws_athena_work_groups.md | 8 ++-- .../tables/aws_auditmanager_assessments.md | 7 ++-- .../aws_autoscaling_group_lifecycle_hooks.md | 10 ++--- .../aws_autoscaling_group_scaling_policies.md | 8 ++-- .../aws/docs/tables/aws_autoscaling_groups.md | 8 ++-- .../aws_autoscaling_launch_configurations.md | 7 ++-- .../tables/aws_autoscaling_plan_resources.md | 14 +++---- .../aws/docs/tables/aws_autoscaling_plans.md | 12 +++--- .../aws_autoscaling_scheduled_actions.md | 7 ++-- .../aws/docs/tables/aws_availability_zones.md | 11 ++--- .../docs/tables/aws_backup_global_settings.md | 9 +++-- .../source/aws/docs/tables/aws_backup_jobs.md | 11 ++--- .../docs/tables/aws_backup_plan_selections.md | 10 ++--- .../aws/docs/tables/aws_backup_plans.md | 10 ++--- .../tables/aws_backup_protected_resources.md | 7 ++-- .../docs/tables/aws_backup_region_settings.md | 9 +++-- .../docs/tables/aws_backup_report_plans.md | 7 ++-- .../aws_backup_vault_recovery_points.md | 8 ++-- .../aws/docs/tables/aws_backup_vaults.md | 8 ++-- .../tables/aws_batch_compute_environments.md | 7 ++-- .../docs/tables/aws_batch_job_definitions.md | 7 ++-- .../aws/docs/tables/aws_batch_job_queues.md | 8 ++-- .../source/aws/docs/tables/aws_batch_jobs.md | 8 ++-- ...ormation_stack_instance_resource_drifts.md | 16 ++++---- ...cloudformation_stack_instance_summaries.md | 12 +++--- .../aws_cloudformation_stack_resources.md | 10 ++--- ...udformation_stack_set_operation_results.md | 18 ++++----- ...aws_cloudformation_stack_set_operations.md | 12 +++--- .../tables/aws_cloudformation_stack_sets.md | 8 ++-- .../aws_cloudformation_stack_templates.md | 8 ++-- .../docs/tables/aws_cloudformation_stacks.md | 8 ++-- .../aws_cloudformation_template_summaries.md | 8 ++-- .../tables/aws_cloudfront_cache_policies.md | 7 ++-- .../tables/aws_cloudfront_distributions.md | 7 ++-- .../docs/tables/aws_cloudfront_functions.md | 9 +++-- ...aws_cloudfront_origin_access_identities.md | 9 +++-- .../aws_cloudfront_origin_request_policies.md | 9 +++-- ...ws_cloudfront_response_headers_policies.md | 9 +++-- .../aws/docs/tables/aws_cloudhsmv2_backups.md | 7 ++-- .../docs/tables/aws_cloudhsmv2_clusters.md | 7 ++-- .../docs/tables/aws_cloudtrail_channels.md | 7 ++-- .../aws/docs/tables/aws_cloudtrail_events.md | 8 ++-- .../aws/docs/tables/aws_cloudtrail_imports.md | 11 ++--- .../aws_cloudtrail_trail_event_selectors.md | 8 ++-- .../aws/docs/tables/aws_cloudtrail_trails.md | 12 +++--- .../aws/docs/tables/aws_cloudwatch_alarms.md | 7 ++-- ...logs_log_group_data_protection_policies.md | 8 ++-- ...atchlogs_log_group_subscription_filters.md | 12 +++--- .../tables/aws_cloudwatchlogs_log_groups.md | 8 ++-- .../aws_cloudwatchlogs_metric_filters.md | 9 +++-- .../aws_cloudwatchlogs_resource_policies.md | 11 ++--- .../docs/tables/aws_codeartifact_domains.md | 11 ++--- .../tables/aws_codeartifact_repositories.md | 11 ++--- .../aws/docs/tables/aws_codebuild_builds.md | 8 ++-- .../aws/docs/tables/aws_codebuild_projects.md | 8 ++-- .../aws_codebuild_source_credentials.md | 7 ++-- .../tables/aws_codecommit_repositories.md | 7 ++-- .../docs/tables/aws_codepipeline_pipelines.md | 7 ++-- .../docs/tables/aws_codepipeline_webhooks.md | 7 ++-- .../docs/tables/aws_cognito_identity_pools.md | 11 ++--- ...ws_cognito_user_pool_identity_providers.md | 10 ++--- .../aws/docs/tables/aws_cognito_user_pools.md | 12 +++--- ...mizer_autoscaling_group_recommendations.md | 7 ++-- ...uteoptimizer_ebs_volume_recommendations.md | 7 ++-- ...eoptimizer_ec2_instance_recommendations.md | 7 ++-- ...teoptimizer_ecs_service_recommendations.md | 7 ++-- ...ws_computeoptimizer_enrollment_statuses.md | 7 ++-- ...timizer_lambda_function_recommendations.md | 7 ++-- ...s_config_config_rule_compliance_details.md | 10 ++--- .../aws_config_config_rule_compliances.md | 8 ++-- .../docs/tables/aws_config_config_rules.md | 8 ++-- .../aws_config_configuration_aggregators.md | 7 ++-- .../aws_config_configuration_recorders.md | 7 ++-- .../tables/aws_config_conformance_packs.md | 8 ++-- .../aws_config_delivery_channel_statuses.md | 12 +++--- .../tables/aws_config_delivery_channels.md | 12 +++--- .../aws_config_remediation_configurations.md | 8 ++-- .../aws_config_retention_configurations.md | 11 ++--- .../docs/tables/aws_costexplorer_cost_30d.md | 11 ++--- .../aws_costexplorer_cost_forecast_30d.md | 11 ++--- .../aws/docs/tables/aws_dax_clusters.md | 7 ++-- .../source/aws/docs/tables/aws_db_proxies.md | 7 ++-- .../tables/aws_detective_graph_members.md | 12 +++--- .../aws/docs/tables/aws_detective_graphs.md | 8 ++-- .../tables/aws_directconnect_connections.md | 11 ++--- .../aws_directconnect_gateway_associations.md | 12 +++--- .../aws_directconnect_gateway_attachments.md | 16 ++++---- .../docs/tables/aws_directconnect_gateways.md | 10 ++--- .../aws/docs/tables/aws_directconnect_lags.md | 9 +++-- .../tables/aws_directconnect_locations.md | 11 ++--- .../aws_directconnect_virtual_gateways.md | 11 ++--- .../aws_directconnect_virtual_interfaces.md | 11 ++--- .../tables/aws_dms_replication_instances.md | 7 ++-- .../aws/docs/tables/aws_docdb_certificates.md | 9 +++-- .../aws_docdb_cluster_parameter_groups.md | 7 ++-- .../tables/aws_docdb_cluster_parameters.md | 16 ++++---- .../tables/aws_docdb_cluster_snapshots.md | 8 ++-- .../aws/docs/tables/aws_docdb_clusters.md | 8 ++-- .../docs/tables/aws_docdb_engine_versions.md | 14 +++---- .../docs/tables/aws_docdb_event_categories.md | 11 ++--- .../tables/aws_docdb_event_subscriptions.md | 7 ++-- .../aws/docs/tables/aws_docdb_events.md | 17 ++++---- .../docs/tables/aws_docdb_global_clusters.md | 7 ++-- .../aws/docs/tables/aws_docdb_instances.md | 8 ++-- ...aws_docdb_orderable_db_instance_options.md | 16 ++++---- .../aws_docdb_pending_maintenance_actions.md | 11 ++--- .../docs/tables/aws_docdb_subnet_groups.md | 7 ++-- .../aws/docs/tables/aws_dynamodb_backups.md | 7 ++-- .../aws/docs/tables/aws_dynamodb_exports.md | 7 ++-- .../docs/tables/aws_dynamodb_global_tables.md | 9 +++-- .../aws_dynamodb_table_continuous_backups.md | 8 ++-- ...ws_dynamodb_table_replica_auto_scalings.md | 10 ++--- .../aws/docs/tables/aws_dynamodb_tables.md | 8 ++-- .../tables/aws_dynamodbstreams_streams.md | 7 ++-- .../docs/tables/aws_ec2_account_attributes.md | 9 +++-- .../aws/docs/tables/aws_ec2_byoip_cidrs.md | 11 ++--- .../tables/aws_ec2_capacity_reservations.md | 7 ++-- .../docs/tables/aws_ec2_customer_gateways.md | 7 ++-- .../aws/docs/tables/aws_ec2_dhcp_options.md | 11 ++--- .../tables/aws_ec2_ebs_snapshot_attributes.md | 8 ++-- .../aws/docs/tables/aws_ec2_ebs_snapshots.md | 8 ++-- .../tables/aws_ec2_ebs_volume_statuses.md | 7 ++-- .../aws/docs/tables/aws_ec2_ebs_volumes.md | 7 ++-- .../aws_ec2_egress_only_internet_gateways.md | 7 ++-- .../source/aws/docs/tables/aws_ec2_eips.md | 11 ++--- .../aws/docs/tables/aws_ec2_flow_logs.md | 7 ++-- .../source/aws/docs/tables/aws_ec2_hosts.md | 7 ++-- .../aws_ec2_image_last_launched_times.md | 8 ++-- .../aws_ec2_image_launch_permissions.md | 8 ++-- .../source/aws/docs/tables/aws_ec2_images.md | 12 +++--- .../aws_ec2_instance_connect_endpoints.md | 11 ++--- .../docs/tables/aws_ec2_instance_statuses.md | 11 ++--- .../aws/docs/tables/aws_ec2_instance_types.md | 11 ++--- .../aws/docs/tables/aws_ec2_instances.md | 7 ++-- .../docs/tables/aws_ec2_internet_gateways.md | 7 ++-- .../aws/docs/tables/aws_ec2_key_pairs.md | 7 ++-- .../aws_ec2_launch_template_versions.md | 10 ++--- .../docs/tables/aws_ec2_launch_templates.md | 8 ++-- .../tables/aws_ec2_managed_prefix_lists.md | 11 ++--- .../aws/docs/tables/aws_ec2_nat_gateways.md | 7 ++-- .../aws/docs/tables/aws_ec2_network_acls.md | 7 ++-- .../docs/tables/aws_ec2_network_interfaces.md | 7 ++-- .../docs/tables/aws_ec2_regional_configs.md | 9 +++-- .../docs/tables/aws_ec2_reserved_instances.md | 7 ++-- .../aws/docs/tables/aws_ec2_route_tables.md | 7 ++-- .../docs/tables/aws_ec2_security_groups.md | 7 ++-- .../tables/aws_ec2_spot_fleet_instances.md | 8 ++-- .../tables/aws_ec2_spot_fleet_requests.md | 12 +++--- .../tables/aws_ec2_spot_instance_requests.md | 11 ++--- .../source/aws/docs/tables/aws_ec2_subnets.md | 11 ++--- .../aws_ec2_transit_gateway_attachments.md | 14 +++---- ...s_ec2_transit_gateway_multicast_domains.md | 14 +++---- ...ec2_transit_gateway_peering_attachments.md | 14 +++---- .../aws_ec2_transit_gateway_route_tables.md | 14 +++---- ...aws_ec2_transit_gateway_vpc_attachments.md | 14 +++---- .../docs/tables/aws_ec2_transit_gateways.md | 12 +++--- .../aws_ec2_vpc_endpoint_connections.md | 13 +++--- ...ec2_vpc_endpoint_service_configurations.md | 11 ++--- ...ws_ec2_vpc_endpoint_service_permissions.md | 12 +++--- .../tables/aws_ec2_vpc_endpoint_services.md | 12 +++--- .../aws/docs/tables/aws_ec2_vpc_endpoints.md | 7 ++-- .../tables/aws_ec2_vpc_peering_connections.md | 7 ++-- .../source/aws/docs/tables/aws_ec2_vpcs.md | 7 ++-- .../docs/tables/aws_ec2_vpn_connections.md | 11 ++--- .../aws/docs/tables/aws_ec2_vpn_gateways.md | 7 ++-- .../aws_ecr_pull_through_cache_rules.md | 15 +++---- .../aws/docs/tables/aws_ecr_registries.md | 11 ++--- .../docs/tables/aws_ecr_registry_policies.md | 11 ++--- .../aws/docs/tables/aws_ecr_repositories.md | 10 ++--- .../aws_ecr_repository_image_scan_findings.md | 12 +++--- .../docs/tables/aws_ecr_repository_images.md | 12 +++--- .../aws_ecr_repository_lifecycle_policies.md | 10 ++--- .../tables/aws_ecr_repository_policies.md | 10 ++--- .../docs/tables/aws_ecrpublic_repositories.md | 8 ++-- .../tables/aws_ecrpublic_repository_images.md | 8 ++-- .../aws_ecs_cluster_container_instances.md | 8 ++-- .../docs/tables/aws_ecs_cluster_services.md | 10 ++--- .../docs/tables/aws_ecs_cluster_task_sets.md | 8 ++-- .../aws/docs/tables/aws_ecs_cluster_tasks.md | 8 ++-- .../aws/docs/tables/aws_ecs_clusters.md | 8 ++-- .../docs/tables/aws_ecs_task_definitions.md | 7 ++-- .../aws/docs/tables/aws_efs_access_points.md | 7 ++-- .../aws/docs/tables/aws_efs_filesystems.md | 7 ++-- .../aws/docs/tables/aws_eks_cluster_addons.md | 10 ++--- .../tables/aws_eks_cluster_node_groups.md | 8 ++-- ..._cluster_oidc_identity_provider_configs.md | 10 ++--- .../aws/docs/tables/aws_eks_clusters.md | 8 ++-- .../docs/tables/aws_eks_fargate_profiles.md | 8 ++-- .../docs/tables/aws_elasticache_clusters.md | 7 ++-- .../tables/aws_elasticache_engine_versions.md | 13 +++--- .../aws/docs/tables/aws_elasticache_events.md | 7 ++-- ...s_elasticache_global_replication_groups.md | 7 ++-- .../aws_elasticache_parameter_groups.md | 7 ++-- .../aws_elasticache_replication_groups.md | 7 ++-- .../aws_elasticache_reserved_cache_nodes.md | 7 ++-- ...sticache_reserved_cache_nodes_offerings.md | 11 ++--- .../tables/aws_elasticache_service_updates.md | 7 ++-- .../docs/tables/aws_elasticache_snapshots.md | 7 ++-- .../tables/aws_elasticache_subnet_groups.md | 7 ++-- .../tables/aws_elasticache_update_actions.md | 15 +++---- .../tables/aws_elasticache_user_groups.md | 7 ++-- .../aws/docs/tables/aws_elasticache_users.md | 7 ++-- ...s_elasticbeanstalk_application_versions.md | 7 ++-- .../aws_elasticbeanstalk_applications.md | 9 +++-- ..._elasticbeanstalk_configuration_options.md | 14 +++---- ...elasticbeanstalk_configuration_settings.md | 12 +++--- .../aws_elasticbeanstalk_environments.md | 8 ++-- .../docs/tables/aws_elasticsearch_domains.md | 7 ++-- .../docs/tables/aws_elasticsearch_packages.md | 11 ++--- .../docs/tables/aws_elasticsearch_versions.md | 11 ++--- .../tables/aws_elasticsearch_vpc_endpoints.md | 7 ++-- .../aws_elastictranscoder_pipeline_jobs.md | 8 ++-- .../tables/aws_elastictranscoder_pipelines.md | 8 ++-- .../tables/aws_elastictranscoder_presets.md | 7 ++-- .../aws_elbv1_load_balancer_policies.md | 10 ++--- .../docs/tables/aws_elbv1_load_balancers.md | 8 ++-- .../tables/aws_elbv2_listener_certificates.md | 10 ++--- .../docs/tables/aws_elbv2_listener_rules.md | 8 ++-- .../aws/docs/tables/aws_elbv2_listeners.md | 8 ++-- .../aws_elbv2_load_balancer_attributes.md | 10 ++--- .../aws_elbv2_load_balancer_web_acls.md | 10 ++--- .../docs/tables/aws_elbv2_load_balancers.md | 8 ++-- ...target_group_target_health_descriptions.md | 12 +++--- .../docs/tables/aws_elbv2_target_groups.md | 8 ++-- .../aws_emr_block_public_access_configs.md | 9 +++-- .../tables/aws_emr_cluster_instance_fleets.md | 10 ++--- .../tables/aws_emr_cluster_instance_groups.md | 10 ++--- .../docs/tables/aws_emr_cluster_instances.md | 8 ++-- .../aws/docs/tables/aws_emr_clusters.md | 8 ++-- .../tables/aws_emr_notebook_executions.md | 8 ++-- .../aws/docs/tables/aws_emr_release_labels.md | 12 +++--- .../tables/aws_emr_security_configurations.md | 11 ++--- .../source/aws/docs/tables/aws_emr_steps.md | 10 ++--- .../tables/aws_emr_studio_session_mappings.md | 12 +++--- .../source/aws/docs/tables/aws_emr_studios.md | 8 ++-- .../aws_emr_supported_instance_types.md | 14 +++---- .../aws_eventbridge_api_destinations.md | 7 ++-- .../docs/tables/aws_eventbridge_archives.md | 7 ++-- .../tables/aws_eventbridge_connections.md | 7 ++-- .../docs/tables/aws_eventbridge_endpoints.md | 7 ++-- .../tables/aws_eventbridge_event_bus_rules.md | 8 ++-- .../aws_eventbridge_event_bus_targets.md | 12 +++--- .../tables/aws_eventbridge_event_buses.md | 8 ++-- .../tables/aws_eventbridge_event_sources.md | 7 ++-- .../docs/tables/aws_eventbridge_replays.md | 7 ++-- .../tables/aws_firehose_delivery_streams.md | 7 ++-- .../tables/aws_frauddetector_batch_imports.md | 7 ++-- .../aws_frauddetector_batch_predictions.md | 7 ++-- .../tables/aws_frauddetector_detectors.md | 8 ++-- .../tables/aws_frauddetector_entity_types.md | 7 ++-- .../tables/aws_frauddetector_event_types.md | 7 ++-- .../aws_frauddetector_external_models.md | 7 ++-- .../docs/tables/aws_frauddetector_labels.md | 7 ++-- .../aws_frauddetector_model_versions.md | 8 ++-- .../docs/tables/aws_frauddetector_models.md | 8 ++-- .../docs/tables/aws_frauddetector_outcomes.md | 7 ++-- .../docs/tables/aws_frauddetector_rules.md | 8 ++-- .../tables/aws_frauddetector_variables.md | 7 ++-- .../source/aws/docs/tables/aws_fsx_backups.md | 11 ++--- .../aws_fsx_data_repository_associations.md | 7 ++-- .../tables/aws_fsx_data_repository_tasks.md | 7 ++-- .../aws/docs/tables/aws_fsx_file_caches.md | 7 ++-- .../aws/docs/tables/aws_fsx_file_systems.md | 7 ++-- .../aws/docs/tables/aws_fsx_snapshots.md | 7 ++-- .../aws_fsx_storage_virtual_machines.md | 7 ++-- .../source/aws/docs/tables/aws_fsx_volumes.md | 7 ++-- .../aws_glacier_data_retrieval_policies.md | 9 +++-- .../aws_glacier_vault_access_policies.md | 8 ++-- .../tables/aws_glacier_vault_lock_policies.md | 8 ++-- .../tables/aws_glacier_vault_notifications.md | 8 ++-- .../aws/docs/tables/aws_glacier_vaults.md | 8 ++-- .../aws/docs/tables/aws_glue_classifiers.md | 11 ++--- .../aws/docs/tables/aws_glue_connections.md | 7 ++-- .../aws/docs/tables/aws_glue_crawlers.md | 7 ++-- .../tables/aws_glue_database_table_indexes.md | 12 +++--- .../docs/tables/aws_glue_database_tables.md | 10 ++--- .../aws/docs/tables/aws_glue_databases.md | 8 ++-- ...ws_glue_datacatalog_encryption_settings.md | 9 +++-- .../aws/docs/tables/aws_glue_dev_endpoints.md | 7 ++-- .../aws/docs/tables/aws_glue_job_runs.md | 10 ++--- .../source/aws/docs/tables/aws_glue_jobs.md | 8 ++-- .../tables/aws_glue_ml_transform_task_runs.md | 10 ++--- .../aws/docs/tables/aws_glue_ml_transforms.md | 8 ++-- .../aws/docs/tables/aws_glue_registries.md | 8 ++-- .../aws_glue_registry_schema_versions.md | 10 ++--- .../docs/tables/aws_glue_registry_schemas.md | 8 ++-- .../aws_glue_security_configurations.md | 11 ++--- .../aws/docs/tables/aws_glue_triggers.md | 7 ++-- .../aws/docs/tables/aws_glue_workflows.md | 7 ++-- .../tables/aws_guardduty_detector_filters.md | 14 +++---- .../tables/aws_guardduty_detector_findings.md | 14 +++---- .../aws_guardduty_detector_intel_sets.md | 14 +++---- .../tables/aws_guardduty_detector_ip_sets.md | 14 +++---- .../tables/aws_guardduty_detector_members.md | 14 +++---- ...rdduty_detector_publishing_destinations.md | 14 +++---- .../docs/tables/aws_guardduty_detectors.md | 12 +++--- .../aws_iam_account_authorization_details.md | 7 ++-- .../aws/docs/tables/aws_iam_accounts.md | 7 ++-- .../docs/tables/aws_iam_credential_reports.md | 9 +++-- .../tables/aws_iam_group_attached_policies.md | 12 +++--- .../aws_iam_group_last_accessed_details.md | 12 +++--- .../aws/docs/tables/aws_iam_group_policies.md | 12 +++--- .../source/aws/docs/tables/aws_iam_groups.md | 10 ++--- .../docs/tables/aws_iam_instance_profiles.md | 9 +++-- .../aws/docs/tables/aws_iam_mfa_devices.md | 8 ++-- ...s_iam_openid_connect_identity_providers.md | 7 ++-- .../docs/tables/aws_iam_password_policies.md | 7 ++-- .../aws/docs/tables/aws_iam_policies.md | 10 ++--- .../aws_iam_policy_last_accessed_details.md | 12 +++--- .../docs/tables/aws_iam_policy_versions.md | 12 +++--- .../tables/aws_iam_role_attached_policies.md | 12 +++--- .../aws_iam_role_last_accessed_details.md | 12 +++--- .../aws/docs/tables/aws_iam_role_policies.md | 12 +++--- .../source/aws/docs/tables/aws_iam_roles.md | 10 ++--- .../tables/aws_iam_saml_identity_providers.md | 7 ++-- .../tables/aws_iam_server_certificates.md | 9 +++-- .../tables/aws_iam_signing_certificates.md | 12 +++--- .../docs/tables/aws_iam_ssh_public_keys.md | 12 +++--- .../docs/tables/aws_iam_user_access_keys.md | 12 +++--- .../tables/aws_iam_user_attached_policies.md | 12 +++--- .../aws/docs/tables/aws_iam_user_groups.md | 12 +++--- .../aws_iam_user_last_accessed_details.md | 12 +++--- .../aws/docs/tables/aws_iam_user_policies.md | 12 +++--- .../source/aws/docs/tables/aws_iam_users.md | 10 ++--- .../tables/aws_iam_virtual_mfa_devices.md | 7 ++-- .../aws_identitystore_group_memberships.md | 14 +++---- .../docs/tables/aws_identitystore_groups.md | 12 +++--- .../docs/tables/aws_identitystore_users.md | 11 ++--- .../aws_inspector2_covered_resources.md | 13 +++--- .../docs/tables/aws_inspector2_findings.md | 11 ++--- .../aws/docs/tables/aws_inspector_findings.md | 7 ++-- .../aws/docs/tables/aws_iot_billing_groups.md | 7 ++-- .../docs/tables/aws_iot_ca_certificates.md | 7 ++-- .../aws/docs/tables/aws_iot_certificates.md | 7 ++-- .../source/aws/docs/tables/aws_iot_jobs.md | 7 ++-- .../aws/docs/tables/aws_iot_policies.md | 7 ++-- .../docs/tables/aws_iot_security_profiles.md | 7 ++-- .../source/aws/docs/tables/aws_iot_streams.md | 7 ++-- .../aws/docs/tables/aws_iot_thing_groups.md | 7 ++-- .../aws/docs/tables/aws_iot_thing_types.md | 7 ++-- .../source/aws/docs/tables/aws_iot_things.md | 7 ++-- .../aws/docs/tables/aws_iot_topic_rules.md | 7 ++-- .../tables/aws_kafka_cluster_operations.md | 8 ++-- .../aws/docs/tables/aws_kafka_clusters.md | 8 ++-- .../docs/tables/aws_kafka_configurations.md | 7 ++-- .../source/aws/docs/tables/aws_kafka_nodes.md | 8 ++-- .../aws/docs/tables/aws_kinesis_streams.md | 7 ++-- .../source/aws/docs/tables/aws_kms_aliases.md | 7 ++-- .../aws/docs/tables/aws_kms_key_grants.md | 10 ++--- .../aws/docs/tables/aws_kms_key_policies.md | 10 ++--- .../source/aws/docs/tables/aws_kms_keys.md | 8 ++-- .../tables/aws_lambda_function_aliases.md | 8 ++-- ...aws_lambda_function_concurrency_configs.md | 8 ++-- ...ws_lambda_function_event_invoke_configs.md | 8 ++-- ...s_lambda_function_event_source_mappings.md | 12 +++--- .../tables/aws_lambda_function_url_configs.md | 8 ++-- .../tables/aws_lambda_function_versions.md | 10 ++--- .../aws/docs/tables/aws_lambda_functions.md | 8 ++-- .../aws_lambda_layer_version_policies.md | 10 ++--- .../docs/tables/aws_lambda_layer_versions.md | 8 ++-- .../aws/docs/tables/aws_lambda_layers.md | 8 ++-- .../aws/docs/tables/aws_lambda_runtimes.md | 7 ++-- .../aws/docs/tables/aws_lightsail_alarms.md | 7 ++-- .../aws_lightsail_bucket_access_keys.md | 10 ++--- .../aws/docs/tables/aws_lightsail_buckets.md | 8 ++-- .../docs/tables/aws_lightsail_certificates.md | 7 ++-- ...lightsail_container_service_deployments.md | 10 ++--- .../aws_lightsail_container_service_images.md | 10 ++--- .../aws_lightsail_container_services.md | 8 ++-- .../tables/aws_lightsail_database_events.md | 10 ++--- .../aws_lightsail_database_log_events.md | 10 ++--- .../aws_lightsail_database_parameters.md | 10 ++--- .../aws_lightsail_database_snapshots.md | 7 ++-- .../docs/tables/aws_lightsail_databases.md | 8 ++-- .../tables/aws_lightsail_disk_snapshots.md | 8 ++-- .../aws/docs/tables/aws_lightsail_disks.md | 8 ++-- .../tables/aws_lightsail_distributions.md | 7 ++-- .../aws_lightsail_instance_port_states.md | 16 ++++---- .../aws_lightsail_instance_snapshots.md | 7 ++-- .../docs/tables/aws_lightsail_instances.md | 8 ++-- ...ightsail_load_balancer_tls_certificates.md | 8 ++-- .../tables/aws_lightsail_load_balancers.md | 8 ++-- .../docs/tables/aws_lightsail_static_ips.md | 7 ++-- .../aws_mq_broker_configuration_revisions.md | 12 +++--- .../tables/aws_mq_broker_configurations.md | 8 ++-- .../aws/docs/tables/aws_mq_broker_users.md | 10 ++--- .../source/aws/docs/tables/aws_mq_brokers.md | 8 ++-- .../aws/docs/tables/aws_mwaa_environments.md | 7 ++-- ...tune_cluster_parameter_group_parameters.md | 10 ++--- .../aws_neptune_cluster_parameter_groups.md | 8 ++-- .../tables/aws_neptune_cluster_snapshots.md | 7 ++-- .../aws/docs/tables/aws_neptune_clusters.md | 7 ++-- ...eptune_db_parameter_group_db_parameters.md | 10 ++--- .../tables/aws_neptune_db_parameter_groups.md | 8 ++-- .../tables/aws_neptune_event_subscriptions.md | 7 ++-- .../tables/aws_neptune_global_clusters.md | 7 ++-- .../aws/docs/tables/aws_neptune_instances.md | 7 ++-- .../docs/tables/aws_neptune_subnet_groups.md | 7 ++-- .../aws_networkfirewall_firewall_policies.md | 7 ++-- .../tables/aws_networkfirewall_firewalls.md | 7 ++-- .../tables/aws_networkfirewall_rule_groups.md | 7 ++-- ...kfirewall_tls_inspection_configurations.md | 7 ++-- .../aws_networkmanager_global_networks.md | 10 ++--- .../docs/tables/aws_networkmanager_links.md | 12 +++--- .../docs/tables/aws_networkmanager_sites.md | 12 +++--- ...rkmanager_transit_gateway_registrations.md | 12 +++--- .../aws_organization_resource_policies.md | 7 ++-- .../aws/docs/tables/aws_organizations.md | 9 +++-- .../aws_organizations_account_parents.md | 14 +++---- .../docs/tables/aws_organizations_accounts.md | 10 ++--- ..._organizations_delegated_administrators.md | 10 ++--- .../aws_organizations_delegated_services.md | 10 ++--- ...ganizations_organizational_unit_parents.md | 14 +++---- .../aws_organizations_organizational_units.md | 10 ++--- .../docs/tables/aws_organizations_policies.md | 9 +++-- .../docs/tables/aws_organizations_roots.md | 9 +++-- ...aws_qldb_ledger_journal_kinesis_streams.md | 8 ++-- .../aws_qldb_ledger_journal_s3_exports.md | 10 ++--- .../aws/docs/tables/aws_qldb_ledgers.md | 8 ++-- .../docs/tables/aws_quicksight_analyses.md | 11 ++--- .../docs/tables/aws_quicksight_dashboards.md | 11 ++--- .../docs/tables/aws_quicksight_data_sets.md | 12 +++--- .../tables/aws_quicksight_data_sources.md | 11 ++--- .../aws/docs/tables/aws_quicksight_folders.md | 11 ++--- .../tables/aws_quicksight_group_members.md | 14 +++---- .../aws/docs/tables/aws_quicksight_groups.md | 12 +++--- .../docs/tables/aws_quicksight_ingestions.md | 14 +++---- .../docs/tables/aws_quicksight_templates.md | 11 ++--- .../aws/docs/tables/aws_quicksight_users.md | 11 ++--- .../aws/docs/tables/aws_ram_principals.md | 13 +++--- .../aws_ram_resource_share_associations.md | 9 +++-- .../aws_ram_resource_share_invitations.md | 13 +++--- .../aws_ram_resource_share_permissions.md | 16 ++++---- .../docs/tables/aws_ram_resource_shares.md | 12 +++--- .../aws/docs/tables/aws_ram_resource_types.md | 13 +++--- .../aws/docs/tables/aws_ram_resources.md | 13 +++--- .../aws/docs/tables/aws_rds_certificates.md | 9 +++-- .../docs/tables/aws_rds_cluster_backtracks.md | 10 ++--- ..._rds_cluster_parameter_group_parameters.md | 10 ++--- .../aws_rds_cluster_parameter_groups.md | 8 ++-- .../docs/tables/aws_rds_cluster_parameters.md | 10 ++--- .../docs/tables/aws_rds_cluster_snapshots.md | 7 ++-- .../aws/docs/tables/aws_rds_clusters.md | 8 ++-- ...ws_rds_db_parameter_group_db_parameters.md | 10 ++--- .../tables/aws_rds_db_parameter_groups.md | 8 ++-- .../docs/tables/aws_rds_db_security_groups.md | 7 ++-- .../aws/docs/tables/aws_rds_db_snapshots.md | 7 ++-- .../docs/tables/aws_rds_engine_versions.md | 12 +++--- .../tables/aws_rds_event_subscriptions.md | 7 ++-- .../aws/docs/tables/aws_rds_instances.md | 7 ++-- .../aws/docs/tables/aws_rds_option_groups.md | 7 ++-- .../docs/tables/aws_rds_reserved_instances.md | 7 ++-- .../aws/docs/tables/aws_rds_subnet_groups.md | 7 ++-- .../aws_redshift_cluster_parameter_groups.md | 10 ++--- .../tables/aws_redshift_cluster_parameters.md | 10 ++--- .../aws/docs/tables/aws_redshift_clusters.md | 8 ++-- .../docs/tables/aws_redshift_data_shares.md | 9 +++-- .../tables/aws_redshift_endpoint_accesses.md | 14 +++---- .../aws_redshift_endpoint_authorizations.md | 14 +++---- .../aws_redshift_event_subscriptions.md | 7 ++-- .../aws/docs/tables/aws_redshift_events.md | 11 ++--- .../aws/docs/tables/aws_redshift_snapshots.md | 8 ++-- .../docs/tables/aws_redshift_subnet_groups.md | 7 ++-- plugins/source/aws/docs/tables/aws_regions.md | 9 +++-- ...aws_resiliencehub_alarm_recommendations.md | 12 +++--- .../aws_resiliencehub_app_assessments.md | 10 ++--- ...resiliencehub_app_component_compliances.md | 12 +++--- ...liencehub_app_version_resource_mappings.md | 12 +++--- ...aws_resiliencehub_app_version_resources.md | 12 +++--- .../tables/aws_resiliencehub_app_versions.md | 10 ++--- .../aws/docs/tables/aws_resiliencehub_apps.md | 8 ++-- ...resiliencehub_component_recommendations.md | 12 +++--- ..._resiliencehub_recommendation_templates.md | 12 +++--- .../aws_resiliencehub_resiliency_policies.md | 7 ++-- .../aws_resiliencehub_sop_recommendations.md | 12 +++--- ...liencehub_suggested_resiliency_policies.md | 7 ++-- .../aws_resiliencehub_test_recommendations.md | 12 +++--- .../aws_resourcegroups_resource_groups.md | 7 ++-- .../tables/aws_route53_delegation_sets.md | 7 ++-- .../aws/docs/tables/aws_route53_domains.md | 9 +++-- .../docs/tables/aws_route53_health_checks.md | 7 ++-- ...ute53_hosted_zone_query_logging_configs.md | 8 ++-- ...oute53_hosted_zone_resource_record_sets.md | 12 +++--- ...53_hosted_zone_traffic_policy_instances.md | 10 ++--- .../docs/tables/aws_route53_hosted_zones.md | 8 ++-- .../aws/docs/tables/aws_route53_operations.md | 15 +++---- .../tables/aws_route53_traffic_policies.md | 8 ++-- .../aws_route53_traffic_policy_versions.md | 12 +++--- ...s_route53recoverycontrolconfig_clusters.md | 9 +++-- ...e53recoverycontrolconfig_control_panels.md | 8 ++-- ...3recoverycontrolconfig_routing_controls.md | 10 ++--- ...ute53recoverycontrolconfig_safety_rules.md | 8 ++-- .../aws_route53recoveryreadiness_cells.md | 7 ++-- ...ute53recoveryreadiness_readiness_checks.md | 7 ++-- ...oute53recoveryreadiness_recovery_groups.md | 7 ++-- ..._route53recoveryreadiness_resource_sets.md | 7 ++-- .../aws_route53resolver_firewall_configs.md | 11 ++--- ...s_route53resolver_firewall_domain_lists.md | 7 ++-- ...solver_firewall_rule_group_associations.md | 7 ++-- ...ws_route53resolver_firewall_rule_groups.md | 7 ++-- .../aws_route53resolver_resolver_endpoints.md | 7 ++-- ..._resolver_query_log_config_associations.md | 11 ++--- ...te53resolver_resolver_query_log_configs.md | 7 ++-- ...te53resolver_resolver_rule_associations.md | 11 ++--- .../aws_route53resolver_resolver_rules.md | 7 ++-- .../aws/docs/tables/aws_s3_access_points.md | 7 ++-- .../source/aws/docs/tables/aws_s3_accounts.md | 7 ++-- .../docs/tables/aws_s3_bucket_cors_rules.md | 10 ++--- .../tables/aws_s3_bucket_encryption_rules.md | 8 ++-- .../aws/docs/tables/aws_s3_bucket_grants.md | 14 +++---- .../docs/tables/aws_s3_bucket_lifecycles.md | 10 ++--- .../aws/docs/tables/aws_s3_bucket_loggings.md | 8 ++-- ...s_s3_bucket_notification_configurations.md | 8 ++-- ...ws_s3_bucket_object_lock_configurations.md | 8 ++-- .../aws_s3_bucket_ownership_controls.md | 10 ++--- .../aws/docs/tables/aws_s3_bucket_policies.md | 8 ++-- .../aws_s3_bucket_public_access_blocks.md | 8 ++-- .../docs/tables/aws_s3_bucket_replications.md | 8 ++-- .../docs/tables/aws_s3_bucket_versionings.md | 8 ++-- .../aws/docs/tables/aws_s3_bucket_websites.md | 8 ++-- .../source/aws/docs/tables/aws_s3_buckets.md | 8 ++-- .../aws_s3_multi_region_access_points.md | 7 ++-- .../aws/docs/tables/aws_sagemaker_apps.md | 7 ++-- .../aws_sagemaker_endpoint_configurations.md | 7 ++-- .../aws/docs/tables/aws_sagemaker_models.md | 7 ++-- .../aws_sagemaker_notebook_instances.md | 7 ++-- .../tables/aws_sagemaker_training_jobs.md | 7 ++-- .../aws/docs/tables/aws_savingsplans_plans.md | 7 ++-- .../tables/aws_scheduler_schedule_groups.md | 7 ++-- .../docs/tables/aws_scheduler_schedules.md | 7 ++-- .../aws_secretsmanager_secret_versions.md | 10 ++--- .../docs/tables/aws_secretsmanager_secrets.md | 8 ++-- .../aws_securityhub_enabled_standards.md | 13 +++--- .../docs/tables/aws_securityhub_findings.md | 29 +++++++------- .../aws/docs/tables/aws_securityhub_hubs.md | 11 ++--- .../tables/aws_servicecatalog_launch_paths.md | 16 ++++---- .../tables/aws_servicecatalog_portfolios.md | 7 ++-- .../tables/aws_servicecatalog_products.md | 7 ++-- ...aws_servicecatalog_provisioned_products.md | 8 ++-- ...s_servicecatalog_provisioning_artifacts.md | 12 +++--- ..._servicecatalog_provisioning_parameters.md | 18 ++++----- .../tables/aws_servicediscovery_instances.md | 12 +++--- .../tables/aws_servicediscovery_namespaces.md | 7 ++-- .../tables/aws_servicediscovery_services.md | 8 ++-- .../docs/tables/aws_servicequotas_quotas.md | 8 ++-- .../docs/tables/aws_servicequotas_services.md | 14 +++---- .../aws_ses_active_receipt_rule_sets.md | 11 ++--- ...es_configuration_set_event_destinations.md | 14 +++---- .../docs/tables/aws_ses_configuration_sets.md | 8 ++-- .../aws/docs/tables/aws_ses_contact_lists.md | 11 ++--- ...ses_custom_verification_email_templates.md | 7 ++-- .../aws/docs/tables/aws_ses_identities.md | 7 ++-- .../aws/docs/tables/aws_ses_templates.md | 7 ++-- .../aws/docs/tables/aws_shield_attacks.md | 7 ++-- .../tables/aws_shield_protection_groups.md | 7 ++-- .../aws/docs/tables/aws_shield_protections.md | 7 ++-- .../docs/tables/aws_shield_subscriptions.md | 7 ++-- .../tables/aws_signer_signing_profiles.md | 7 ++-- .../aws/docs/tables/aws_sns_subscriptions.md | 7 ++-- .../source/aws/docs/tables/aws_sns_topics.md | 7 ++-- .../source/aws/docs/tables/aws_sqs_queues.md | 7 ++-- .../aws/docs/tables/aws_ssm_associations.md | 11 ++--- .../aws_ssm_compliance_summary_items.md | 11 ++--- .../docs/tables/aws_ssm_document_versions.md | 10 ++--- .../aws/docs/tables/aws_ssm_documents.md | 8 ++-- .../aws_ssm_instance_compliance_items.md | 10 ++--- .../docs/tables/aws_ssm_instance_patches.md | 10 ++--- .../aws/docs/tables/aws_ssm_instances.md | 8 ++-- .../aws/docs/tables/aws_ssm_inventories.md | 11 ++--- .../docs/tables/aws_ssm_inventory_schemas.md | 13 +++--- .../aws/docs/tables/aws_ssm_parameters.md | 11 ++--- .../docs/tables/aws_ssm_patch_baselines.md | 11 ++--- .../aws/docs/tables/aws_ssm_sessions.md | 11 ++--- .../aws/docs/tables/aws_ssoadmin_instances.md | 8 ++-- ...dmin_permission_set_account_assignments.md | 16 ++++---- ...ermission_set_customer_managed_policies.md | 14 +++---- ...ssoadmin_permission_set_inline_policies.md | 10 ++--- ...soadmin_permission_set_managed_policies.md | 12 +++--- ...n_permission_set_permissions_boundaries.md | 10 ++--- .../tables/aws_ssoadmin_permission_sets.md | 10 ++--- .../tables/aws_stepfunctions_activities.md | 7 ++-- .../tables/aws_stepfunctions_executions.md | 8 ++-- .../aws_stepfunctions_map_run_executions.md | 8 ++-- .../docs/tables/aws_stepfunctions_map_runs.md | 8 ++-- .../aws_stepfunctions_state_machines.md | 8 ++-- .../tables/aws_support_case_communications.md | 12 +++--- .../aws/docs/tables/aws_support_cases.md | 12 +++--- .../aws/docs/tables/aws_support_services.md | 13 +++--- .../tables/aws_support_severity_levels.md | 13 +++--- ...s_support_trusted_advisor_check_results.md | 14 +++---- ...support_trusted_advisor_check_summaries.md | 14 +++---- .../aws_support_trusted_advisor_checks.md | 14 +++---- .../docs/tables/aws_timestream_databases.md | 8 ++-- .../aws/docs/tables/aws_timestream_tables.md | 8 ++-- .../aws/docs/tables/aws_transfer_servers.md | 7 ++-- .../aws/docs/tables/aws_waf_rule_groups.md | 7 ++-- .../source/aws/docs/tables/aws_waf_rules.md | 7 ++-- .../tables/aws_waf_subscribed_rule_groups.md | 9 +++-- .../aws/docs/tables/aws_waf_web_acls.md | 7 ++-- .../aws_wafregional_rate_based_rules.md | 7 ++-- .../tables/aws_wafregional_rule_groups.md | 7 ++-- .../aws/docs/tables/aws_wafregional_rules.md | 7 ++-- .../docs/tables/aws_wafregional_web_acls.md | 7 ++-- .../aws/docs/tables/aws_wafv2_ipsets.md | 7 ++-- .../tables/aws_wafv2_managed_rule_groups.md | 15 +++---- .../tables/aws_wafv2_regex_pattern_sets.md | 7 ++-- .../aws/docs/tables/aws_wafv2_rule_groups.md | 7 ++-- .../aws/docs/tables/aws_wafv2_web_acls.md | 7 ++-- ...ellarchitected_lens_review_improvements.md | 16 ++++---- .../aws_wellarchitected_lens_reviews.md | 12 +++--- .../docs/tables/aws_wellarchitected_lenses.md | 11 ++--- .../aws_wellarchitected_share_invitations.md | 11 ++--- ...aws_wellarchitected_workload_milestones.md | 10 ++--- .../aws_wellarchitected_workload_shares.md | 10 ++--- .../tables/aws_wellarchitected_workloads.md | 8 ++-- .../docs/tables/aws_workspaces_directories.md | 7 ++-- .../docs/tables/aws_workspaces_workspaces.md | 7 ++-- .../tables/aws_xray_encryption_configs.md | 13 +++--- .../source/aws/docs/tables/aws_xray_groups.md | 7 ++-- .../docs/tables/aws_xray_resource_policies.md | 13 +++--- .../docs/tables/aws_xray_sampling_rules.md | 7 ++-- plugins/source/aws/go.mod | 19 ++++----- plugins/source/aws/go.sum | 39 +++++++++--------- .../accessanalyzer/analyzer_archive_rules.go | 10 ++--- .../accessanalyzer/analyzer_findings.go | 10 ++--- .../services/accessanalyzer/analyzers.go | 2 +- .../services/account/alternate_contacts.go | 8 ++-- .../resources/services/acm/certificates.go | 8 ++-- .../acmpca/certificate_authorities.go | 8 ++-- .../services/amp/rule_groups_namespaces.go | 8 ++-- .../aws/resources/services/amp/workspaces.go | 8 ++-- .../aws/resources/services/amplify/apps.go | 8 ++-- .../resources/services/apigateway/api_keys.go | 8 ++-- .../apigateway/client_certificates.go | 8 ++-- .../domain_name_base_path_mappings.go | 8 ++-- .../services/apigateway/domain_names.go | 8 ++-- .../apigateway/rest_api_authorizers.go | 8 ++-- .../apigateway/rest_api_deployments.go | 8 ++-- .../rest_api_documentation_parts.go | 8 ++-- .../rest_api_documentation_versions.go | 8 ++-- .../apigateway/rest_api_gateway_responses.go | 8 ++-- .../services/apigateway/rest_api_models.go | 8 ++-- .../apigateway/rest_api_request_validators.go | 8 ++-- .../rest_api_resource_method_integration.go | 8 ++-- .../apigateway/rest_api_resource_methods.go | 8 ++-- .../services/apigateway/rest_api_resources.go | 8 ++-- .../services/apigateway/rest_api_stages.go | 8 ++-- .../services/apigateway/rest_apis.go | 8 ++-- .../services/apigateway/usage_plan_keys.go | 8 ++-- .../services/apigateway/usage_plans.go | 8 ++-- .../services/apigateway/vpc_links.go | 8 ++-- .../services/apigatewayv2/api_authorizers.go | 8 ++-- .../services/apigatewayv2/api_deployments.go | 8 ++-- .../apigatewayv2/api_integration_responses.go | 8 ++-- .../services/apigatewayv2/api_integrations.go | 8 ++-- .../services/apigatewayv2/api_models.go | 8 ++-- .../apigatewayv2/api_route_responses.go | 8 ++-- .../services/apigatewayv2/api_routes.go | 8 ++-- .../services/apigatewayv2/api_stages.go | 8 ++-- .../resources/services/apigatewayv2/apis.go | 8 ++-- .../domain_name_rest_api_mappings.go | 8 ++-- .../services/apigatewayv2/domain_names.go | 8 ++-- .../services/apigatewayv2/vpc_links.go | 8 ++-- .../services/appconfig/applications.go | 8 ++-- .../appconfig/configuration_profiles.go | 16 ++++---- .../appconfig/deployment_strategies.go | 8 ++-- .../services/appconfig/environments.go | 16 ++++---- .../appconfig/hosted_config_versions.go | 16 ++++---- .../aws/resources/services/appflow/flows.go | 8 ++-- .../applicationautoscaling/policies.go | 8 ++-- .../scalable_targets.go | 2 +- .../scaling_activities.go | 2 +- .../scheduled_actions.go | 8 ++-- .../aws/resources/services/appmesh/meshes.go | 24 +++++------ .../services/appmesh/virtual_gateways.go | 32 +++++++-------- .../services/appmesh/virtual_nodes.go | 32 +++++++-------- .../services/appmesh/virtual_routers.go | 32 +++++++-------- .../services/appmesh/virtual_services.go | 32 +++++++-------- .../apprunner/auto_scaling_configurations.go | 8 ++-- .../services/apprunner/connections.go | 8 ++-- .../services/apprunner/custom_domains.go | 10 ++--- .../apprunner/observability_configurations.go | 8 ++-- .../services/apprunner/operations.go | 10 ++--- .../resources/services/apprunner/services.go | 8 ++-- .../services/apprunner/vpc_connectors.go | 8 ++-- .../apprunner/vpc_ingress_connections.go | 8 ++-- .../services/appstream/app_blocks.go | 8 ++-- .../application_fleet_associations.go | 16 ++++---- .../services/appstream/applications.go | 8 ++-- .../services/appstream/directory_configs.go | 8 ++-- .../resources/services/appstream/fleets.go | 8 ++-- .../services/appstream/image_builders.go | 8 ++-- .../resources/services/appstream/images.go | 2 +- .../services/appstream/stack_entitlements.go | 16 ++++---- .../appstream/stack_user_associations.go | 24 +++++------ .../resources/services/appstream/stacks.go | 8 ++-- .../appstream/usage_report_subscriptions.go | 8 ++-- .../aws/resources/services/appstream/users.go | 8 ++-- .../services/appsync/graphql_apis.go | 8 ++-- .../athena/data_catalog_database_tables.go | 24 +++++------ .../services/athena/data_catalog_databases.go | 16 ++++---- .../services/athena/data_catalogs.go | 8 ++-- .../athena/work_group_named_queries.go | 10 ++--- .../athena/work_group_prepared_statements.go | 10 ++--- .../athena/work_group_query_executions.go | 10 ++--- .../resources/services/athena/work_groups.go | 8 ++-- .../services/auditmanager/assesments.go | 2 +- .../autoscaling/group_lifecycle_hooks.go | 10 ++--- .../autoscaling/group_scaling_policies.go | 8 ++-- .../resources/services/autoscaling/groups.go | 8 ++-- .../autoscaling/launch_configurations.go | 8 ++-- .../services/autoscaling/scheduled_actions.go | 8 ++-- .../autoscalingplans/plan_resources.go | 2 +- .../services/autoscalingplans/plans.go | 2 +- .../aws/resources/services/backup/jobs.go | 2 +- .../services/backup/plan_selections.go | 16 ++++---- .../aws/resources/services/backup/plans.go | 10 ++--- .../services/backup/protected_resources.go | 8 ++-- .../resources/services/backup/report_plans.go | 8 ++-- .../services/backup/vault_recovery_points.go | 8 ++-- .../aws/resources/services/backup/vaults.go | 8 ++-- .../services/batch/compute_environments.go | 8 ++-- .../services/batch/job_definitions.go | 8 ++-- .../resources/services/batch/job_queues.go | 8 ++-- .../aws/resources/services/batch/jobs.go | 8 ++-- .../stack_instance_resource_drifts.go | 18 ++++----- .../cloudformation/stack_instances.go | 10 ++--- .../cloudformation/stack_resources.go | 10 ++--- .../cloudformation/stack_templates.go | 8 ++-- .../services/cloudformation/stacks.go | 8 ++-- .../stackset_operation_results.go | 34 ++++++++-------- .../cloudformation/stackset_operations.go | 10 ++--- .../services/cloudformation/stacksets.go | 8 ++-- .../cloudformation/template_summaries.go | 8 ++-- .../services/cloudfront/cache_policies.go | 8 ++-- .../services/cloudfront/distributions.go | 8 ++-- .../services/cloudfront/functions.go | 16 ++++---- .../cloudfront/origin_access_identities.go | 2 +- .../cloudfront/origin_request_policies.go | 8 ++-- .../cloudfront/response_headers_policies.go | 8 ++-- .../resources/services/cloudhsmv2/backups.go | 8 ++-- .../resources/services/cloudhsmv2/clusters.go | 8 ++-- .../resources/services/cloudtrail/channels.go | 8 ++-- .../resources/services/cloudtrail/events.go | 2 +- .../resources/services/cloudtrail/imports.go | 8 ++-- .../cloudtrail/trail_event_selectors.go | 2 +- .../resources/services/cloudtrail/trails.go | 8 ++-- .../resources/services/cloudwatch/alarms.go | 8 ++-- .../data_protection_policies.go | 10 ++--- .../services/cloudwatchlogs/log_groups.go | 8 ++-- .../services/cloudwatchlogs/metric_filters.go | 10 ++--- .../cloudwatchlogs/resource_policies.go | 8 ++-- .../cloudwatchlogs/subscription_filters.go | 12 +++--- .../services/codeartifact/domains.go | 18 ++++----- .../services/codeartifact/repositories.go | 18 ++++----- .../resources/services/codebuild/builds.go | 2 +- .../resources/services/codebuild/projects.go | 8 ++-- .../services/codebuild/source_credentials.go | 2 +- .../services/codecommit/repositories.go | 2 +- .../services/codepipeline/pipelines.go | 8 ++-- .../services/codepipeline/webhooks.go | 8 ++-- .../services/cognito/identity_pools.go | 8 ++-- .../cognito/user_pool_identity_providers.go | 10 ++--- .../resources/services/cognito/user_pools.go | 8 ++-- .../autoscaling_groups_recommendations.go | 2 +- .../ebs_volume_recommendations.go | 2 +- .../ec2_instance_recommendations.go | 2 +- .../ecs_service_recommendations.go | 2 +- .../lambda_functions_recommendations.go | 2 +- .../config/config_rule_compliance_details.go | 16 ++++---- .../config/config_rule_compliances.go | 8 ++-- .../resources/services/config/config_rules.go | 8 ++-- .../config/configuration_aggregators.go | 8 ++-- .../config/configuration_recorders.go | 8 ++-- .../services/config/conformance_packs.go | 8 ++-- .../config/deliver_channel_statuses.go | 2 +- .../services/config/delivery_channels.go | 2 +- .../config/remediation_configurations.go | 2 +- .../config/retention_configurations.go | 2 +- .../services/costexplorer/cost_thirty_days.go | 20 +++++----- .../costexplorer/forecast_thirty_days.go | 20 +++++----- .../aws/resources/services/dax/clusters.go | 8 ++-- .../resources/services/detective/graphs.go | 2 +- .../resources/services/detective/members.go | 10 ++--- .../services/directconnect/connections.go | 24 +++++------ .../directconnect/gateway_associations.go | 18 ++++----- .../directconnect/gateway_attachments.go | 18 ++++----- .../services/directconnect/gateways.go | 16 ++++---- .../resources/services/directconnect/lags.go | 16 ++++---- .../services/directconnect/locations.go | 18 ++++----- .../directconnect/virtual_gateways.go | 24 +++++------ .../directconnect/virtual_interfaces.go | 24 +++++------ .../services/dms/replication_instances.go | 8 ++-- .../resources/services/docdb/certificates.go | 8 ++-- .../docdb/cluster_parameter_groups.go | 8 ++-- .../services/docdb/cluster_parameters.go | 18 ++++----- .../services/docdb/cluster_snapshots.go | 8 ++-- .../aws/resources/services/docdb/clusters.go | 8 ++-- .../services/docdb/engine_versions.go | 2 +- .../services/docdb/event_categories.go | 2 +- .../services/docdb/event_subscriptions.go | 8 ++-- .../aws/resources/services/docdb/events.go | 4 +- .../services/docdb/global_clusters.go | 8 ++-- .../aws/resources/services/docdb/instances.go | 8 ++-- .../docdb/orderable_db_instance_options.go | 2 +- .../docdb/pending_maintenance_actions.go | 2 +- .../resources/services/docdb/subnet_groups.go | 8 ++-- .../resources/services/dynamodb/backups.go | 8 ++-- .../resources/services/dynamodb/exports.go | 8 ++-- .../services/dynamodb/global_tables.go | 8 ++-- .../dynamodb/table_continuous_backups.go | 8 ++-- .../dynamodb/table_replica_auto_scalings.go | 10 ++--- .../aws/resources/services/dynamodb/tables.go | 8 ++-- .../services/dynamodbstreams/streams.go | 8 ++-- .../services/ec2/account_attributes.go | 2 +- .../source/aws/resources/services/ec2/azs.go | 2 +- .../aws/resources/services/ec2/byoip_cidrs.go | 6 +-- .../services/ec2/capacity_reservations.go | 8 ++-- .../services/ec2/customer_gateways.go | 8 ++-- .../resources/services/ec2/dhcp_options.go | 2 +- .../services/ec2/ebs_snapshot_attributes.go | 8 ++-- .../resources/services/ec2/ebs_snapshots.go | 8 ++-- .../services/ec2/ebs_volume_statuses.go | 8 ++-- .../aws/resources/services/ec2/ebs_volumes.go | 8 ++-- .../ec2/egress_only_internet_gateways.go | 8 ++-- .../source/aws/resources/services/ec2/eips.go | 2 +- .../aws/resources/services/ec2/flow_logs.go | 8 ++-- .../aws/resources/services/ec2/hosts.go | 8 ++-- .../services/ec2/image_attributes.go | 8 ++-- .../services/ec2/image_last_launched.go | 8 ++-- .../aws/resources/services/ec2/images.go | 8 ++-- .../services/ec2/instance_connect.go | 24 +++++------ .../services/ec2/instance_statuses.go | 2 +- .../resources/services/ec2/instance_types.go | 2 +- .../aws/resources/services/ec2/instances.go | 8 ++-- .../services/ec2/internet_gateways.go | 8 ++-- .../aws/resources/services/ec2/key_pairs.go | 8 ++-- .../services/ec2/launch_template_versions.go | 16 ++++---- .../services/ec2/launch_templates.go | 8 ++-- .../services/ec2/managed_prefix_lists.go | 24 +++++------ .../resources/services/ec2/nat_gateways.go | 8 ++-- .../resources/services/ec2/network_acls.go | 8 ++-- .../services/ec2/network_interfaces.go | 8 ++-- .../aws/resources/services/ec2/regions.go | 8 ++-- .../services/ec2/reserved_instances.go | 8 ++-- .../resources/services/ec2/route_tables.go | 8 ++-- .../resources/services/ec2/security_groups.go | 8 ++-- .../services/ec2/spot_fleet_instances.go | 8 ++-- .../services/ec2/spot_fleet_requests.go | 2 +- .../services/ec2/spot_instance_requests.go | 2 +- .../aws/resources/services/ec2/subnets.go | 24 +++++------ .../ec2/transit_gateway_attachments.go | 16 ++++---- .../ec2/transit_gateway_multicast_domains.go | 16 ++++---- .../transit_gateway_peering_attachments.go | 16 ++++---- .../ec2/transit_gateway_route_tables.go | 16 ++++---- .../ec2/transit_gateway_vpc_attachments.go | 16 ++++---- .../services/ec2/transit_gateways.go | 8 ++-- .../services/ec2/vpc_endpoint_connections.go | 2 +- .../vpc_endpoint_service_configurations.go | 2 +- .../ec2/vpc_endpoint_service_permissions.go | 2 +- .../services/ec2/vpc_endpoint_services.go | 2 +- .../resources/services/ec2/vpc_endpoints.go | 8 ++-- .../services/ec2/vpc_peering_connections.go | 8 ++-- .../source/aws/resources/services/ec2/vpcs.go | 8 ++-- .../resources/services/ec2/vpn_connections.go | 2 +- .../resources/services/ec2/vpn_gateways.go | 8 ++-- .../services/ecr/lifecycle_policy.go | 10 ++--- .../services/ecr/pull_through_cache_rules.go | 2 +- .../aws/resources/services/ecr/registries.go | 2 +- .../services/ecr/registry_policies.go | 2 +- .../resources/services/ecr/repositories.go | 10 ++--- .../ecr/repository_image_scan_findings.go | 18 ++++----- .../services/ecr/repository_images.go | 10 ++--- .../services/ecr/repository_policy.go | 10 ++--- .../services/ecrpublic/repositories.go | 8 ++-- .../services/ecrpublic/repository_images.go | 8 ++-- .../ecs/cluster_container_instances.go | 8 ++-- .../services/ecs/cluster_services.go | 10 ++--- .../services/ecs/cluster_task_sets.go | 8 ++-- .../resources/services/ecs/cluster_tasks.go | 8 ++-- .../aws/resources/services/ecs/clusters.go | 8 ++-- .../services/ecs/task_definitions.go | 8 ++-- .../resources/services/efs/accesspoints.go | 8 ++-- .../aws/resources/services/efs/filesystems.go | 8 ++-- .../aws/resources/services/eks/add_ons.go | 16 ++++---- .../aws/resources/services/eks/clusters.go | 8 ++-- .../services/eks/fargate_profiles.go | 8 ++-- .../services/eks/identity_provider_configs.go | 16 ++++---- .../aws/resources/services/eks/node_groups.go | 8 ++-- .../services/elasticache/clusters.go | 8 ++-- .../services/elasticache/engine_versions.go | 36 ++++++++--------- .../resources/services/elasticache/events.go | 8 ++-- .../elasticache/global_replication_groups.go | 8 ++-- .../services/elasticache/parameter_groups.go | 8 ++-- .../elasticache/replication_groups.go | 8 ++-- .../elasticache/reserved_cache_nodes.go | 8 ++-- .../reserved_cache_nodes_offerings.go | 2 +- .../services/elasticache/service_updates.go | 8 ++-- .../services/elasticache/snapshots.go | 8 ++-- .../services/elasticache/subnet_groups.go | 8 ++-- .../services/elasticache/update_actions.go | 2 +- .../services/elasticache/user_groups.go | 8 ++-- .../resources/services/elasticache/users.go | 8 ++-- .../elasticbeanstalk/application_versions.go | 8 ++-- .../services/elasticbeanstalk/applications.go | 14 +++---- .../elasticbeanstalk/configuration_options.go | 10 ++--- .../configuration_settings.go | 10 ++--- .../services/elasticbeanstalk/environments.go | 8 ++-- .../services/elasticsearch/domains.go | 8 ++-- .../services/elasticsearch/packages.go | 8 ++-- .../services/elasticsearch/versions.go | 8 ++-- .../services/elasticsearch/vpc_endpoints.go | 8 ++-- .../elastictranscoder/pipeline_jobs.go | 8 ++-- .../services/elastictranscoder/pipelines.go | 8 ++-- .../services/elastictranscoder/presets.go | 8 ++-- .../services/elbv1/load_balancer_policies.go | 10 ++--- .../services/elbv1/load_balancers.go | 8 ++-- .../services/elbv2/listener_certificates.go | 16 ++++---- .../services/elbv2/listener_rules.go | 8 ++-- .../aws/resources/services/elbv2/listeners.go | 8 ++-- .../elbv2/load_balancer_attributes.go | 10 ++--- .../services/elbv2/load_balancer_web_acls.go | 10 ++--- .../services/elbv2/load_balancers.go | 8 ++-- ...target_group_target_health_descriptions.go | 10 ++--- .../resources/services/elbv2/target_groups.go | 8 ++-- .../services/emr/cluster_instance_fleets.go | 10 ++--- .../services/emr/cluster_instance_groups.go | 10 ++--- .../services/emr/cluster_instances.go | 8 ++-- .../aws/resources/services/emr/clusters.go | 8 ++-- .../services/emr/notebook_executions.go | 12 +++--- .../resources/services/emr/release_labels.go | 2 +- .../services/emr/security_configuration.go | 18 ++++----- .../aws/resources/services/emr/steps.go | 12 +++--- .../services/emr/studio_session_mapping.go | 12 +++--- .../aws/resources/services/emr/studios.go | 10 ++--- .../services/emr/supported_instance_types.go | 12 +++--- .../services/eventbridge/api_destinations.go | 8 ++-- .../services/eventbridge/archives.go | 8 ++-- .../services/eventbridge/connections.go | 8 ++-- .../services/eventbridge/endpoints.go | 8 ++-- .../services/eventbridge/event_bus_rules.go | 2 +- .../services/eventbridge/event_bus_targets.go | 18 ++++----- .../services/eventbridge/event_buses.go | 6 +-- .../services/eventbridge/event_sources.go | 8 ++-- .../resources/services/eventbridge/replays.go | 8 ++-- .../services/firehose/delivery_streams.go | 8 ++-- .../services/frauddetector/batch_imports.go | 8 ++-- .../frauddetector/batch_predictions.go | 8 ++-- .../services/frauddetector/detectors.go | 8 ++-- .../services/frauddetector/entity_types.go | 8 ++-- .../services/frauddetector/event_types.go | 8 ++-- .../services/frauddetector/external_models.go | 8 ++-- .../services/frauddetector/labels.go | 8 ++-- .../services/frauddetector/model_versions.go | 8 ++-- .../services/frauddetector/models.go | 8 ++-- .../services/frauddetector/outcomes.go | 8 ++-- .../resources/services/frauddetector/rules.go | 8 ++-- .../services/frauddetector/variables.go | 8 ++-- .../aws/resources/services/fsx/backups.go | 8 ++-- .../fsx/data_repository_associations.go | 8 ++-- .../services/fsx/data_repository_tasks.go | 8 ++-- .../aws/resources/services/fsx/file_caches.go | 8 ++-- .../resources/services/fsx/file_systems.go | 8 ++-- .../aws/resources/services/fsx/snapshots.go | 8 ++-- .../services/fsx/storage_virtual_machines.go | 8 ++-- .../aws/resources/services/fsx/volumes.go | 8 ++-- .../services/glacier/vault_access_policies.go | 8 ++-- .../services/glacier/vault_lock_policies.go | 8 ++-- .../services/glacier/vault_notifications.go | 8 ++-- .../aws/resources/services/glacier/vaults.go | 8 ++-- .../resources/services/glue/classifiers.go | 8 ++-- .../resources/services/glue/connections.go | 8 ++-- .../aws/resources/services/glue/crawlers.go | 8 ++-- .../services/glue/database_table_indexes.go | 24 +++++------ .../services/glue/database_tables.go | 10 ++--- .../aws/resources/services/glue/databases.go | 8 ++-- .../resources/services/glue/dev_endpoints.go | 8 ++-- .../aws/resources/services/glue/job_runs.go | 10 ++--- .../aws/resources/services/glue/jobs.go | 8 ++-- .../services/glue/ml_transform_task_runs.go | 10 ++--- .../resources/services/glue/ml_transforms.go | 8 ++-- .../aws/resources/services/glue/registries.go | 8 ++-- .../services/glue/registry_schema_versions.go | 10 ++--- .../services/glue/registry_schemas.go | 8 ++-- .../services/glue/security_configurations.go | 2 +- .../aws/resources/services/glue/triggers.go | 8 ++-- .../aws/resources/services/glue/workflows.go | 8 ++-- .../services/guardduty/detector_filters.go | 26 ++++++------ .../services/guardduty/detector_findings.go | 26 ++++++------ .../services/guardduty/detector_ipsets.go | 26 ++++++------ .../services/guardduty/detector_members.go | 26 ++++++------ .../detector_publishing_destinations.go | 26 ++++++------ .../guardduty/detector_threat_intel_sets.go | 26 ++++++------ .../resources/services/guardduty/detectors.go | 22 +++++----- .../services/iam/credential_reports.go | 16 ++++---- .../services/iam/group_attached_policies.go | 10 ++--- .../resources/services/iam/group_policies.go | 10 ++--- .../aws/resources/services/iam/groups.go | 8 ++-- .../services/iam/instance_profiles.go | 8 ++-- .../services/iam/last_accessed_details.go | 32 +++++++-------- .../aws/resources/services/iam/mfa_devices.go | 6 +-- .../iam/openid_connect_identity_providers.go | 6 +-- .../aws/resources/services/iam/policies.go | 8 ++-- .../resources/services/iam/policy_versions.go | 10 ++--- .../services/iam/role_attached_policies.go | 10 ++--- .../resources/services/iam/role_policies.go | 10 ++--- .../aws/resources/services/iam/roles.go | 2 +- .../services/iam/saml_identity_providers.go | 6 +-- .../services/iam/server_certificates.go | 8 ++-- .../services/iam/signing_certificates.go | 10 ++--- .../resources/services/iam/ssh_public_keys.go | 16 ++++---- .../services/iam/user_access_keys.go | 16 ++++---- .../services/iam/user_attached_policies.go | 16 ++++---- .../aws/resources/services/iam/user_groups.go | 10 ++--- .../resources/services/iam/user_policies.go | 10 ++--- .../aws/resources/services/iam/users.go | 8 ++-- .../services/iam/virtual_mfa_devices.go | 6 +-- .../identitystore/group_memberships.go | 16 ++++---- .../services/identitystore/groups.go | 8 ++-- .../resources/services/identitystore/users.go | 8 ++-- .../resources/services/inspector/findings.go | 6 +-- .../services/inspector2/covered_resources.go | 2 +- .../resources/services/inspector2/findings.go | 8 ++-- .../resources/services/iot/billing_groups.go | 8 ++-- .../resources/services/iot/ca_certificates.go | 8 ++-- .../resources/services/iot/certificates.go | 8 ++-- .../source/aws/resources/services/iot/jobs.go | 8 ++-- .../aws/resources/services/iot/policies.go | 8 ++-- .../services/iot/security_profiles.go | 8 ++-- .../aws/resources/services/iot/streams.go | 8 ++-- .../resources/services/iot/thing_groups.go | 8 ++-- .../aws/resources/services/iot/thing_types.go | 8 ++-- .../aws/resources/services/iot/things.go | 8 ++-- .../aws/resources/services/iot/topic_rules.go | 8 ++-- .../services/kafka/cluster_operations.go | 8 ++-- .../aws/resources/services/kafka/clusters.go | 8 ++-- .../services/kafka/configurations.go | 8 ++-- .../aws/resources/services/kafka/nodes.go | 8 ++-- .../aws/resources/services/kinesis/streams.go | 8 ++-- .../aws/resources/services/kms/aliases.go | 8 ++-- .../aws/resources/services/kms/key_grants.go | 16 ++++---- .../resources/services/kms/key_policies.go | 16 ++++---- .../source/aws/resources/services/kms/keys.go | 6 +-- .../services/lambda/function_aliases.go | 8 ++-- .../lambda/function_concurrency_configs.go | 2 +- .../lambda/function_event_invoke_configs.go | 2 +- .../lambda/function_event_source_mappings.go | 10 ++--- .../services/lambda/function_url_configs.go | 2 +- .../services/lambda/function_versions.go | 10 ++--- .../resources/services/lambda/functions.go | 8 ++-- .../services/lambda/layer_version_policies.go | 10 ++--- .../services/lambda/layer_versions.go | 8 ++-- .../aws/resources/services/lambda/layers.go | 8 ++-- .../aws/resources/services/lambda/runtimes.go | 2 +- .../resources/services/lightsail/alarms.go | 6 +-- .../services/lightsail/bucket_access_keys.go | 10 ++--- .../resources/services/lightsail/buckets.go | 2 +- .../services/lightsail/certificates.go | 2 +- .../container_service_deployments.go | 10 ++--- .../lightsail/container_service_images.go | 10 ++--- .../services/lightsail/container_services.go | 6 +-- .../services/lightsail/database_events.go | 10 ++--- .../services/lightsail/database_log_events.go | 10 ++--- .../services/lightsail/database_parameters.go | 10 ++--- .../services/lightsail/database_snapshots.go | 6 +-- .../resources/services/lightsail/databases.go | 2 +- .../services/lightsail/disk_snapshots.go | 2 +- .../aws/resources/services/lightsail/disks.go | 6 +-- .../services/lightsail/distributions.go | 8 ++-- .../lightsail/instance_port_states.go | 20 +++++----- .../services/lightsail/instance_snapshots.go | 6 +-- .../resources/services/lightsail/instances.go | 6 +-- .../load_balancer_tls_certificates.go | 2 +- .../services/lightsail/load_balancers.go | 6 +-- .../services/lightsail/static_ips.go | 6 +-- .../mq/broker_configuration_revisions.go | 16 ++++---- .../services/mq/broker_configurations.go | 2 +- .../aws/resources/services/mq/broker_users.go | 10 ++--- .../aws/resources/services/mq/brokers.go | 8 ++-- .../resources/services/mwaa/environments.go | 8 ++-- .../cluster_parameter_group_parameters.go | 10 ++--- .../neptune/cluster_parameter_groups.go | 8 ++-- .../services/neptune/cluster_snapshots.go | 8 ++-- .../resources/services/neptune/clusters.go | 8 ++-- .../db_parameter_group_db_parameters.go | 10 ++--- .../services/neptune/db_parameter_groups.go | 8 ++-- .../services/neptune/event_subscriptions.go | 8 ++-- .../services/neptune/global_clusters.go | 8 ++-- .../resources/services/neptune/instances.go | 8 ++-- .../services/neptune/subnet_groups.go | 8 ++-- .../networkfirewall/firewall_policies.go | 8 ++-- .../services/networkfirewall/firewalls.go | 8 ++-- .../services/networkfirewall/rule_groups.go | 8 ++-- .../tls_inspection_configurations.go | 8 ++-- .../networkmanager/global_networks.go | 16 ++++---- .../resources/services/networkmanager/link.go | 18 ++++----- .../services/networkmanager/sites.go | 18 ++++----- .../transit_gateway_registrations.go | 10 ++--- .../services/organizations/account_parents.go | 26 ++++++------ .../services/organizations/accounts.go | 10 ++--- .../organizations/delegated_admins.go | 2 +- .../organizations/delegated_services.go | 2 +- .../organizational_unit_parents.go | 26 ++++++------ .../organizations/organizational_units.go | 10 ++--- .../services/organizations/organizations.go | 10 ++--- .../services/organizations/policies.go | 2 +- .../resources/services/organizations/roots.go | 10 ++--- .../qldb/ledger_journal_kinesis_streams.go | 2 +- .../qldb/ledger_journal_s3_exports.go | 10 ++--- .../aws/resources/services/qldb/ledgers.go | 6 +-- .../resources/services/quicksight/analyses.go | 2 +- .../services/quicksight/dashboards.go | 2 +- .../services/quicksight/data_sets.go | 2 +- .../services/quicksight/data_sources.go | 2 +- .../resources/services/quicksight/folders.go | 2 +- .../services/quicksight/group_members.go | 10 ++--- .../resources/services/quicksight/groups.go | 2 +- .../services/quicksight/ingestions.go | 10 ++--- .../services/quicksight/templates.go | 2 +- .../resources/services/quicksight/users.go | 2 +- .../aws/resources/services/ram/principals.go | 2 +- .../ram/resource_share_associations.go | 2 +- .../ram/resource_share_invitations.go | 16 ++++---- .../ram/resource_share_permissions.go | 10 ++--- .../resources/services/ram/resource_shares.go | 8 ++-- .../resources/services/ram/resource_types.go | 18 ++++----- .../aws/resources/services/ram/resources.go | 2 +- .../resources/services/rds/certificates.go | 8 ++-- .../services/rds/cluster_backtracks.go | 10 ++--- .../rds/cluster_parameter_group_parameters.go | 10 ++--- .../services/rds/cluster_parameter_groups.go | 8 ++-- .../services/rds/cluster_parameters.go | 10 ++--- .../services/rds/cluster_snapshots.go | 8 ++-- .../aws/resources/services/rds/clusters.go | 8 ++-- .../rds/db_parameter_group_db_parameters.go | 10 ++--- .../services/rds/db_parameter_groups.go | 8 ++-- .../aws/resources/services/rds/db_proxies.go | 8 ++-- .../services/rds/db_security_groups.go | 8 ++-- .../resources/services/rds/db_snapshots.go | 8 ++-- .../resources/services/rds/engine_versions.go | 8 ++-- .../services/rds/event_subscriptions.go | 8 ++-- .../aws/resources/services/rds/instances.go | 8 ++-- .../resources/services/rds/option_groups.go | 8 ++-- .../services/rds/reserved_instances.go | 8 ++-- .../resources/services/rds/subnet_groups.go | 8 ++-- .../redshift/cluster_parameter_groups.go | 12 +++--- .../services/redshift/cluster_parameters.go | 12 +++--- .../resources/services/redshift/clusters.go | 10 ++--- .../services/redshift/data_shares.go | 10 ++--- .../services/redshift/endpoint_access.go | 12 +++--- .../redshift/endpoint_authorization.go | 12 +++--- .../services/redshift/event_subscriptions.go | 10 ++--- .../aws/resources/services/redshift/events.go | 2 +- .../resources/services/redshift/snapshots.go | 10 ++--- .../services/redshift/subnet_groups.go | 10 ++--- .../resiliencehub/alarm_recommendations.go | 2 +- .../app_component_compliances.go | 2 +- .../app_version_resource_mappings.go | 8 ++-- .../resiliencehub/app_version_resources.go | 8 ++-- .../services/resiliencehub/app_versions.go | 2 +- .../services/resiliencehub/columns.go | 40 +++++++++---------- .../component_recommendations.go | 2 +- .../resiliencehub/recommendation_templates.go | 2 +- .../resiliencehub/sop_recommendations.go | 2 +- .../resiliencehub/test_recommendations.go | 2 +- .../resourcegroups/resource_groups.go | 8 ++-- .../services/route53/delegation_sets.go | 10 ++--- .../aws/resources/services/route53/domains.go | 6 +-- .../services/route53/health_checks.go | 8 ++-- .../hosted_zone_query_logging_configs.go | 8 ++-- .../hosted_zone_resource_record_sets.go | 10 ++--- .../hosted_zone_traffic_policy_instances.go | 10 ++--- .../services/route53/hosted_zones.go | 8 ++-- .../resources/services/route53/operations.go | 2 +- .../services/route53/traffic_policies.go | 8 ++-- .../route53/traffic_policy_versions.go | 24 +++++------ .../route53recoverycontrolconfig/clusters.go | 8 ++-- .../control_panel.go | 8 ++-- .../routing_controls.go | 10 ++--- .../safety_rules.go | 8 ++-- .../route53recoveryreadiness/cells.go | 8 ++-- .../readiness_checks.go | 8 ++-- .../recovery_groups.go | 8 ++-- .../route53recoveryreadiness/resource_sets.go | 8 ++-- .../route53resolver/firewall_configs.go | 2 +- .../route53resolver/firewall_domain_list.go | 2 +- .../firewall_rule_group_associations.go | 2 +- .../route53resolver/firewall_rule_groups.go | 2 +- .../route53resolver/resolver_endpoints.go | 2 +- .../resolver_query_log_config_associations.go | 2 +- .../resolver_query_log_configs.go | 2 +- .../resolver_rule_associations.go | 2 +- .../route53resolver/resolver_rules.go | 2 +- .../resources/services/s3/access_points.go | 8 ++-- .../services/s3/bucket_cors_rules.go | 10 ++--- .../services/s3/bucket_encryption_rules.go | 8 ++-- .../resources/services/s3/bucket_grants.go | 32 +++++++-------- .../services/s3/bucket_lifecycles.go | 10 ++--- .../resources/services/s3/bucket_logging.go | 8 ++-- .../s3/bucket_notification_configurations.go | 8 ++-- .../s3/bucket_object_lock_configurations.go | 8 ++-- .../services/s3/bucket_ownership_controls.go | 10 ++--- .../resources/services/s3/bucket_policies.go | 8 ++-- .../services/s3/bucket_public_access_block.go | 8 ++-- .../services/s3/bucket_replications.go | 8 ++-- .../services/s3/bucket_versioning.go | 8 ++-- .../resources/services/s3/bucket_websites.go | 8 ++-- .../aws/resources/services/s3/buckets.go | 8 ++-- .../services/s3/multi_region_access_points.go | 10 ++--- .../aws/resources/services/sagemaker/apps.go | 8 ++-- .../sagemaker/endpoint_configurations.go | 8 ++-- .../resources/services/sagemaker/models.go | 8 ++-- .../services/sagemaker/notebook_instances.go | 8 ++-- .../services/sagemaker/training_jobs.go | 8 ++-- .../services/savingsplans/savingsplans.go | 10 ++--- .../services/scheduler/schedule_groups.go | 8 ++-- .../resources/services/scheduler/schedules.go | 8 ++-- .../services/secretsmanager/secrets.go | 8 ++-- .../secretsmanager/secrets_version.go | 10 ++--- .../services/securityhub/enabled_standards.go | 2 +- .../services/securityhub/findings.go | 18 ++++----- .../resources/services/securityhub/hubs.go | 2 +- .../services/servicecatalog/launch_paths.go | 24 +++++------ .../services/servicecatalog/portfolios.go | 8 ++-- .../services/servicecatalog/products.go | 8 ++-- .../servicecatalog/provisioned_products.go | 8 ++-- .../servicecatalog/provisioning_artifact.go | 24 +++++------ .../servicecatalog/provisioning_parameters.go | 32 +++++++-------- .../services/servicediscovery/instances.go | 2 +- .../services/servicediscovery/namespaces.go | 2 +- .../services/servicediscovery/services.go | 2 +- .../services/servicequotas/quotas.go | 8 ++-- .../services/servicequotas/services.go | 16 ++++---- .../services/ses/active_receipt_rule_sets.go | 8 ++-- .../configuration_set_event_destinations.go | 16 ++++---- .../services/ses/configuration_sets.go | 8 ++-- .../resources/services/ses/contact_lists.go | 8 ++-- .../custom_verification_email_templates.go | 8 ++-- .../aws/resources/services/ses/identities.go | 8 ++-- .../aws/resources/services/ses/templates.go | 8 ++-- .../aws/resources/services/shield/attacks.go | 10 ++--- .../services/shield/protection_groups.go | 8 ++-- .../resources/services/shield/protections.go | 8 ++-- .../services/shield/subscriptions.go | 8 ++-- .../aws/resources/services/signer/profiles.go | 2 +- .../resources/services/sns/subscriptions.go | 8 ++-- .../aws/resources/services/sns/topics.go | 8 ++-- .../aws/resources/services/sqs/queues.go | 8 ++-- .../resources/services/ssm/associations.go | 8 ++-- .../services/ssm/compliance_summary_items.go | 6 +-- .../services/ssm/document_versions.go | 10 ++--- .../aws/resources/services/ssm/documents.go | 8 ++-- .../services/ssm/instance_compliance_items.go | 16 ++++---- .../services/ssm/instance_patches.go | 16 ++++---- .../aws/resources/services/ssm/instances.go | 8 ++-- .../aws/resources/services/ssm/inventories.go | 8 ++-- .../services/ssm/inventory_schemas.go | 16 ++++---- .../aws/resources/services/ssm/parameters.go | 8 ++-- .../resources/services/ssm/patch_baselines.go | 8 ++-- .../aws/resources/services/ssm/sessions.go | 2 +- .../services/ssoadmin/account_assignments.go | 10 ++--- .../ssoadmin/customer_managed_policies.go | 18 ++++----- .../services/ssoadmin/inline_policies.go | 16 ++++---- .../resources/services/ssoadmin/instances.go | 2 +- .../services/ssoadmin/managed_policies.go | 18 ++++----- .../ssoadmin/permission_boundaries.go | 16 ++++---- .../services/ssoadmin/permission_sets.go | 10 ++--- .../services/stepfunctions/activities.go | 8 ++-- .../services/stepfunctions/executions.go | 8 ++-- .../stepfunctions/executions_map_runs.go | 8 ++-- .../executions_map_runs_executions.go | 8 ++-- .../services/stepfunctions/state_machines.go | 8 ++-- .../aws/resources/services/support/cases.go | 2 +- .../services/support/communications.go | 2 +- .../resources/services/support/services.go | 2 +- .../services/support/severity_levels.go | 2 +- .../support/trusted_advisor_check_results.go | 2 +- .../trusted_advisor_check_summaries.go | 2 +- .../support/trusted_advisor_checks.go | 2 +- .../services/timestream/databases.go | 8 ++-- .../resources/services/timestream/tables.go | 8 ++-- .../resources/services/transfer/servers.go | 8 ++-- .../aws/resources/services/waf/rule_groups.go | 8 ++-- .../aws/resources/services/waf/rules.go | 8 ++-- .../services/waf/subscribed_rule_groups.go | 20 +++++----- .../aws/resources/services/waf/web_acls.go | 8 ++-- .../services/wafregional/rate_based_rules.go | 8 ++-- .../services/wafregional/rule_groups.go | 8 ++-- .../resources/services/wafregional/rules.go | 8 ++-- .../services/wafregional/web_acls.go | 8 ++-- .../aws/resources/services/wafv2/ipsets.go | 8 ++-- .../services/wafv2/managed_rule_groups.go | 10 ++--- .../services/wafv2/regex_pattern_sets.go | 8 ++-- .../resources/services/wafv2/rule_groups.go | 8 ++-- .../aws/resources/services/wafv2/web_acls.go | 8 ++-- .../lens_review_improvements.go | 26 ++++++------ .../services/wellarchitected/lens_reviews.go | 18 ++++----- .../services/wellarchitected/lenses.go | 8 ++-- .../wellarchitected/share_invitations.go | 2 +- .../wellarchitected/workload_milestones.go | 10 ++--- .../wellarchitected/workload_shares.go | 10 ++--- .../services/wellarchitected/workloads.go | 8 ++-- .../services/workspaces/directories.go | 8 ++-- .../services/workspaces/workspaces.go | 8 ++-- .../services/xray/encryption_configs.go | 2 +- .../aws/resources/services/xray/groups.go | 8 ++-- .../services/xray/resource_policies.go | 16 ++++---- .../resources/services/xray/sampling_rules.go | 8 ++-- scripts/table_diff/go.mod | 1 + scripts/table_diff/go.sum | 1 + 1394 files changed, 6571 insertions(+), 6223 deletions(-) diff --git a/plugins/source/aws/client/columns.go b/plugins/source/aws/client/columns.go index 596f1f5d119e1d..218677ea073bea 100644 --- a/plugins/source/aws/client/columns.go +++ b/plugins/source/aws/client/columns.go @@ -7,45 +7,45 @@ import ( func DefaultAccountIDColumn(pk bool) schema.Column { return schema.Column{ - Name: "account_id", - Type: arrow.BinaryTypes.String, - Resolver: ResolveAWSAccount, - PrimaryKey: pk, + Name: "account_id", + Type: arrow.BinaryTypes.String, + Resolver: ResolveAWSAccount, + PrimaryKeyComponent: pk, } } func RequestAccountIDColumn(pk bool) schema.Column { return schema.Column{ - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: ResolveAWSAccount, - PrimaryKey: pk, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: ResolveAWSAccount, + PrimaryKeyComponent: pk, } } func DefaultRegionColumn(pk bool) schema.Column { return schema.Column{ - Name: "region", - Type: arrow.BinaryTypes.String, - Resolver: ResolveAWSRegion, - PrimaryKey: pk, + Name: "region", + Type: arrow.BinaryTypes.String, + Resolver: ResolveAWSRegion, + PrimaryKeyComponent: pk, } } func RequestRegionColumn(pk bool) schema.Column { return schema.Column{ - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: ResolveAWSRegion, - PrimaryKey: pk, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: ResolveAWSRegion, + PrimaryKeyComponent: pk, } } func LanguageCodeColumn(pk bool) schema.Column { return schema.Column{ - Name: "language_code", - Type: arrow.BinaryTypes.String, - Resolver: ResolveLanguageCode, - PrimaryKey: pk, + Name: "language_code", + Type: arrow.BinaryTypes.String, + Resolver: ResolveLanguageCode, + PrimaryKeyComponent: pk, } } diff --git a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_archive_rules.md b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_archive_rules.md index a18296c64d2449..a2a9defdf75de9 100644 --- a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_archive_rules.md +++ b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_archive_rules.md @@ -4,8 +4,8 @@ This table shows data for AWS Identity and Access Management (IAM) Access Analyz https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_ArchiveRuleSummary.html -The composite primary key for this table is (**analyzer_arn**, **rule_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**analyzer_arn**, **rule_name**). ## Relations This table depends on [aws_accessanalyzer_analyzers](aws_accessanalyzer_analyzers.md). @@ -14,12 +14,12 @@ This table depends on [aws_accessanalyzer_analyzers](aws_accessanalyzer_analyzer | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|analyzer_arn (PK)|`utf8`| +|analyzer_arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |filter|`json`| -|rule_name (PK)|`utf8`| +|rule_name|`utf8`| |updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_findings.md b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_findings.md index 7c872d0fa8f400..3305a0682fd8aa 100644 --- a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_findings.md +++ b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzer_findings.md @@ -4,8 +4,8 @@ This table shows data for AWS Identity and Access Management (IAM) Access Analyz https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_FindingSummary.html -The composite primary key for this table is (**analyzer_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**analyzer_arn**, **id**). ## Relations This table depends on [aws_accessanalyzer_analyzers](aws_accessanalyzer_analyzers.md). @@ -14,15 +14,15 @@ This table depends on [aws_accessanalyzer_analyzers](aws_accessanalyzer_analyzer | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|analyzer_arn (PK)|`utf8`| +|analyzer_arn|`utf8`| |analyzed_at|`timestamp[us, tz=UTC]`| |condition|`json`| |created_at|`timestamp[us, tz=UTC]`| -|id (PK)|`utf8`| +|id|`utf8`| |resource_owner_account|`utf8`| |resource_type|`utf8`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md index 76569347f50fb9..88070ce42a78d0 100644 --- a/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md +++ b/plugins/source/aws/docs/tables/aws_accessanalyzer_analyzers.md @@ -4,8 +4,8 @@ This table shows data for AWS Identity and Access Management (IAM) Access Analyz https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_AnalyzerSummary.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_accessanalyzer_analyzers: @@ -16,11 +16,11 @@ The following tables depend on aws_accessanalyzer_analyzers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |name|`utf8`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_account_alternate_contacts.md b/plugins/source/aws/docs/tables/aws_account_alternate_contacts.md index 43997a7b28f769..c8533fd079518c 100644 --- a/plugins/source/aws/docs/tables/aws_account_alternate_contacts.md +++ b/plugins/source/aws/docs/tables/aws_account_alternate_contacts.md @@ -4,16 +4,17 @@ This table shows data for Account Alternate Contacts. https://docs.aws.amazon.com/accounts/latest/reference/API_AlternateContact.html -The composite primary key for this table is (**account_id**, **alternate_contact_type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **alternate_contact_type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|alternate_contact_type (PK)|`utf8`| +|account_id|`utf8`| +|alternate_contact_type|`utf8`| |email_address|`utf8`| |name|`utf8`| |phone_number|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_account_contacts.md b/plugins/source/aws/docs/tables/aws_account_contacts.md index 2fd5b44c01fc61..b25e909b275078 100644 --- a/plugins/source/aws/docs/tables/aws_account_contacts.md +++ b/plugins/source/aws/docs/tables/aws_account_contacts.md @@ -4,15 +4,16 @@ This table shows data for Account Contacts. https://docs.aws.amazon.com/accounts/latest/reference/API_ContactInformation.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |address_line1|`utf8`| |city|`utf8`| |country_code|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_acm_certificates.md b/plugins/source/aws/docs/tables/aws_acm_certificates.md index be59b2a4a4fb15..e2d2b2f7c193ab 100644 --- a/plugins/source/aws/docs/tables/aws_acm_certificates.md +++ b/plugins/source/aws/docs/tables/aws_acm_certificates.md @@ -4,17 +4,18 @@ This table shows data for Amazon Certificate Manager (ACM) Certificates. https://docs.aws.amazon.com/acm/latest/APIReference/API_CertificateDetail.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |certificate_authority_arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_acmpca_certificate_authorities.md b/plugins/source/aws/docs/tables/aws_acmpca_certificate_authorities.md index 7d36f4fe9a7f80..2f4d550013fbac 100644 --- a/plugins/source/aws/docs/tables/aws_acmpca_certificate_authorities.md +++ b/plugins/source/aws/docs/tables/aws_acmpca_certificate_authorities.md @@ -4,17 +4,18 @@ This table shows data for AWS Certificate Manager Private Certificate Authority https://docs.aws.amazon.com/privateca/latest/APIReference/API_CertificateAuthority.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |certificate_authority_configuration|`json`| |created_at|`timestamp[us, tz=UTC]`| 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 5811010bc6a126..c43ab0efd11c4a 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Managed Service for Prometheus (AMP) Rule Group https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-APIReference.html#AMP-APIReference-RuleGroupsNamespaceDescription -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_amp_workspaces](aws_amp_workspaces.md). @@ -14,12 +14,12 @@ This table depends on [aws_amp_workspaces](aws_amp_workspaces.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |workspace_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |data|`binary`| |modified_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_amp_workspaces.md b/plugins/source/aws/docs/tables/aws_amp_workspaces.md index 767917e206b044..9d7c56bc4c02b1 100644 --- a/plugins/source/aws/docs/tables/aws_amp_workspaces.md +++ b/plugins/source/aws/docs/tables/aws_amp_workspaces.md @@ -4,8 +4,8 @@ This table shows data for Amazon Managed Service for Prometheus (AMP) Workspaces https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-APIReference.html#AMP-APIReference-WorkspaceDescription -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_amp_workspaces: @@ -15,13 +15,13 @@ The following tables depend on aws_amp_workspaces: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |alert_manager_definition|`json`| |logging_configuration|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |status|`json`| |workspace_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_amplify_apps.md b/plugins/source/aws/docs/tables/aws_amplify_apps.md index 39be7db4732d1e..39309cdd831f38 100644 --- a/plugins/source/aws/docs/tables/aws_amplify_apps.md +++ b/plugins/source/aws/docs/tables/aws_amplify_apps.md @@ -4,17 +4,18 @@ This table shows data for Amplify Apps. https://docs.aws.amazon.com/amplify/latest/APIReference/API_ListApps.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |app_arn|`utf8`| |app_id|`utf8`| |create_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_api_keys.md b/plugins/source/aws/docs/tables/aws_apigateway_api_keys.md index 37bb4364c63a1f..038d105e31f753 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_api_keys.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_api_keys.md @@ -4,17 +4,18 @@ This table shows data for Amazon API Gateway API Keys. https://docs.aws.amazon.com/apigateway/latest/api/API_ApiKey.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |customer_id|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_client_certificates.md b/plugins/source/aws/docs/tables/aws_apigateway_client_certificates.md index 0c3161d436162c..10e7977b5c1899 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_client_certificates.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_client_certificates.md @@ -4,17 +4,18 @@ This table shows data for Amazon API Gateway Client Certificates. https://docs.aws.amazon.com/apigateway/latest/api/API_ClientCertificate.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |client_certificate_id|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_domain_name_base_path_mappings.md b/plugins/source/aws/docs/tables/aws_apigateway_domain_name_base_path_mappings.md index 41f2329ef6266a..2b86df15b40c6f 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_domain_name_base_path_mappings.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_domain_name_base_path_mappings.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Domain Name Base Path Mappings. https://docs.aws.amazon.com/apigateway/latest/api/API_BasePathMapping.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_domain_names](aws_apigateway_domain_names.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_domain_names](aws_apigateway_domain_names. | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |domain_name_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |base_path|`utf8`| |rest_api_id|`utf8`| |stage|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_apigateway_domain_names.md b/plugins/source/aws/docs/tables/aws_apigateway_domain_names.md index 39c40198f3dd80..73f705a9306cd0 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_domain_names.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_domain_names.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Domain Names. https://docs.aws.amazon.com/apigateway/latest/api/API_DomainName.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_apigateway_domain_names: @@ -15,11 +15,11 @@ The following tables depend on aws_apigateway_domain_names: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |certificate_arn|`utf8`| |certificate_name|`utf8`| |certificate_upload_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_authorizers.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_authorizers.md index 69cdcd3e08add2..94684c1c8133a5 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_authorizers.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_authorizers.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Authorizers. https://docs.aws.amazon.com/apigateway/latest/api/API_Authorizer.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auth_type|`utf8`| |authorizer_credentials|`utf8`| |authorizer_result_ttl_in_seconds|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_deployments.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_deployments.md index 8905a14d09aa99..832b52a6a6b0bc 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_deployments.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_deployments.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Deployments. https://docs.aws.amazon.com/apigateway/latest/api/API_Deployment.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_summary|`json`| |created_date|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_parts.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_parts.md index fd37b22a8e203b..cd138d0689efe0 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_parts.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_parts.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Documentation Parts. https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationPart.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |location|`json`| |properties|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_versions.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_versions.md index 78dcee7f250eb7..b2da32fb4b42da 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_versions.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_documentation_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Documentation Versions. https://docs.aws.amazon.com/apigateway/latest/api/API_DocumentationVersion.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |description|`utf8`| |version|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_gateway_responses.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_gateway_responses.md index ff2de9bda28026..bc37ffe4b7b740 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_gateway_responses.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_gateway_responses.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Gateway Responses. https://docs.aws.amazon.com/apigateway/latest/api/API_GatewayResponse.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |default_response|`bool`| |response_parameters|`json`| |response_templates|`json`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_models.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_models.md index c5f4cf60d4e854..906dc349f9fa88 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_models.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_models.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Models. https://docs.aws.amazon.com/apigateway/latest/api/API_Model.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |model_template|`utf8`| |content_type|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_request_validators.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_request_validators.md index b6e31c939bd5b2..fc336b3c6dd413 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_request_validators.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_request_validators.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Request Validators. https://docs.aws.amazon.com/apigateway/latest/api/API_RequestValidator.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |name|`utf8`| |validate_request_body|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_method_integrations.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_method_integrations.md index a732aae5e358c8..0d6b00d96ad348 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_method_integrations.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_method_integrations.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Resource Method Integratio https://docs.aws.amazon.com/apigateway/latest/api/API_Integration.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_api_resource_methods](aws_apigateway_rest_api_resource_methods.md). @@ -14,14 +14,14 @@ This table depends on [aws_apigateway_rest_api_resource_methods](aws_apigateway_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| |resource_arn|`utf8`| |method_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cache_key_parameters|`list`| |cache_namespace|`utf8`| |connection_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_methods.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_methods.md index 538e0812f0d22b..3d418a272abe75 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_methods.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resource_methods.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Resource Methods. https://docs.aws.amazon.com/apigateway/latest/api/API_Method.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_api_resources](aws_apigateway_rest_api_resources.md). @@ -17,13 +17,13 @@ The following tables depend on aws_apigateway_rest_api_resource_methods: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| |resource_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_key_required|`bool`| |authorization_scopes|`list`| |authorization_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resources.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resources.md index 1d38f9cc3972dc..0fdcdfc7ff5b92 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resources.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_resources.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Resources. https://docs.aws.amazon.com/apigateway/latest/api/API_Resource.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -17,12 +17,12 @@ The following tables depend on aws_apigateway_rest_api_resources: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |parent_id|`utf8`| |path|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_stages.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_stages.md index d106e825ef7b6b..fede68b6ddf325 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_api_stages.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_api_stages.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest API Stages. https://docs.aws.amazon.com/apigateway/latest/api/API_Stage.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_rest_apis](aws_apigateway_rest_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |rest_api_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |access_log_settings|`json`| |cache_cluster_enabled|`bool`| |cache_cluster_size|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_rest_apis.md b/plugins/source/aws/docs/tables/aws_apigateway_rest_apis.md index dfddabb2146827..23ba5c883c6196 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_rest_apis.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_rest_apis.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Rest APIs. https://docs.aws.amazon.com/apigateway/latest/api/API_RestApi.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_apigateway_rest_apis: @@ -23,11 +23,11 @@ The following tables depend on aws_apigateway_rest_apis: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_key_source|`utf8`| |binary_media_types|`list`| |created_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_usage_plan_keys.md b/plugins/source/aws/docs/tables/aws_apigateway_usage_plan_keys.md index 5d735769fb206e..f8026de33087de 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_usage_plan_keys.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_usage_plan_keys.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Usage Plan Keys. https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlanKey.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigateway_usage_plans](aws_apigateway_usage_plans.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigateway_usage_plans](aws_apigateway_usage_plans.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |usage_plan_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |name|`utf8`| |type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_usage_plans.md b/plugins/source/aws/docs/tables/aws_apigateway_usage_plans.md index 97b84622dba548..abc218e9e3808e 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_usage_plans.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_usage_plans.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway Usage Plans. https://docs.aws.amazon.com/apigateway/latest/api/API_UsagePlan.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_apigateway_usage_plans: @@ -15,11 +15,11 @@ The following tables depend on aws_apigateway_usage_plans: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_stages|`json`| |description|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigateway_vpc_links.md b/plugins/source/aws/docs/tables/aws_apigateway_vpc_links.md index 3843ef4cab971c..677c57a0897c77 100644 --- a/plugins/source/aws/docs/tables/aws_apigateway_vpc_links.md +++ b/plugins/source/aws/docs/tables/aws_apigateway_vpc_links.md @@ -4,17 +4,18 @@ This table shows data for Amazon API Gateway VPC Links. https://docs.aws.amazon.com/apigateway/latest/api/API_VpcLink.html -The composite primary key for this table is (**account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |id|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_authorizers.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_authorizers.md index b2f5a5adbc451e..efbab016be69a7 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_authorizers.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_authorizers.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Authorizers. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-authorizers.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |authorizer_credentials_arn|`utf8`| |authorizer_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_deployments.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_deployments.md index c0a9b84ecce374..f5996437b726fd 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_deployments.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_deployments.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Deployments. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-deployments.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_deployed|`bool`| |created_date|`timestamp[us, tz=UTC]`| |deployment_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integration_responses.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integration_responses.md index a4ce4d4a69b13e..6069f13c648c85 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integration_responses.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integration_responses.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Integration Responses. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-integrations-integrationid-integrationresponses-integrationresponseid.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_api_integrations](aws_apigatewayv2_api_integrations.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_api_integrations](aws_apigatewayv2_api_i | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_integration_arn|`utf8`| |integration_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |integration_response_key|`utf8`| |content_handling_strategy|`utf8`| |integration_response_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integrations.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integrations.md index 5b4c711335e32e..fc2f5552b98f4f 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integrations.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_integrations.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Integrations. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-integrations-integrationid.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -17,13 +17,13 @@ The following tables depend on aws_apigatewayv2_api_integrations: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_gateway_managed|`bool`| |connection_id|`utf8`| |connection_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_models.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_models.md index 80b866833e93f9..97b46352f30b2c 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_models.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_models.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Models. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-models.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |model_template|`utf8`| |name|`utf8`| |content_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_route_responses.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_route_responses.md index 3d5628cc7864d2..e2653e5e478c9f 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_route_responses.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_route_responses.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Route Responses. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-routes-routeid-routeresponses.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_api_routes](aws_apigatewayv2_api_routes.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_api_routes](aws_apigatewayv2_api_routes. | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_route_arn|`utf8`| |route_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |route_response_key|`utf8`| |model_selection_expression|`utf8`| |response_models|`json`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_routes.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_routes.md index 051e3db3d66f10..3ab4cbaa90d87b 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_routes.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_routes.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Routes. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-routes.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -17,13 +17,13 @@ The following tables depend on aws_apigatewayv2_api_routes: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |route_key|`utf8`| |api_gateway_managed|`bool`| |api_key_required|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_stages.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_stages.md index be6bc253ab5388..59fb72a617f7f1 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_api_stages.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_api_stages.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 API Stages. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis-apiid-stages.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). @@ -14,13 +14,13 @@ This table depends on [aws_apigatewayv2_apis](aws_apigatewayv2_apis.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |api_arn|`utf8`| |api_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |stage_name|`utf8`| |access_log_settings|`json`| |api_gateway_managed|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md index 9f0c78e51ef884..c61c2a9763a155 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_apis.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 APIs. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/apis.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_apigatewayv2_apis: @@ -20,11 +20,11 @@ The following tables depend on aws_apigatewayv2_apis: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |name|`utf8`| |protocol_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_name_rest_api_mappings.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_name_rest_api_mappings.md index ae432dd0169955..343a10f9a6bce7 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_name_rest_api_mappings.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_name_rest_api_mappings.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 Domain Name Rest API Mappings. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/domainnames-domainname-apimappings.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_apigatewayv2_domain_names](aws_apigatewayv2_domain_names.md). @@ -14,12 +14,12 @@ This table depends on [aws_apigatewayv2_domain_names](aws_apigatewayv2_domain_na | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |domain_name_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_id|`utf8`| |stage|`utf8`| |api_mapping_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_names.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_names.md index 75f2004baf7dfe..2e2b79f4376620 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_names.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_domain_names.md @@ -4,8 +4,8 @@ This table shows data for Amazon API Gateway v2 Domain Names. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/domainnames.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_apigatewayv2_domain_names: @@ -15,11 +15,11 @@ The following tables depend on aws_apigatewayv2_domain_names: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |domain_name|`utf8`| |api_mapping_selection_expression|`utf8`| |domain_name_configurations|`json`| diff --git a/plugins/source/aws/docs/tables/aws_apigatewayv2_vpc_links.md b/plugins/source/aws/docs/tables/aws_apigatewayv2_vpc_links.md index 76f4f7cedca01d..5d6ff871dd3a89 100644 --- a/plugins/source/aws/docs/tables/aws_apigatewayv2_vpc_links.md +++ b/plugins/source/aws/docs/tables/aws_apigatewayv2_vpc_links.md @@ -4,17 +4,18 @@ This table shows data for Amazon API Gateway v2 VPC Links. https://docs.aws.amazon.com/apigatewayv2/latest/api-reference/vpclinks.html#vpclinks-prop-vpclink -The composite primary key for this table is (**account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |security_group_ids|`list`| |subnet_ids|`list`| diff --git a/plugins/source/aws/docs/tables/aws_appconfig_applications.md b/plugins/source/aws/docs/tables/aws_appconfig_applications.md index e8bac0d85f6f42..34bbf45b40b943 100644 --- a/plugins/source/aws/docs/tables/aws_appconfig_applications.md +++ b/plugins/source/aws/docs/tables/aws_appconfig_applications.md @@ -4,8 +4,8 @@ This table shows data for AWS AppConfig Applications. https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/API_Application.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_appconfig_applications: @@ -16,11 +16,11 @@ The following tables depend on aws_appconfig_applications: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |id|`utf8`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_appconfig_configuration_profiles.md b/plugins/source/aws/docs/tables/aws_appconfig_configuration_profiles.md index fbd9ad365430cc..b0e80d4d361d05 100644 --- a/plugins/source/aws/docs/tables/aws_appconfig_configuration_profiles.md +++ b/plugins/source/aws/docs/tables/aws_appconfig_configuration_profiles.md @@ -4,8 +4,8 @@ This table shows data for AWS AppConfig Configuration Profiles. https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/API_GetConfigurationProfile.html -The composite primary key for this table is (**application_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**application_arn**, **arn**). ## Relations This table depends on [aws_appconfig_applications](aws_appconfig_applications.md). @@ -17,12 +17,12 @@ The following tables depend on aws_appconfig_configuration_profiles: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|application_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|application_arn|`utf8`| +|arn|`utf8`| |application_id|`utf8`| |description|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appconfig_deployment_strategies.md b/plugins/source/aws/docs/tables/aws_appconfig_deployment_strategies.md index 5ac33cc764425e..eb053baab5b822 100644 --- a/plugins/source/aws/docs/tables/aws_appconfig_deployment_strategies.md +++ b/plugins/source/aws/docs/tables/aws_appconfig_deployment_strategies.md @@ -4,17 +4,18 @@ This table shows data for AWS AppConfig Deployment Strategies. https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/API_DeploymentStrategy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |deployment_duration_in_minutes|`int64`| |description|`utf8`| |final_bake_time_in_minutes|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_appconfig_environments.md b/plugins/source/aws/docs/tables/aws_appconfig_environments.md index 679f452d7b18e0..5123a90fa6e35b 100644 --- a/plugins/source/aws/docs/tables/aws_appconfig_environments.md +++ b/plugins/source/aws/docs/tables/aws_appconfig_environments.md @@ -4,8 +4,8 @@ This table shows data for AWS AppConfig Environments. https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/API_Environment.html -The composite primary key for this table is (**application_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**application_arn**, **arn**). ## Relations This table depends on [aws_appconfig_applications](aws_appconfig_applications.md). @@ -14,12 +14,12 @@ This table depends on [aws_appconfig_applications](aws_appconfig_applications.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|application_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|application_arn|`utf8`| +|arn|`utf8`| |application_id|`utf8`| |description|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appconfig_hosted_configuration_versions.md b/plugins/source/aws/docs/tables/aws_appconfig_hosted_configuration_versions.md index efa94aeaf9b32d..f8d63834e6d5de 100644 --- a/plugins/source/aws/docs/tables/aws_appconfig_hosted_configuration_versions.md +++ b/plugins/source/aws/docs/tables/aws_appconfig_hosted_configuration_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS AppConfig Hosted Configuration Versions. https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/API_GetHostedConfigurationVersion.html -The composite primary key for this table is (**application_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**application_arn**, **arn**). ## Relations This table depends on [aws_appconfig_configuration_profiles](aws_appconfig_configuration_profiles.md). @@ -14,12 +14,12 @@ This table depends on [aws_appconfig_configuration_profiles](aws_appconfig_confi | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|application_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|application_arn|`utf8`| +|arn|`utf8`| |application_id|`utf8`| |configuration_profile_id|`utf8`| |content|`binary`| diff --git a/plugins/source/aws/docs/tables/aws_appflow_flows.md b/plugins/source/aws/docs/tables/aws_appflow_flows.md index 41157688105e3f..0ed2b689a392b2 100644 --- a/plugins/source/aws/docs/tables/aws_appflow_flows.md +++ b/plugins/source/aws/docs/tables/aws_appflow_flows.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppFlow Flows. https://docs.aws.amazon.com/appflow/1.0/APIReference/API_DescribeFlow.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |created_by|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md b/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md index be0ad9ddfdcb25..97513f0fb6639c 100644 --- a/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md +++ b/plugins/source/aws/docs/tables/aws_applicationautoscaling_policies.md @@ -4,17 +4,18 @@ This table shows data for Application Auto Scaling Policies. https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScalingPolicy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |policy_arn|`utf8`| |policy_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scalable_targets.md b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scalable_targets.md index 76239b2c3d5f35..5a1e6877ccebd2 100644 --- a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scalable_targets.md +++ b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scalable_targets.md @@ -4,20 +4,21 @@ This table shows data for Application Auto Scaling Scalable Targets. https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScalableTarget.html -The composite primary key for this table is (**account_id**, **region**, **resource_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |max_capacity|`int64`| |min_capacity|`int64`| -|resource_id (PK)|`utf8`| +|resource_id|`utf8`| |role_arn|`utf8`| |scalable_dimension|`utf8`| |service_namespace|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scaling_activities.md b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scaling_activities.md index ca2b98ebedcae1..2e1eb31932269f 100644 --- a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scaling_activities.md +++ b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scaling_activities.md @@ -4,20 +4,21 @@ This table shows data for Application Auto Scaling Scaling Activities. https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScalingActivity.html -The composite primary key for this table is (**account_id**, **region**, **resource_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |activity_id|`utf8`| |cause|`utf8`| |description|`utf8`| -|resource_id (PK)|`utf8`| +|resource_id|`utf8`| |scalable_dimension|`utf8`| |service_namespace|`utf8`| |start_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scheduled_actions.md b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scheduled_actions.md index e71c4672e6c228..1b89080862e08f 100644 --- a/plugins/source/aws/docs/tables/aws_applicationautoscaling_scheduled_actions.md +++ b/plugins/source/aws/docs/tables/aws_applicationautoscaling_scheduled_actions.md @@ -4,17 +4,18 @@ This table shows data for Application Auto Scaling Scheduled Actions. https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScheduledAction.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |resource_id|`utf8`| |schedule|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appmesh_meshes.md b/plugins/source/aws/docs/tables/aws_appmesh_meshes.md index 7b675cf022d3df..d153c915fd99b8 100644 --- a/plugins/source/aws/docs/tables/aws_appmesh_meshes.md +++ b/plugins/source/aws/docs/tables/aws_appmesh_meshes.md @@ -5,8 +5,8 @@ This table shows data for AWS App Mesh Meshes. https://docs.aws.amazon.com/app-mesh/latest/APIReference/API_MeshData.html The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Relations The following tables depend on aws_appmesh_meshes: @@ -19,11 +19,11 @@ The following tables depend on aws_appmesh_meshes: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |mesh_name|`utf8`| |metadata|`json`| diff --git a/plugins/source/aws/docs/tables/aws_appmesh_virtual_gateways.md b/plugins/source/aws/docs/tables/aws_appmesh_virtual_gateways.md index c2729c2c236e40..f777a03fa4a663 100644 --- a/plugins/source/aws/docs/tables/aws_appmesh_virtual_gateways.md +++ b/plugins/source/aws/docs/tables/aws_appmesh_virtual_gateways.md @@ -4,8 +4,8 @@ This table shows data for AWS App Mesh Virtual Gateways. https://docs.aws.amazon.com/app-mesh/latest/APIReference/API_VirtualGatewayData.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**, **mesh_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**, **mesh_arn**). ## Relations This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). @@ -14,12 +14,12 @@ This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| -|mesh_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| +|mesh_arn|`utf8`| |mesh_name|`utf8`| |metadata|`json`| |spec|`json`| diff --git a/plugins/source/aws/docs/tables/aws_appmesh_virtual_nodes.md b/plugins/source/aws/docs/tables/aws_appmesh_virtual_nodes.md index 299da0a76d165a..d6d92b4a8a06dc 100644 --- a/plugins/source/aws/docs/tables/aws_appmesh_virtual_nodes.md +++ b/plugins/source/aws/docs/tables/aws_appmesh_virtual_nodes.md @@ -4,8 +4,8 @@ This table shows data for AWS App Mesh Virtual Nodes. https://docs.aws.amazon.com/app-mesh/latest/APIReference/API_VirtualNodeData.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**, **mesh_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**, **mesh_arn**). ## Relations This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). @@ -14,12 +14,12 @@ This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| -|mesh_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| +|mesh_arn|`utf8`| |mesh_name|`utf8`| |metadata|`json`| |spec|`json`| diff --git a/plugins/source/aws/docs/tables/aws_appmesh_virtual_routers.md b/plugins/source/aws/docs/tables/aws_appmesh_virtual_routers.md index 0501f083175bd5..6dcd7b6b852361 100644 --- a/plugins/source/aws/docs/tables/aws_appmesh_virtual_routers.md +++ b/plugins/source/aws/docs/tables/aws_appmesh_virtual_routers.md @@ -4,8 +4,8 @@ This table shows data for AWS App Mesh Virtual Routers. https://docs.aws.amazon.com/app-mesh/latest/APIReference/API_VirtualRouterData.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**, **mesh_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**, **mesh_arn**). ## Relations This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). @@ -14,12 +14,12 @@ This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| -|mesh_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| +|mesh_arn|`utf8`| |mesh_name|`utf8`| |metadata|`json`| |spec|`json`| diff --git a/plugins/source/aws/docs/tables/aws_appmesh_virtual_services.md b/plugins/source/aws/docs/tables/aws_appmesh_virtual_services.md index 5bc3962ae50c26..e784696644469d 100644 --- a/plugins/source/aws/docs/tables/aws_appmesh_virtual_services.md +++ b/plugins/source/aws/docs/tables/aws_appmesh_virtual_services.md @@ -4,8 +4,8 @@ This table shows data for AWS App Mesh Virtual Services. https://docs.aws.amazon.com/app-mesh/latest/APIReference/API_VirtualServiceData.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**, **mesh_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**, **mesh_arn**). ## Relations This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). @@ -14,12 +14,12 @@ This table depends on [aws_appmesh_meshes](aws_appmesh_meshes.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| -|mesh_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| +|mesh_arn|`utf8`| |mesh_name|`utf8`| |metadata|`json`| |spec|`json`| 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 7a6cd75b957c2e..39b5e8f546a4e3 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 @@ -4,17 +4,18 @@ This table shows data for AWS App Runner Auto Scaling Configurations. https://docs.aws.amazon.com/apprunner/latest/api/API_AutoScalingConfiguration.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |auto_scaling_configuration_arn|`utf8`| |auto_scaling_configuration_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_connections.md b/plugins/source/aws/docs/tables/aws_apprunner_connections.md index 112393fb6ebb80..0f0e05ca2a4b56 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_connections.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_connections.md @@ -4,17 +4,18 @@ This table shows data for AWS App Runner Connections. https://docs.aws.amazon.com/apprunner/latest/api/API_Connection.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |connection_arn|`utf8`| |connection_name|`utf8`| 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 428c14a0ce07a6..d287fbac885ef0 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_custom_domains.md @@ -4,8 +4,8 @@ This table shows data for AWS App Runner Custom Domains. https://docs.aws.amazon.com/apprunner/latest/api/API_CustomDomain.html -The composite primary key for this table is (**service_arn**, **domain_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**service_arn**, **domain_name**). ## Relations This table depends on [aws_apprunner_services](aws_apprunner_services.md). @@ -14,12 +14,12 @@ This table depends on [aws_apprunner_services](aws_apprunner_services.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|service_arn (PK)|`utf8`| +|service_arn|`utf8`| |enable_www_subdomain|`bool`| -|domain_name (PK)|`utf8`| +|domain_name|`utf8`| |status|`utf8`| |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 f3e6e14c884a5a..bc5178f73bd4e8 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_observability_configurations.md @@ -4,17 +4,18 @@ This table shows data for AWS App Runner Observability Configurations. https://docs.aws.amazon.com/apprunner/latest/api/API_ObservabilityConfiguration.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |deleted_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_operations.md b/plugins/source/aws/docs/tables/aws_apprunner_operations.md index 08c94949b2da83..dd1ae53cdb4a00 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_operations.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_operations.md @@ -4,8 +4,8 @@ This table shows data for AWS App Runner Operations. https://docs.aws.amazon.com/apprunner/latest/api/API_OperationSummary.html -The composite primary key for this table is (**service_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**service_arn**, **id**). ## Relations This table depends on [aws_apprunner_services](aws_apprunner_services.md). @@ -14,13 +14,13 @@ This table depends on [aws_apprunner_services](aws_apprunner_services.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|service_arn (PK)|`utf8`| +|service_arn|`utf8`| |ended_at|`timestamp[us, tz=UTC]`| -|id (PK)|`utf8`| +|id|`utf8`| |started_at|`timestamp[us, tz=UTC]`| |status|`utf8`| |target_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_apprunner_services.md b/plugins/source/aws/docs/tables/aws_apprunner_services.md index 9327be534d5d73..bfe1a1540058c6 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_services.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_services.md @@ -4,8 +4,8 @@ This table shows data for AWS App Runner Services. https://docs.aws.amazon.com/apprunner/latest/api/API_Service.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_apprunner_services: @@ -16,11 +16,11 @@ The following tables depend on aws_apprunner_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |auto_scaling_configuration_summary|`json`| |created_at|`timestamp[us, tz=UTC]`| 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 cf293826b14dc9..985a426faf1b0e 100644 --- a/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md +++ b/plugins/source/aws/docs/tables/aws_apprunner_vpc_connectors.md @@ -4,17 +4,18 @@ This table shows data for AWS App Runner VPC Connectors. https://docs.aws.amazon.com/apprunner/latest/api/API_VpcConnector.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |deleted_at|`timestamp[us, tz=UTC]`| 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 7bef03960f76c5..7708c4cbcfc3d8 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 @@ -7,17 +7,18 @@ 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. -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |source_account_id|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_app_blocks.md b/plugins/source/aws/docs/tables/aws_appstream_app_blocks.md index 72309a0de22add..bc7bded785b3e0 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_app_blocks.md +++ b/plugins/source/aws/docs/tables/aws_appstream_app_blocks.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream App Blocks. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_AppBlock.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |app_block_errors|`json`| |created_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_application_fleet_associations.md b/plugins/source/aws/docs/tables/aws_appstream_application_fleet_associations.md index 8ccbecd5ef075d..8cc54e8806a4a1 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_application_fleet_associations.md +++ b/plugins/source/aws/docs/tables/aws_appstream_application_fleet_associations.md @@ -4,8 +4,8 @@ This table shows data for Amazon AppStream Application Fleet Associations. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ApplicationFleetAssociation.html -The composite primary key for this table is (**application_arn**, **fleet_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**application_arn**, **fleet_name**). ## Relations This table depends on [aws_appstream_applications](aws_appstream_applications.md). @@ -14,9 +14,9 @@ This table depends on [aws_appstream_applications](aws_appstream_applications.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|application_arn (PK)|`utf8`| -|fleet_name (PK)|`utf8`| \ No newline at end of file +|application_arn|`utf8`| +|fleet_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_appstream_applications.md b/plugins/source/aws/docs/tables/aws_appstream_applications.md index f11a470c58c641..03bec20cd9df11 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_applications.md +++ b/plugins/source/aws/docs/tables/aws_appstream_applications.md @@ -4,8 +4,8 @@ This table shows data for Amazon AppStream Applications. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Application.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_appstream_applications: @@ -15,11 +15,11 @@ The following tables depend on aws_appstream_applications: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |app_block_arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_directory_configs.md b/plugins/source/aws/docs/tables/aws_appstream_directory_configs.md index b3dc30c7d78ae2..4955ad75aa921c 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_directory_configs.md +++ b/plugins/source/aws/docs/tables/aws_appstream_directory_configs.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream Directory Configs. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_DirectoryConfig.html -The composite primary key for this table is (**account_id**, **region**, **directory_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **directory_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|directory_name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|directory_name|`utf8`| |certificate_based_auth_properties|`json`| |created_time|`timestamp[us, tz=UTC]`| |organizational_unit_distinguished_names|`list`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_fleets.md b/plugins/source/aws/docs/tables/aws_appstream_fleets.md index 5f7437b729fe88..c644804cef33cb 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_fleets.md +++ b/plugins/source/aws/docs/tables/aws_appstream_fleets.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream Fleets. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Fleet.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |compute_capacity_status|`json`| |instance_type|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_image_builders.md b/plugins/source/aws/docs/tables/aws_appstream_image_builders.md index f0bd7cc89e36ea..87f3e121c9d2c1 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_image_builders.md +++ b/plugins/source/aws/docs/tables/aws_appstream_image_builders.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream Image Builders. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_ImageBuilder.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |access_endpoints|`json`| |appstream_agent_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_images.md b/plugins/source/aws/docs/tables/aws_appstream_images.md index 8493dc6637926a..be8e3f10bb4a0f 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_images.md +++ b/plugins/source/aws/docs/tables/aws_appstream_images.md @@ -4,20 +4,21 @@ This table shows data for Amazon AppStream Images. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Image.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |name|`utf8`| |applications|`json`| |appstream_agent_version|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |base_image_arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_stack_entitlements.md b/plugins/source/aws/docs/tables/aws_appstream_stack_entitlements.md index c5c1420161347e..5091d26cf900b5 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_stack_entitlements.md +++ b/plugins/source/aws/docs/tables/aws_appstream_stack_entitlements.md @@ -4,8 +4,8 @@ This table shows data for Amazon AppStream Stack Entitlements. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Entitlement.html -The composite primary key for this table is (**account_id**, **region**, **stack_name**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **stack_name**, **name**). ## Relations This table depends on [aws_appstream_stacks](aws_appstream_stacks.md). @@ -14,12 +14,12 @@ This table depends on [aws_appstream_stacks](aws_appstream_stacks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|stack_name (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|stack_name|`utf8`| +|name|`utf8`| |app_visibility|`utf8`| |attributes|`json`| |created_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_stack_user_associations.md b/plugins/source/aws/docs/tables/aws_appstream_stack_user_associations.md index 35dde4cae2e0fe..652f09f120e89a 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_stack_user_associations.md +++ b/plugins/source/aws/docs/tables/aws_appstream_stack_user_associations.md @@ -4,8 +4,8 @@ This table shows data for Amazon AppStream Stack User Associations. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UserStackAssociation.html -The composite primary key for this table is (**account_id**, **region**, **stack_name**, **user_name**, **authentication_type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **stack_name**, **user_name**, **authentication_type**). ## Relations This table depends on [aws_appstream_stacks](aws_appstream_stacks.md). @@ -14,11 +14,11 @@ This table depends on [aws_appstream_stacks](aws_appstream_stacks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|stack_name (PK)|`utf8`| -|user_name (PK)|`utf8`| -|authentication_type (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|stack_name|`utf8`| +|user_name|`utf8`| +|authentication_type|`utf8`| |send_email_notification|`bool`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_appstream_stacks.md b/plugins/source/aws/docs/tables/aws_appstream_stacks.md index ccb552cdc0306c..e9afb7f87f80bb 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_stacks.md +++ b/plugins/source/aws/docs/tables/aws_appstream_stacks.md @@ -4,8 +4,8 @@ This table shows data for Amazon AppStream Stacks. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Stack.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_appstream_stacks: @@ -16,11 +16,11 @@ The following tables depend on aws_appstream_stacks: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |access_endpoints|`json`| |application_settings|`json`| diff --git a/plugins/source/aws/docs/tables/aws_appstream_usage_report_subscriptions.md b/plugins/source/aws/docs/tables/aws_appstream_usage_report_subscriptions.md index 51e5eff2e709ff..bb32c9017f884c 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_usage_report_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_appstream_usage_report_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream Usage Report Subscriptions. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_UsageReportSubscription.html -The composite primary key for this table is (**account_id**, **region**, **s3_bucket_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **s3_bucket_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|s3_bucket_name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|s3_bucket_name|`utf8`| |last_generated_report_date|`timestamp[us, tz=UTC]`| |schedule|`utf8`| |subscription_errors|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_appstream_users.md b/plugins/source/aws/docs/tables/aws_appstream_users.md index 4199c39b508ce8..0da6599b9a2c2b 100644 --- a/plugins/source/aws/docs/tables/aws_appstream_users.md +++ b/plugins/source/aws/docs/tables/aws_appstream_users.md @@ -4,17 +4,18 @@ This table shows data for Amazon AppStream Users. https://docs.aws.amazon.com/appstream2/latest/APIReference/API_User.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |authentication_type|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |enabled|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_appsync_graphql_apis.md b/plugins/source/aws/docs/tables/aws_appsync_graphql_apis.md index 13004e90e3fd06..ff33d8b84dadc2 100644 --- a/plugins/source/aws/docs/tables/aws_appsync_graphql_apis.md +++ b/plugins/source/aws/docs/tables/aws_appsync_graphql_apis.md @@ -4,17 +4,18 @@ This table shows data for Appsync Graphql APIs. https://docs.aws.amazon.com/appsync/latest/APIReference/API_GraphqlApi.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |additional_authentication_providers|`json`| |api_id|`utf8`| |api_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_athena_data_catalog_database_tables.md b/plugins/source/aws/docs/tables/aws_athena_data_catalog_database_tables.md index 975c609588481e..156ed1e868b261 100644 --- a/plugins/source/aws/docs/tables/aws_athena_data_catalog_database_tables.md +++ b/plugins/source/aws/docs/tables/aws_athena_data_catalog_database_tables.md @@ -4,8 +4,8 @@ This table shows data for Athena Data Catalog Database Tables. https://docs.aws.amazon.com/athena/latest/APIReference/API_TableMetadata.html -The composite primary key for this table is (**data_catalog_arn**, **data_catalog_database_name**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**data_catalog_arn**, **data_catalog_database_name**, **name**). ## Relations This table depends on [aws_athena_data_catalog_databases](aws_athena_data_catalog_databases.md). @@ -14,13 +14,13 @@ This table depends on [aws_athena_data_catalog_databases](aws_athena_data_catalo | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|data_catalog_arn (PK)|`utf8`| -|data_catalog_database_name (PK)|`utf8`| -|name (PK)|`utf8`| +|data_catalog_arn|`utf8`| +|data_catalog_database_name|`utf8`| +|name|`utf8`| |columns|`json`| |create_time|`timestamp[us, tz=UTC]`| |last_access_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_athena_data_catalog_databases.md b/plugins/source/aws/docs/tables/aws_athena_data_catalog_databases.md index 99865a4b7874cd..86b61e380f8aab 100644 --- a/plugins/source/aws/docs/tables/aws_athena_data_catalog_databases.md +++ b/plugins/source/aws/docs/tables/aws_athena_data_catalog_databases.md @@ -4,8 +4,8 @@ This table shows data for Athena Data Catalog Databases. https://docs.aws.amazon.com/athena/latest/APIReference/API_Database.html -The composite primary key for this table is (**data_catalog_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**data_catalog_arn**, **name**). ## Relations This table depends on [aws_athena_data_catalogs](aws_athena_data_catalogs.md). @@ -17,11 +17,11 @@ The following tables depend on aws_athena_data_catalog_databases: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|data_catalog_arn (PK)|`utf8`| -|name (PK)|`utf8`| +|data_catalog_arn|`utf8`| +|name|`utf8`| |description|`utf8`| |parameters|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_athena_data_catalogs.md b/plugins/source/aws/docs/tables/aws_athena_data_catalogs.md index 2378ca9fe42410..a5a55723b96e8f 100644 --- a/plugins/source/aws/docs/tables/aws_athena_data_catalogs.md +++ b/plugins/source/aws/docs/tables/aws_athena_data_catalogs.md @@ -4,8 +4,8 @@ This table shows data for Athena Data Catalogs. https://docs.aws.amazon.com/athena/latest/APIReference/API_DataCatalog.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_athena_data_catalogs: @@ -15,11 +15,11 @@ The following tables depend on aws_athena_data_catalogs: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |name|`utf8`| |type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_athena_work_group_named_queries.md b/plugins/source/aws/docs/tables/aws_athena_work_group_named_queries.md index 25eb29a3c6a6a7..9a28df047d178a 100644 --- a/plugins/source/aws/docs/tables/aws_athena_work_group_named_queries.md +++ b/plugins/source/aws/docs/tables/aws_athena_work_group_named_queries.md @@ -4,8 +4,8 @@ This table shows data for Athena Work Group Named Queries. https://docs.aws.amazon.com/athena/latest/APIReference/API_NamedQuery.html -The composite primary key for this table is (**work_group_arn**, **named_query_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**work_group_arn**, **named_query_id**). ## Relations This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). @@ -14,14 +14,14 @@ This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|work_group_arn (PK)|`utf8`| +|work_group_arn|`utf8`| |database|`utf8`| |name|`utf8`| |query_string|`utf8`| |description|`utf8`| -|named_query_id (PK)|`utf8`| +|named_query_id|`utf8`| |work_group|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_athena_work_group_prepared_statements.md b/plugins/source/aws/docs/tables/aws_athena_work_group_prepared_statements.md index 6041a04abb1bf0..9e283e56189efd 100644 --- a/plugins/source/aws/docs/tables/aws_athena_work_group_prepared_statements.md +++ b/plugins/source/aws/docs/tables/aws_athena_work_group_prepared_statements.md @@ -4,8 +4,8 @@ This table shows data for Athena Work Group Prepared Statements. https://docs.aws.amazon.com/athena/latest/APIReference/API_PreparedStatement.html -The composite primary key for this table is (**work_group_arn**, **statement_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**work_group_arn**, **statement_name**). ## Relations This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). @@ -14,13 +14,13 @@ This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|work_group_arn (PK)|`utf8`| +|work_group_arn|`utf8`| |description|`utf8`| |last_modified_time|`timestamp[us, tz=UTC]`| |query_statement|`utf8`| -|statement_name (PK)|`utf8`| +|statement_name|`utf8`| |work_group_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_athena_work_group_query_executions.md b/plugins/source/aws/docs/tables/aws_athena_work_group_query_executions.md index f33db681973a0c..00ca2407bcd0ff 100644 --- a/plugins/source/aws/docs/tables/aws_athena_work_group_query_executions.md +++ b/plugins/source/aws/docs/tables/aws_athena_work_group_query_executions.md @@ -4,8 +4,8 @@ This table shows data for Athena Work Group Query Executions. https://docs.aws.amazon.com/athena/latest/APIReference/API_QueryExecution.html -The composite primary key for this table is (**work_group_arn**, **query_execution_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**work_group_arn**, **query_execution_id**). ## Relations This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). @@ -14,16 +14,16 @@ This table depends on [aws_athena_work_groups](aws_athena_work_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|work_group_arn (PK)|`utf8`| +|work_group_arn|`utf8`| |engine_version|`json`| |execution_parameters|`list`| |query|`utf8`| |query_execution_context|`json`| -|query_execution_id (PK)|`utf8`| +|query_execution_id|`utf8`| |query_results_s3_access_grants_configuration|`json`| |result_configuration|`json`| |result_reuse_configuration|`json`| diff --git a/plugins/source/aws/docs/tables/aws_athena_work_groups.md b/plugins/source/aws/docs/tables/aws_athena_work_groups.md index 1ebffe16bcb1a1..8f372f1178e558 100644 --- a/plugins/source/aws/docs/tables/aws_athena_work_groups.md +++ b/plugins/source/aws/docs/tables/aws_athena_work_groups.md @@ -4,8 +4,8 @@ This table shows data for Athena Work Groups. https://docs.aws.amazon.com/athena/latest/APIReference/API_WorkGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_athena_work_groups: @@ -17,11 +17,11 @@ The following tables depend on aws_athena_work_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |name|`utf8`| |configuration|`json`| diff --git a/plugins/source/aws/docs/tables/aws_auditmanager_assessments.md b/plugins/source/aws/docs/tables/aws_auditmanager_assessments.md index d65cb0f385aa7e..aca90426d1d324 100644 --- a/plugins/source/aws/docs/tables/aws_auditmanager_assessments.md +++ b/plugins/source/aws/docs/tables/aws_auditmanager_assessments.md @@ -4,17 +4,18 @@ This table shows data for AWS Audit Manager Assessments. https://docs.aws.amazon.com/audit-manager/latest/APIReference/API_Assessment.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |aws_account|`json`| |framework|`json`| |metadata|`json`| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_group_lifecycle_hooks.md b/plugins/source/aws/docs/tables/aws_autoscaling_group_lifecycle_hooks.md index 82b1edac4672f3..96903a646ae744 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_group_lifecycle_hooks.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_group_lifecycle_hooks.md @@ -4,8 +4,8 @@ This table shows data for Auto Scaling Group Lifecycle Hooks. https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LifecycleHook.html -The composite primary key for this table is (**group_arn**, **lifecycle_hook_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**group_arn**, **lifecycle_hook_name**). ## Relations This table depends on [aws_autoscaling_groups](aws_autoscaling_groups.md). @@ -14,16 +14,16 @@ This table depends on [aws_autoscaling_groups](aws_autoscaling_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|group_arn (PK)|`utf8`| +|group_arn|`utf8`| |auto_scaling_group_name|`utf8`| |default_result|`utf8`| |global_timeout|`int64`| |heartbeat_timeout|`int64`| -|lifecycle_hook_name (PK)|`utf8`| +|lifecycle_hook_name|`utf8`| |lifecycle_transition|`utf8`| |notification_metadata|`utf8`| |notification_target_arn|`utf8`| 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 ed89572771e2bd..bf1c8394f98fd9 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 @@ -4,8 +4,8 @@ This table shows data for Auto Scaling Group Scaling Policies. https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScalingPolicy.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_autoscaling_groups](aws_autoscaling_groups.md). @@ -14,12 +14,12 @@ This table depends on [aws_autoscaling_groups](aws_autoscaling_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |group_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |adjustment_type|`utf8`| |alarms|`json`| |auto_scaling_group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_groups.md b/plugins/source/aws/docs/tables/aws_autoscaling_groups.md index 46e3cfb6150285..9428152870cdfc 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_groups.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_groups.md @@ -4,8 +4,8 @@ This table shows data for Auto Scaling Groups. https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_AutoScalingGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_autoscaling_groups: @@ -16,13 +16,13 @@ The following tables depend on aws_autoscaling_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |load_balancers|`json`| |load_balancer_target_groups|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |tags_raw|`json`| |auto_scaling_group_name|`utf8`| 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 23ad1046f7f033..d1fda6ff38a809 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_launch_configurations.md @@ -4,17 +4,18 @@ This table shows data for Auto Scaling Launch Configurations. https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LaunchConfiguration.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |image_id|`utf8`| |instance_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_plan_resources.md b/plugins/source/aws/docs/tables/aws_autoscaling_plan_resources.md index 67502b11b7f92a..68683be6f78fd5 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_plan_resources.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_plan_resources.md @@ -4,8 +4,8 @@ This table shows data for Auto Scaling Plan Resources. https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPlanResource.html -The composite primary key for this table is (**account_id**, **region**, **resource_id**, **scaling_plan_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_id**, **scaling_plan_name**). ## Relations This table depends on [aws_autoscaling_plans](aws_autoscaling_plans.md). @@ -14,13 +14,13 @@ This table depends on [aws_autoscaling_plans](aws_autoscaling_plans.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|resource_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|resource_id|`utf8`| |scalable_dimension|`utf8`| -|scaling_plan_name (PK)|`utf8`| +|scaling_plan_name|`utf8`| |scaling_plan_version|`int64`| |scaling_status_code|`utf8`| |service_namespace|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_autoscaling_plans.md b/plugins/source/aws/docs/tables/aws_autoscaling_plans.md index 835b7b96c779da..a4c5a43872bb22 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_plans.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_plans.md @@ -4,8 +4,8 @@ This table shows data for Auto Scaling Plans. https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPlan.html -The composite primary key for this table is (**account_id**, **region**, **scaling_plan_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **scaling_plan_name**). ## Relations The following tables depend on aws_autoscaling_plans: @@ -15,13 +15,13 @@ The following tables depend on aws_autoscaling_plans: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |application_source|`json`| |scaling_instructions|`json`| -|scaling_plan_name (PK)|`utf8`| +|scaling_plan_name|`utf8`| |scaling_plan_version|`int64`| |status_code|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| 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 12a80cf875d981..6867efce44d37e 100644 --- a/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md +++ b/plugins/source/aws/docs/tables/aws_autoscaling_scheduled_actions.md @@ -4,17 +4,18 @@ This table shows data for Auto Scaling Scheduled Actions. https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_ScheduledUpdateGroupAction.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_scaling_group_name|`utf8`| |desired_capacity|`int64`| |end_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_availability_zones.md b/plugins/source/aws/docs/tables/aws_availability_zones.md index e0157efee750c6..3b2188d8f94e90 100644 --- a/plugins/source/aws/docs/tables/aws_availability_zones.md +++ b/plugins/source/aws/docs/tables/aws_availability_zones.md @@ -4,15 +4,16 @@ This table shows data for Availability Zones. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AvailabilityZone.html -The composite primary key for this table is (**account_id**, **region_name**, **zone_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region_name**, **zone_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |enabled|`bool`| |partition|`utf8`| |region|`utf8`| @@ -22,8 +23,8 @@ The composite primary key for this table is (**account_id**, **region_name**, ** |opt_in_status|`utf8`| |parent_zone_id|`utf8`| |parent_zone_name|`utf8`| -|region_name (PK)|`utf8`| +|region_name|`utf8`| |state|`utf8`| -|zone_id (PK)|`utf8`| +|zone_id|`utf8`| |zone_name|`utf8`| |zone_type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_backup_global_settings.md b/plugins/source/aws/docs/tables/aws_backup_global_settings.md index 30773b6d600296..1bdb0c714948ba 100644 --- a/plugins/source/aws/docs/tables/aws_backup_global_settings.md +++ b/plugins/source/aws/docs/tables/aws_backup_global_settings.md @@ -4,15 +4,16 @@ This table shows data for Backup Global Settings. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeGlobalSettings.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |global_settings|`json`| |last_update_time|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_backup_jobs.md b/plugins/source/aws/docs/tables/aws_backup_jobs.md index 0a010496335bf6..86cd3f913165c8 100644 --- a/plugins/source/aws/docs/tables/aws_backup_jobs.md +++ b/plugins/source/aws/docs/tables/aws_backup_jobs.md @@ -4,17 +4,18 @@ This table shows data for Backup Jobs. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_BackupJob.html -The composite primary key for this table is (**account_id**, **region**, **backup_job_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **backup_job_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|backup_job_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|backup_job_id|`utf8`| |backup_options|`json`| |backup_size_in_bytes|`int64`| |backup_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_backup_plan_selections.md b/plugins/source/aws/docs/tables/aws_backup_plan_selections.md index 7225a792e4b6f9..6298b7f6854454 100644 --- a/plugins/source/aws/docs/tables/aws_backup_plan_selections.md +++ b/plugins/source/aws/docs/tables/aws_backup_plan_selections.md @@ -4,8 +4,8 @@ This table shows data for Backup Plan Selections. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_GetBackupSelection.html -The composite primary key for this table is (**plan_arn**, **plan_version_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**plan_arn**, **plan_version_id**). ## Relations This table depends on [aws_backup_plans](aws_backup_plans.md). @@ -14,12 +14,12 @@ This table depends on [aws_backup_plans](aws_backup_plans.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|plan_arn (PK)|`utf8`| -|plan_version_id (PK)|`utf8`| +|plan_arn|`utf8`| +|plan_version_id|`utf8`| |backup_plan_id|`utf8`| |backup_selection|`json`| |creation_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_backup_plans.md b/plugins/source/aws/docs/tables/aws_backup_plans.md index 105c648a2f9f65..f68d11e0f678fe 100644 --- a/plugins/source/aws/docs/tables/aws_backup_plans.md +++ b/plugins/source/aws/docs/tables/aws_backup_plans.md @@ -4,8 +4,8 @@ This table shows data for Backup Plans. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_GetBackupPlan.html -The composite primary key for this table is (**arn**, **version_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **version_id**). ## Relations The following tables depend on aws_backup_plans: @@ -15,11 +15,11 @@ The following tables depend on aws_backup_plans: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |advanced_backup_settings|`json`| |backup_plan|`json`| @@ -29,4 +29,4 @@ The following tables depend on aws_backup_plans: |creator_request_id|`utf8`| |deletion_date|`timestamp[us, tz=UTC]`| |last_execution_date|`timestamp[us, tz=UTC]`| -|version_id (PK)|`utf8`| \ No newline at end of file +|version_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_backup_protected_resources.md b/plugins/source/aws/docs/tables/aws_backup_protected_resources.md index b3058d6ceae20f..67a1f47cbee19b 100644 --- a/plugins/source/aws/docs/tables/aws_backup_protected_resources.md +++ b/plugins/source/aws/docs/tables/aws_backup_protected_resources.md @@ -4,17 +4,18 @@ This table shows data for Backup Protected Resources. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListProtectedResources.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |last_backup_time|`timestamp[us, tz=UTC]`| |last_backup_vault_arn|`utf8`| |last_recovery_point_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_backup_region_settings.md b/plugins/source/aws/docs/tables/aws_backup_region_settings.md index bf8b4649afc829..de53a3ab71bde6 100644 --- a/plugins/source/aws/docs/tables/aws_backup_region_settings.md +++ b/plugins/source/aws/docs/tables/aws_backup_region_settings.md @@ -4,15 +4,16 @@ This table shows data for Backup Region Settings. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_DescribeRegionSettings.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |resource_type_management_preference|`json`| |resource_type_opt_in_preference|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_backup_report_plans.md b/plugins/source/aws/docs/tables/aws_backup_report_plans.md index d5ce140c002edb..f733affb278c99 100644 --- a/plugins/source/aws/docs/tables/aws_backup_report_plans.md +++ b/plugins/source/aws/docs/tables/aws_backup_report_plans.md @@ -4,17 +4,18 @@ This table shows data for Backup Report Plans. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ReportPlan.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |deployment_status|`utf8`| 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 6f4f8baa980b66..c349a14d0a3178 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 @@ -4,8 +4,8 @@ This table shows data for Backup Vault Recovery Points. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_RecoveryPointByBackupVault.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_backup_vaults](aws_backup_vaults.md). @@ -14,12 +14,12 @@ This table depends on [aws_backup_vaults](aws_backup_vaults.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |vault_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |backup_size_in_bytes|`int64`| |backup_vault_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_backup_vaults.md b/plugins/source/aws/docs/tables/aws_backup_vaults.md index 26192ddbcb1b81..f34e2b0ec4991f 100644 --- a/plugins/source/aws/docs/tables/aws_backup_vaults.md +++ b/plugins/source/aws/docs/tables/aws_backup_vaults.md @@ -4,8 +4,8 @@ This table shows data for Backup Vaults. https://docs.aws.amazon.com/aws-backup/latest/devguide/API_BackupVaultListMember.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_backup_vaults: @@ -15,11 +15,11 @@ The following tables depend on aws_backup_vaults: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |access_policy|`json`| |notifications|`json`| |tags|`json`| diff --git a/plugins/source/aws/docs/tables/aws_batch_compute_environments.md b/plugins/source/aws/docs/tables/aws_batch_compute_environments.md index 05184bf4bddfb9..e2b733d6eb4553 100644 --- a/plugins/source/aws/docs/tables/aws_batch_compute_environments.md +++ b/plugins/source/aws/docs/tables/aws_batch_compute_environments.md @@ -4,18 +4,19 @@ This table shows data for Batch Compute Environments. https://docs.aws.amazon.com/batch/latest/APIReference/API_DescribeComputeEnvironments.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |compute_environment_arn|`utf8`| |compute_environment_name|`utf8`| |compute_resources|`json`| diff --git a/plugins/source/aws/docs/tables/aws_batch_job_definitions.md b/plugins/source/aws/docs/tables/aws_batch_job_definitions.md index 0dd757afc19ff2..d30719106c14dd 100644 --- a/plugins/source/aws/docs/tables/aws_batch_job_definitions.md +++ b/plugins/source/aws/docs/tables/aws_batch_job_definitions.md @@ -4,18 +4,19 @@ This table shows data for Batch Job Definitions. https://docs.aws.amazon.com/batch/latest/APIReference/API_DescribeJobDefinitions.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |job_definition_arn|`utf8`| |job_definition_name|`utf8`| |revision|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_batch_job_queues.md b/plugins/source/aws/docs/tables/aws_batch_job_queues.md index 0feada9eacd6ab..fdb41b7c7d3e8f 100644 --- a/plugins/source/aws/docs/tables/aws_batch_job_queues.md +++ b/plugins/source/aws/docs/tables/aws_batch_job_queues.md @@ -4,8 +4,8 @@ This table shows data for Batch Job Queues. https://docs.aws.amazon.com/batch/latest/APIReference/API_DescribeJobQueues.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_batch_job_queues: @@ -15,12 +15,12 @@ The following tables depend on aws_batch_job_queues: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |compute_environment_order|`json`| |job_queue_arn|`utf8`| |job_queue_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_batch_jobs.md b/plugins/source/aws/docs/tables/aws_batch_jobs.md index 87efe98c730ae2..ce18387768c05c 100644 --- a/plugins/source/aws/docs/tables/aws_batch_jobs.md +++ b/plugins/source/aws/docs/tables/aws_batch_jobs.md @@ -4,8 +4,8 @@ This table shows data for Batch Jobs. https://docs.aws.amazon.com/batch/latest/APIReference/API_DescribeJobs.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_batch_job_queues](aws_batch_job_queues.md). @@ -14,12 +14,12 @@ This table depends on [aws_batch_job_queues](aws_batch_job_queues.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |job_definition|`utf8`| |job_id|`utf8`| |job_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_resource_drifts.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_resource_drifts.md index 1f32ab1d521482..8265c1cb98a4ba 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_resource_drifts.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_resource_drifts.md @@ -5,8 +5,8 @@ This table shows data for AWS CloudFormation Stack Instance Resource Drifts. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackInstanceResourceDriftsSummary.html. The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**stack_set_arn**, **operation_id**, **logical_resource_id**, **stack_id**, **physical_resource_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**stack_set_arn**, **operation_id**, **logical_resource_id**, **stack_id**, **physical_resource_id**). ## Relations This table depends on [aws_cloudformation_stack_instance_summaries](aws_cloudformation_stack_instance_summaries.md). @@ -15,17 +15,17 @@ This table depends on [aws_cloudformation_stack_instance_summaries](aws_cloudfor | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |request_account_id|`utf8`| |request_region|`utf8`| -|stack_set_arn (PK)|`utf8`| -|operation_id (PK)|`utf8`| -|logical_resource_id (PK)|`utf8`| +|stack_set_arn|`utf8`| +|operation_id|`utf8`| +|logical_resource_id|`utf8`| |resource_type|`utf8`| -|stack_id (PK)|`utf8`| +|stack_id|`utf8`| |stack_resource_drift_status|`utf8`| |timestamp|`timestamp[us, tz=UTC]`| -|physical_resource_id (PK)|`utf8`| +|physical_resource_id|`utf8`| |physical_resource_id_context|`json`| |property_differences|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_summaries.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_summaries.md index a63381c0c85cf0..e55461ed9d22f6 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_summaries.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_instance_summaries.md @@ -6,8 +6,8 @@ https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackInsta **Note**: Sometimes the stack instance ID may be unavailable in the API (i.e., the instance is in a bad state), so it will have value of `N/A`. -The composite primary key for this table is (**stack_set_arn**, **stack_id**, **stack_set_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**stack_set_arn**, **stack_id**, **stack_set_id**). ## Relations This table depends on [aws_cloudformation_stack_sets](aws_cloudformation_stack_sets.md). @@ -19,19 +19,19 @@ The following tables depend on aws_cloudformation_stack_instance_summaries: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |id|`utf8`| -|stack_set_arn (PK)|`utf8`| +|stack_set_arn|`utf8`| |account|`utf8`| |drift_status|`utf8`| |last_drift_check_timestamp|`timestamp[us, tz=UTC]`| |last_operation_id|`utf8`| |organizational_unit_id|`utf8`| -|stack_id (PK)|`utf8`| +|stack_id|`utf8`| |stack_instance_status|`json`| -|stack_set_id (PK)|`utf8`| +|stack_set_id|`utf8`| |status|`utf8`| |status_reason|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_resources.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_resources.md index 82dde90e808c73..0925307e496a73 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_resources.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_resources.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Stack Resources. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackResourceSummary.html -The composite primary key for this table is (**stack_id**, **logical_resource_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**stack_id**, **logical_resource_id**). ## Relations This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). @@ -14,13 +14,13 @@ This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|stack_id (PK)|`utf8`| +|stack_id|`utf8`| |last_updated_timestamp|`timestamp[us, tz=UTC]`| -|logical_resource_id (PK)|`utf8`| +|logical_resource_id|`utf8`| |resource_status|`utf8`| |resource_type|`utf8`| |drift_information|`json`| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operation_results.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operation_results.md index 9c0c664c70d544..5826c413664463 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operation_results.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operation_results.md @@ -6,8 +6,8 @@ https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackSetOp The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**request_account_id**, **request_region**, **stack_set_arn**, **operation_id**, **account**, **region**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **stack_set_arn**, **operation_id**, **account**, **region**). ## Relations This table depends on [aws_cloudformation_stack_set_operations](aws_cloudformation_stack_set_operations.md). @@ -16,15 +16,15 @@ This table depends on [aws_cloudformation_stack_set_operations](aws_cloudformati | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|stack_set_arn (PK)|`utf8`| -|operation_id (PK)|`utf8`| -|account (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|stack_set_arn|`utf8`| +|operation_id|`utf8`| +|account|`utf8`| |account_gate_result|`json`| |organizational_unit_id|`utf8`| -|region (PK)|`utf8`| +|region|`utf8`| |status|`utf8`| |status_reason|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operations.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operations.md index 4295de595bdcba..1f677184ecc487 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operations.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_set_operations.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Stack Set Operations. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackSetOperation.html -The composite primary key for this table is (**stack_set_arn**, **creation_timestamp**, **operation_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**stack_set_arn**, **creation_timestamp**, **operation_id**). ## Relations This table depends on [aws_cloudformation_stack_sets](aws_cloudformation_stack_sets.md). @@ -17,19 +17,19 @@ The following tables depend on aws_cloudformation_stack_set_operations: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |id|`utf8`| -|stack_set_arn (PK)|`utf8`| +|stack_set_arn|`utf8`| |action|`utf8`| |administration_role_arn|`utf8`| -|creation_timestamp (PK)|`timestamp[us, tz=UTC]`| +|creation_timestamp|`timestamp[us, tz=UTC]`| |deployment_targets|`json`| |end_timestamp|`timestamp[us, tz=UTC]`| |execution_role_name|`utf8`| -|operation_id (PK)|`utf8`| +|operation_id|`utf8`| |operation_preferences|`json`| |retain_stacks|`bool`| |stack_set_drift_detection_details|`json`| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_sets.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_sets.md index a46ac519086445..f97ef7799d46d2 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_sets.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_sets.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Stack Sets. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackSet.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_cloudformation_stack_sets: @@ -16,12 +16,12 @@ The following tables depend on aws_cloudformation_stack_sets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |administration_role_arn|`utf8`| |auto_deployment|`json`| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stack_templates.md b/plugins/source/aws/docs/tables/aws_cloudformation_stack_templates.md index 42747c6d9107df..06d8c444c170c6 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stack_templates.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stack_templates.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Stack Templates. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_GetTemplate.html -The primary key for this table is **stack_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **stack_arn**. ## Relations This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). @@ -14,11 +14,11 @@ This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|stack_arn (PK)|`utf8`| +|stack_arn|`utf8`| |template_body|`json`| |template_body_text|`utf8`| |stages_available|`list`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md b/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md index 767f533e533239..80520956ae6cd2 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_stacks.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Stacks. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_Stack.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_cloudformation_stacks: @@ -17,12 +17,12 @@ The following tables depend on aws_cloudformation_stacks: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |stack_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudformation_template_summaries.md b/plugins/source/aws/docs/tables/aws_cloudformation_template_summaries.md index 554970c3f934a2..034ca7cc1a7d6a 100644 --- a/plugins/source/aws/docs/tables/aws_cloudformation_template_summaries.md +++ b/plugins/source/aws/docs/tables/aws_cloudformation_template_summaries.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudFormation Template Summaries. https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_GetTemplateSummary.html -The primary key for this table is **stack_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **stack_arn**. ## Relations This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). @@ -14,12 +14,12 @@ This table depends on [aws_cloudformation_stacks](aws_cloudformation_stacks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |stack_id|`utf8`| -|stack_arn (PK)|`utf8`| +|stack_arn|`utf8`| |metadata|`json`| |capabilities|`list`| |capabilities_reason|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_cache_policies.md b/plugins/source/aws/docs/tables/aws_cloudfront_cache_policies.md index 1de1db62a12c9f..647749b254cf04 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_cache_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_cache_policies.md @@ -4,16 +4,17 @@ This table shows data for Cloudfront Cache Policies. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_CachePolicySummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cache_policy|`json`| |type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_distributions.md b/plugins/source/aws/docs/tables/aws_cloudfront_distributions.md index 6e04d590fadc5e..a0761c92c0f4a3 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_distributions.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_distributions.md @@ -4,17 +4,18 @@ This table shows data for Cloudfront Distributions. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_Distribution.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |distribution_config|`json`| |domain_name|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_functions.md b/plugins/source/aws/docs/tables/aws_cloudfront_functions.md index aa6da9266309cb..721fa9609ebb05 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_functions.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_functions.md @@ -4,16 +4,17 @@ This table shows data for Cloudfront Functions. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_DescribeFunction.html -The composite primary key for this table is (**stage**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**stage**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|stage (PK)|`utf8`| -|arn (PK)|`utf8`| +|stage|`utf8`| +|arn|`utf8`| |e_tag|`utf8`| |function_summary|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_origin_access_identities.md b/plugins/source/aws/docs/tables/aws_cloudfront_origin_access_identities.md index 854bcf5e5cd314..9d45eda75af1f9 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_origin_access_identities.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_origin_access_identities.md @@ -4,15 +4,16 @@ This table shows data for Cloudfront Origin Access Identities. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListCloudFrontOriginAccessIdentities.html -The composite primary key for this table is (**account_id**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |comment|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |s3_canonical_user_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_origin_request_policies.md b/plugins/source/aws/docs/tables/aws_cloudfront_origin_request_policies.md index d8a86deaa4f803..2605c5be6780f6 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_origin_request_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_origin_request_policies.md @@ -4,15 +4,16 @@ This table shows data for Cloudfront Origin Request Policies. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListOriginRequestPolicies.html -The composite primary key for this table is (**account_id**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|id|`utf8`| |origin_request_policy|`json`| |type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudfront_response_headers_policies.md b/plugins/source/aws/docs/tables/aws_cloudfront_response_headers_policies.md index ed70acf01d920d..94edc1ecd18e52 100644 --- a/plugins/source/aws/docs/tables/aws_cloudfront_response_headers_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudfront_response_headers_policies.md @@ -4,15 +4,16 @@ This table shows data for Cloudfront Response Headers Policies. https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListResponseHeadersPolicies.html -The composite primary key for this table is (**account_id**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|id|`utf8`| |response_headers_policy|`json`| |type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudhsmv2_backups.md b/plugins/source/aws/docs/tables/aws_cloudhsmv2_backups.md index 0787d726d205b4..dc9759c77c3a36 100644 --- a/plugins/source/aws/docs/tables/aws_cloudhsmv2_backups.md +++ b/plugins/source/aws/docs/tables/aws_cloudhsmv2_backups.md @@ -4,17 +4,18 @@ This table shows data for AWS CloudHSM v2 Backups. https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Backup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |backup_id|`utf8`| |backup_state|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudhsmv2_clusters.md b/plugins/source/aws/docs/tables/aws_cloudhsmv2_clusters.md index fe084687e460e6..2445ca4bbe0eb1 100644 --- a/plugins/source/aws/docs/tables/aws_cloudhsmv2_clusters.md +++ b/plugins/source/aws/docs/tables/aws_cloudhsmv2_clusters.md @@ -4,17 +4,18 @@ This table shows data for AWS CloudHSM v2 Clusters. https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_Cluster.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |backup_policy|`utf8`| |backup_retention_policy|`json`| diff --git a/plugins/source/aws/docs/tables/aws_cloudtrail_channels.md b/plugins/source/aws/docs/tables/aws_cloudtrail_channels.md index b3212f4ea7d53e..e991bacf0703db 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_channels.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_channels.md @@ -4,17 +4,18 @@ This table shows data for AWS CloudTrail Channels. https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_GetChannel.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |channel_arn|`utf8`| |destinations|`json`| |ingestion_status|`json`| diff --git a/plugins/source/aws/docs/tables/aws_cloudtrail_events.md b/plugins/source/aws/docs/tables/aws_cloudtrail_events.md index 710b028a506ad3..9cbc7d7b76cf5c 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_events.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_events.md @@ -4,21 +4,21 @@ This table shows data for AWS CloudTrail Events. https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_Event.html -The primary key for this table is **event_id**. -It supports incremental syncs based on the **event_time** column. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **event_id**.It supports incremental syncs based on the **event_time** column. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |cloud_trail_event|`json`| |event_time (Incremental Key)|`timestamp[us, tz=UTC]`| |access_key_id|`utf8`| -|event_id (PK)|`utf8`| +|event_id|`utf8`| |event_name|`utf8`| |event_source|`utf8`| |read_only|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudtrail_imports.md b/plugins/source/aws/docs/tables/aws_cloudtrail_imports.md index b73a8f732d46a8..7e6d046841e099 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_imports.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_imports.md @@ -4,17 +4,18 @@ This table shows data for AWS CloudTrail Imports. https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_GetImport.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |created_timestamp|`timestamp[us, tz=UTC]`| |destinations|`list`| |end_event_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_cloudtrail_trail_event_selectors.md b/plugins/source/aws/docs/tables/aws_cloudtrail_trail_event_selectors.md index 78d35e358f4ba9..0492075f941b72 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_trail_event_selectors.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_trail_event_selectors.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudTrail Trail Event Selectors. https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_GetEventSelectors.html -The primary key for this table is **trail_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **trail_arn**. ## Relations This table depends on [aws_cloudtrail_trails](aws_cloudtrail_trails.md). @@ -14,10 +14,10 @@ This table depends on [aws_cloudtrail_trails](aws_cloudtrail_trails.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |advanced_event_selectors|`json`| |event_selectors|`json`| -|trail_arn (PK)|`utf8`| \ No newline at end of file +|trail_arn|`utf8`| \ 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 e688c0264ea7a2..527d9c8e4d9b5f 100644 --- a/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md +++ b/plugins/source/aws/docs/tables/aws_cloudtrail_trails.md @@ -4,8 +4,8 @@ This table shows data for AWS CloudTrail Trails. https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_Trail.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_cloudtrail_trails: @@ -15,12 +15,12 @@ The following tables depend on aws_cloudtrail_trails: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |cloudwatch_logs_log_group_name|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |status|`json`| |cloud_watch_logs_log_group_arn|`utf8`| |cloud_watch_logs_role_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudwatch_alarms.md b/plugins/source/aws/docs/tables/aws_cloudwatch_alarms.md index 1f2f47f08fded3..0f96f9de0e9290 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatch_alarms.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatch_alarms.md @@ -4,18 +4,19 @@ This table shows data for Cloudwatch Alarms. https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricAlarm.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |dimensions|`json`| |actions_enabled|`bool`| |alarm_actions|`list`| diff --git a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_data_protection_policies.md b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_data_protection_policies.md index b0ce80d6c83a3c..f758199199a3b3 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_data_protection_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_data_protection_policies.md @@ -4,8 +4,8 @@ This table shows data for Cloudwatchlogs Log Group Data Protection Policies. https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetDataProtectionPolicy.html -The primary key for this table is **log_group_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **log_group_arn**. ## Relations This table depends on [aws_cloudwatchlogs_log_groups](aws_cloudwatchlogs_log_groups.md). @@ -14,11 +14,11 @@ This table depends on [aws_cloudwatchlogs_log_groups](aws_cloudwatchlogs_log_gro | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|log_group_arn (PK)|`utf8`| +|log_group_arn|`utf8`| |last_updated_time|`int64`| |log_group_identifier|`utf8`| |policy_document|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_subscription_filters.md b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_subscription_filters.md index 3d7bcc88843cda..17dfcb75d9a622 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_subscription_filters.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_group_subscription_filters.md @@ -4,8 +4,8 @@ This table shows data for Cloudwatchlogs Log Group Subscription Filters. https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_SubscriptionFilter.html -The composite primary key for this table is (**log_group_arn**, **creation_time**, **filter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**log_group_arn**, **creation_time**, **filter_name**). ## Relations This table depends on [aws_cloudwatchlogs_log_groups](aws_cloudwatchlogs_log_groups.md). @@ -14,15 +14,15 @@ This table depends on [aws_cloudwatchlogs_log_groups](aws_cloudwatchlogs_log_gro | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|log_group_arn (PK)|`utf8`| -|creation_time (PK)|`int64`| +|log_group_arn|`utf8`| +|creation_time|`int64`| |destination_arn|`utf8`| |distribution|`utf8`| -|filter_name (PK)|`utf8`| +|filter_name|`utf8`| |filter_pattern|`utf8`| |log_group_name|`utf8`| |role_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_groups.md b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_groups.md index 7c334a0a28385a..abb55ccaa1407e 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_groups.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_log_groups.md @@ -4,8 +4,8 @@ This table shows data for Cloudwatchlogs Log Groups. https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_LogGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_cloudwatchlogs_log_groups: @@ -16,11 +16,11 @@ The following tables depend on aws_cloudwatchlogs_log_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`int64`| |data_protection_status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_metric_filters.md b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_metric_filters.md index 0dc18b8f832886..b320bdf7498c2e 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_metric_filters.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_metric_filters.md @@ -4,19 +4,20 @@ This table shows data for Cloudwatchlogs Metric Filters. https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_MetricFilter.html -The composite primary key for this table is (**log_group_arn**, **filter_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**log_group_arn**, **filter_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|log_group_arn (PK)|`utf8`| +|log_group_arn|`utf8`| |creation_time|`int64`| -|filter_name (PK)|`utf8`| +|filter_name|`utf8`| |filter_pattern|`utf8`| |log_group_name|`utf8`| |metric_transformations|`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 073abd19058c10..13b890195c45b0 100644 --- a/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md +++ b/plugins/source/aws/docs/tables/aws_cloudwatchlogs_resource_policies.md @@ -4,16 +4,17 @@ This table shows data for Cloudwatchlogs Resource Policies. https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_ResourcePolicy.html -The composite primary key for this table is (**account_id**, **region**, **policy_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **policy_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|policy_name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|policy_name|`utf8`| |policy_document|`json`| |last_updated_time|`int64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_codeartifact_domains.md b/plugins/source/aws/docs/tables/aws_codeartifact_domains.md index e05ee4f1141242..21598ac6a11ab8 100644 --- a/plugins/source/aws/docs/tables/aws_codeartifact_domains.md +++ b/plugins/source/aws/docs/tables/aws_codeartifact_domains.md @@ -5,18 +5,19 @@ This table shows data for AWS CodeArtifact Domains. https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainDescription.html The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |asset_size_bytes|`int64`| |created_time|`timestamp[us, tz=UTC]`| |encryption_key|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_codeartifact_repositories.md b/plugins/source/aws/docs/tables/aws_codeartifact_repositories.md index c75f9c8292a5f2..bae49dd3c3f721 100644 --- a/plugins/source/aws/docs/tables/aws_codeartifact_repositories.md +++ b/plugins/source/aws/docs/tables/aws_codeartifact_repositories.md @@ -5,19 +5,20 @@ This table shows data for AWS CodeArtifact Repositories. https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_RepositoryDescription.html The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| |tags|`json`| |administrator_account|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |description|`utf8`| |domain_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_codebuild_builds.md b/plugins/source/aws/docs/tables/aws_codebuild_builds.md index f40fb3284146bd..cf1e806e25423e 100644 --- a/plugins/source/aws/docs/tables/aws_codebuild_builds.md +++ b/plugins/source/aws/docs/tables/aws_codebuild_builds.md @@ -4,8 +4,8 @@ This table shows data for AWS CodeBuild Builds. https://docs.aws.amazon.com/codebuild/latest/APIReference/API_Build.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_codebuild_projects](aws_codebuild_projects.md). @@ -14,11 +14,11 @@ This table depends on [aws_codebuild_projects](aws_codebuild_projects.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |artifacts|`json`| |build_batch_arn|`utf8`| |build_complete|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_codebuild_projects.md b/plugins/source/aws/docs/tables/aws_codebuild_projects.md index e9e03d6bb110db..6c50bed31e08ba 100644 --- a/plugins/source/aws/docs/tables/aws_codebuild_projects.md +++ b/plugins/source/aws/docs/tables/aws_codebuild_projects.md @@ -4,8 +4,8 @@ This table shows data for AWS CodeBuild Projects. https://docs.aws.amazon.com/codebuild/latest/APIReference/API_Project.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_codebuild_projects: @@ -15,11 +15,11 @@ The following tables depend on aws_codebuild_projects: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |artifacts|`json`| |badge|`json`| diff --git a/plugins/source/aws/docs/tables/aws_codebuild_source_credentials.md b/plugins/source/aws/docs/tables/aws_codebuild_source_credentials.md index 68c06a2aa010f4..f107860bcdaf5a 100644 --- a/plugins/source/aws/docs/tables/aws_codebuild_source_credentials.md +++ b/plugins/source/aws/docs/tables/aws_codebuild_source_credentials.md @@ -4,16 +4,17 @@ This table shows data for AWS CodeBuild Source Credentials. https://docs.aws.amazon.com/codebuild/latest/APIReference/API_SourceCredentialsInfo.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auth_type|`utf8`| |server_type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_codecommit_repositories.md b/plugins/source/aws/docs/tables/aws_codecommit_repositories.md index 2c7020eeb6759c..fed3db17cdab1c 100644 --- a/plugins/source/aws/docs/tables/aws_codecommit_repositories.md +++ b/plugins/source/aws/docs/tables/aws_codecommit_repositories.md @@ -4,18 +4,19 @@ This table shows data for AWS CodeCommit Repositories. https://docs.aws.amazon.com/codecommit/latest/APIReference/API_RepositoryMetadata.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |clone_url_http|`utf8`| |clone_url_ssh|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md b/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md index 376328d536eaaf..d0958e2302083a 100644 --- a/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md +++ b/plugins/source/aws/docs/tables/aws_codepipeline_pipelines.md @@ -4,17 +4,18 @@ This table shows data for Codepipeline Pipelines. https://docs.aws.amazon.com/codepipeline/latest/APIReference/API_GetPipeline.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |metadata|`json`| |pipeline|`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 193ab1f71969dc..c154a903ba9efc 100644 --- a/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md +++ b/plugins/source/aws/docs/tables/aws_codepipeline_webhooks.md @@ -4,17 +4,18 @@ This table shows data for Codepipeline Webhooks. https://docs.aws.amazon.com/codepipeline/latest/APIReference/API_ListWebhookItem.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |definition|`json`| |url|`utf8`| 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 305782a907ff05..6b64907dee191d 100644 --- a/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md +++ b/plugins/source/aws/docs/tables/aws_cognito_identity_pools.md @@ -4,18 +4,19 @@ This table shows data for Cognito Identity Pools. https://docs.aws.amazon.com/cognitoidentity/latest/APIReference/API_DescribeIdentityPool.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |arn|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |saml_provider_arns|`list`| |allow_unauthenticated_identities|`bool`| |identity_pool_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_cognito_user_pool_identity_providers.md b/plugins/source/aws/docs/tables/aws_cognito_user_pool_identity_providers.md index 6804d0248df44d..7e7fa988dc8b37 100644 --- a/plugins/source/aws/docs/tables/aws_cognito_user_pool_identity_providers.md +++ b/plugins/source/aws/docs/tables/aws_cognito_user_pool_identity_providers.md @@ -4,8 +4,8 @@ This table shows data for Cognito User Pool Identity Providers. https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_IdentityProviderType.html -The composite primary key for this table is (**user_pool_arn**, **provider_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**user_pool_arn**, **provider_name**). ## Relations This table depends on [aws_cognito_user_pools](aws_cognito_user_pools.md). @@ -14,16 +14,16 @@ This table depends on [aws_cognito_user_pools](aws_cognito_user_pools.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|user_pool_arn (PK)|`utf8`| +|user_pool_arn|`utf8`| |attribute_mapping|`json`| |creation_date|`timestamp[us, tz=UTC]`| |idp_identifiers|`list`| |last_modified_date|`timestamp[us, tz=UTC]`| |provider_details|`json`| -|provider_name (PK)|`utf8`| +|provider_name|`utf8`| |provider_type|`utf8`| |user_pool_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_cognito_user_pools.md b/plugins/source/aws/docs/tables/aws_cognito_user_pools.md index 604eddf013110d..d856347e696d43 100644 --- a/plugins/source/aws/docs/tables/aws_cognito_user_pools.md +++ b/plugins/source/aws/docs/tables/aws_cognito_user_pools.md @@ -4,8 +4,8 @@ This table shows data for Cognito User Pools. https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_UserPoolType.html -The composite primary key for this table is (**account_id**, **region**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Relations The following tables depend on aws_cognito_user_pools: @@ -15,11 +15,11 @@ The following tables depend on aws_cognito_user_pools: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |account_recovery_setting|`json`| |admin_create_user_config|`json`| |alias_attributes|`list`| diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_autoscaling_group_recommendations.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_autoscaling_group_recommendations.md index f3ce10ab6592f3..292975d5fa38f6 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_autoscaling_group_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_autoscaling_group_recommendations.md @@ -4,16 +4,17 @@ This table shows data for Compute Optimizer Auto Scaling Group Recommendations. https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_AutoScalingGroupRecommendation.html -The primary key for this table is **auto_scaling_group_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **auto_scaling_group_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|auto_scaling_group_arn (PK)|`utf8`| +|auto_scaling_group_arn|`utf8`| |auto_scaling_group_name|`utf8`| |current_configuration|`json`| |current_instance_gpu_info|`json`| diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_ebs_volume_recommendations.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_ebs_volume_recommendations.md index 5b6f1ba066d42b..7605723883647f 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_ebs_volume_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_ebs_volume_recommendations.md @@ -4,13 +4,14 @@ This table shows data for Compute Optimizer Amazon Elastic Block Store (EBS) Vol https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_VolumeRecommendation.html -The primary key for this table is **volume_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **volume_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |tags|`json`| @@ -21,5 +22,5 @@ The primary key for this table is **volume_arn**. |last_refresh_timestamp|`timestamp[us, tz=UTC]`| |look_back_period_in_days|`float64`| |utilization_metrics|`json`| -|volume_arn (PK)|`utf8`| +|volume_arn|`utf8`| |volume_recommendation_options|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_ec2_instance_recommendations.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_ec2_instance_recommendations.md index 84d34030046357..54e776f4cf05eb 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_ec2_instance_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_ec2_instance_recommendations.md @@ -4,13 +4,14 @@ This table shows data for Compute Optimizer Amazon Elastic Compute Cloud (EC2) I https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_InstanceRecommendation.html -The primary key for this table is **instance_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **instance_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |tags|`json`| @@ -23,7 +24,7 @@ The primary key for this table is **instance_arn**. |finding_reason_codes|`list`| |idle|`utf8`| |inferred_workload_types|`list`| -|instance_arn (PK)|`utf8`| +|instance_arn|`utf8`| |instance_name|`utf8`| |instance_state|`utf8`| |last_refresh_timestamp|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_ecs_service_recommendations.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_ecs_service_recommendations.md index a966d2888cdcf7..f27d58b4d2f653 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_ecs_service_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_ecs_service_recommendations.md @@ -4,13 +4,14 @@ This table shows data for Compute Optimizer Amazon Elastic Container Service (EC https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_ECSServiceRecommendation.html -The primary key for this table is **service_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **service_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |tags|`json`| @@ -22,6 +23,6 @@ The primary key for this table is **service_arn**. |last_refresh_timestamp|`timestamp[us, tz=UTC]`| |launch_type|`utf8`| |lookback_period_in_days|`float64`| -|service_arn (PK)|`utf8`| +|service_arn|`utf8`| |service_recommendation_options|`json`| |utilization_metrics|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_enrollment_statuses.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_enrollment_statuses.md index d6b212cad9831e..aeac8a3a79dcf5 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_enrollment_statuses.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_enrollment_statuses.md @@ -4,15 +4,16 @@ This table shows data for Compute Optimizer Enrollment Statuses. https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_GetEnrollmentStatus.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |last_updated_timestamp|`timestamp[us, tz=UTC]`| |member_accounts_enrolled|`bool`| |number_of_member_accounts_opted_in|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_computeoptimizer_lambda_function_recommendations.md b/plugins/source/aws/docs/tables/aws_computeoptimizer_lambda_function_recommendations.md index 097d970fbd20d9..d3269b3835fa13 100644 --- a/plugins/source/aws/docs/tables/aws_computeoptimizer_lambda_function_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_computeoptimizer_lambda_function_recommendations.md @@ -4,13 +4,14 @@ This table shows data for Compute Optimizer AWS Lambda Function Recommendations. https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_LambdaFunctionRecommendation.html -The primary key for this table is **function_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **function_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |tags|`json`| @@ -19,7 +20,7 @@ The primary key for this table is **function_arn**. |effective_recommendation_preferences|`json`| |finding|`utf8`| |finding_reason_codes|`list`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |function_version|`utf8`| |last_refresh_timestamp|`timestamp[us, tz=UTC]`| |lookback_period_in_days|`float64`| diff --git a/plugins/source/aws/docs/tables/aws_config_config_rule_compliance_details.md b/plugins/source/aws/docs/tables/aws_config_config_rule_compliance_details.md index d17d3d60804c6c..4c5aaf3d170ab9 100644 --- a/plugins/source/aws/docs/tables/aws_config_config_rule_compliance_details.md +++ b/plugins/source/aws/docs/tables/aws_config_config_rule_compliance_details.md @@ -4,8 +4,8 @@ This table shows data for Config Config Rule Compliance Details. https://docs.aws.amazon.com/config/latest/APIReference/API_EvaluationResult.html -The composite primary key for this table is (**config_rule_arn**, **resource_evaluation_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**config_rule_arn**, **resource_evaluation_id**). ## Relations This table depends on [aws_config_config_rules](aws_config_config_rules.md). @@ -14,12 +14,12 @@ This table depends on [aws_config_config_rules](aws_config_config_rules.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|config_rule_arn (PK)|`utf8`| -|resource_evaluation_id (PK)|`utf8`| +|config_rule_arn|`utf8`| +|resource_evaluation_id|`utf8`| |config_rule_name|`utf8`| |annotation|`utf8`| |compliance_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_config_config_rule_compliances.md b/plugins/source/aws/docs/tables/aws_config_config_rule_compliances.md index 51581cc0f71492..852ba88bb50f19 100644 --- a/plugins/source/aws/docs/tables/aws_config_config_rule_compliances.md +++ b/plugins/source/aws/docs/tables/aws_config_config_rule_compliances.md @@ -4,8 +4,8 @@ This table shows data for Config Config Rule Compliances. https://docs.aws.amazon.com/config/latest/APIReference/API_ComplianceByConfigRule.html -The primary key for this table is **config_rule_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **config_rule_arn**. ## Relations This table depends on [aws_config_config_rules](aws_config_config_rules.md). @@ -14,10 +14,10 @@ This table depends on [aws_config_config_rules](aws_config_config_rules.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|config_rule_arn (PK)|`utf8`| +|config_rule_arn|`utf8`| |compliance|`json`| |config_rule_name|`utf8`| \ 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 08f5dfde522968..d1a9b9954ac9ac 100644 --- a/plugins/source/aws/docs/tables/aws_config_config_rules.md +++ b/plugins/source/aws/docs/tables/aws_config_config_rules.md @@ -4,8 +4,8 @@ This table shows data for Config Config Rules. https://docs.aws.amazon.com/config/latest/APIReference/API_ConfigRule.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_config_config_rules: @@ -17,11 +17,11 @@ The following tables depend on aws_config_config_rules: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |source|`json`| |config_rule_arn|`utf8`| |config_rule_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_config_configuration_aggregators.md b/plugins/source/aws/docs/tables/aws_config_configuration_aggregators.md index 938b81a43fcbfa..79e179906b0d8c 100644 --- a/plugins/source/aws/docs/tables/aws_config_configuration_aggregators.md +++ b/plugins/source/aws/docs/tables/aws_config_configuration_aggregators.md @@ -4,17 +4,18 @@ This table shows data for Config Configuration Aggregators. https://docs.aws.amazon.com/config/latest/APIReference/API_ConfigurationAggregator.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |account_aggregation_sources|`json`| |configuration_aggregator_arn|`utf8`| |configuration_aggregator_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_config_configuration_recorders.md b/plugins/source/aws/docs/tables/aws_config_configuration_recorders.md index fcbbe4ac34389a..592df960ba4039 100644 --- a/plugins/source/aws/docs/tables/aws_config_configuration_recorders.md +++ b/plugins/source/aws/docs/tables/aws_config_configuration_recorders.md @@ -4,17 +4,18 @@ This table shows data for Config Configuration Recorders. https://docs.aws.amazon.com/config/latest/APIReference/API_ConfigurationRecorder.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |recording_group|`json`| |recording_mode|`json`| 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 152f3046613047..fcccc6e994a84f 100644 --- a/plugins/source/aws/docs/tables/aws_config_conformance_packs.md +++ b/plugins/source/aws/docs/tables/aws_config_conformance_packs.md @@ -4,8 +4,8 @@ This table shows data for Config Conformance Packs. https://docs.aws.amazon.com/config/latest/APIReference/API_ConformancePackDetail.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_config_conformance_packs: @@ -15,11 +15,11 @@ The following tables depend on aws_config_conformance_packs: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |conformance_pack_arn|`utf8`| |conformance_pack_id|`utf8`| |conformance_pack_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_config_delivery_channel_statuses.md b/plugins/source/aws/docs/tables/aws_config_delivery_channel_statuses.md index 9d85779dce1623..cd7c7a61cc53f2 100644 --- a/plugins/source/aws/docs/tables/aws_config_delivery_channel_statuses.md +++ b/plugins/source/aws/docs/tables/aws_config_delivery_channel_statuses.md @@ -4,8 +4,8 @@ This table shows data for Config Delivery Channel Statuses. https://docs.aws.amazon.com/config/latest/APIReference/API_DescribeDeliveryChannelStatus.html -The composite primary key for this table is (**account_id**, **region**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Relations This table depends on [aws_config_delivery_channels](aws_config_delivery_channels.md). @@ -14,11 +14,11 @@ This table depends on [aws_config_delivery_channels](aws_config_delivery_channel | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |config_history_delivery_info|`json`| |config_snapshot_delivery_info|`json`| |config_stream_delivery_info|`json`| -|name (PK)|`utf8`| \ No newline at end of file +|name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_config_delivery_channels.md b/plugins/source/aws/docs/tables/aws_config_delivery_channels.md index 9e4f29c756b566..d0a89018c223c6 100644 --- a/plugins/source/aws/docs/tables/aws_config_delivery_channels.md +++ b/plugins/source/aws/docs/tables/aws_config_delivery_channels.md @@ -4,8 +4,8 @@ This table shows data for Config Delivery Channels. https://docs.aws.amazon.com/config/latest/APIReference/API_DeliveryChannel.html -The composite primary key for this table is (**account_id**, **region**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Relations The following tables depend on aws_config_delivery_channels: @@ -15,12 +15,12 @@ The following tables depend on aws_config_delivery_channels: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |config_snapshot_delivery_properties|`json`| -|name (PK)|`utf8`| +|name|`utf8`| |s3_bucket_name|`utf8`| |s3_key_prefix|`utf8`| |s3_kms_key_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_config_remediation_configurations.md b/plugins/source/aws/docs/tables/aws_config_remediation_configurations.md index c89ea3d2cb42d9..6cbea8d9f57bb7 100644 --- a/plugins/source/aws/docs/tables/aws_config_remediation_configurations.md +++ b/plugins/source/aws/docs/tables/aws_config_remediation_configurations.md @@ -4,8 +4,8 @@ This table shows data for Config Remediation Configurations. https://docs.aws.amazon.com/config/latest/APIReference/API_RemediationConfiguration.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_config_config_rules](aws_config_config_rules.md). @@ -14,7 +14,7 @@ This table depends on [aws_config_config_rules](aws_config_config_rules.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| @@ -22,7 +22,7 @@ This table depends on [aws_config_config_rules](aws_config_config_rules.md). |config_rule_name|`utf8`| |target_id|`utf8`| |target_type|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |automatic|`bool`| |created_by_service|`utf8`| |execution_controls|`json`| diff --git a/plugins/source/aws/docs/tables/aws_config_retention_configurations.md b/plugins/source/aws/docs/tables/aws_config_retention_configurations.md index e828aadef3eaa0..028d6ce3653b25 100644 --- a/plugins/source/aws/docs/tables/aws_config_retention_configurations.md +++ b/plugins/source/aws/docs/tables/aws_config_retention_configurations.md @@ -4,15 +4,16 @@ This table shows data for Config Retention Configurations. https://docs.aws.amazon.com/config/latest/APIReference/API_RetentionConfiguration.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|name|`utf8`| |retention_period_in_days|`int64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_costexplorer_cost_30d.md b/plugins/source/aws/docs/tables/aws_costexplorer_cost_30d.md index bab06372e2a436..2ef046ddcf65a8 100644 --- a/plugins/source/aws/docs/tables/aws_costexplorer_cost_30d.md +++ b/plugins/source/aws/docs/tables/aws_costexplorer_cost_30d.md @@ -5,17 +5,18 @@ This table shows data for AWS Cost Explorer costs for the last 30 days. https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetCostAndUsage.html To sync this table you must set the 'use_paid_apis' option to 'true' in the AWS provider configuration. -The composite primary key for this table is (**account_id**, **start_date**, **end_date**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **start_date**, **end_date**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|start_date (PK)|`utf8`| -|end_date (PK)|`utf8`| +|account_id|`utf8`| +|start_date|`utf8`| +|end_date|`utf8`| |estimated|`bool`| |groups|`json`| |time_period|`json`| diff --git a/plugins/source/aws/docs/tables/aws_costexplorer_cost_forecast_30d.md b/plugins/source/aws/docs/tables/aws_costexplorer_cost_forecast_30d.md index 05c535f68f2d04..c5a19d1651d34d 100644 --- a/plugins/source/aws/docs/tables/aws_costexplorer_cost_forecast_30d.md +++ b/plugins/source/aws/docs/tables/aws_costexplorer_cost_forecast_30d.md @@ -5,17 +5,18 @@ This table shows data for AWS Cost Explorer cost forecast for the next 30 days. https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetCostForecast.html To sync this table you must set the 'use_paid_apis' option to 'true' in the AWS provider configuration. -The composite primary key for this table is (**account_id**, **start_date**, **end_date**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **start_date**, **end_date**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|start_date (PK)|`utf8`| -|end_date (PK)|`utf8`| +|account_id|`utf8`| +|start_date|`utf8`| +|end_date|`utf8`| |mean_value|`utf8`| |prediction_interval_lower_bound|`utf8`| |prediction_interval_upper_bound|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_dax_clusters.md b/plugins/source/aws/docs/tables/aws_dax_clusters.md index 09a6411c411430..85fe262f2e401c 100644 --- a/plugins/source/aws/docs/tables/aws_dax_clusters.md +++ b/plugins/source/aws/docs/tables/aws_dax_clusters.md @@ -4,17 +4,18 @@ This table shows data for Dax Clusters. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_dax_Cluster.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |active_nodes|`int64`| |cluster_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_db_proxies.md b/plugins/source/aws/docs/tables/aws_db_proxies.md index b3485513237d47..bf746c603392b1 100644 --- a/plugins/source/aws/docs/tables/aws_db_proxies.md +++ b/plugins/source/aws/docs/tables/aws_db_proxies.md @@ -4,17 +4,18 @@ This table shows data for DB Proxies. https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBProxy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |auth|`json`| |created_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_detective_graph_members.md b/plugins/source/aws/docs/tables/aws_detective_graph_members.md index ec313a0c436e8e..7091445305491f 100644 --- a/plugins/source/aws/docs/tables/aws_detective_graph_members.md +++ b/plugins/source/aws/docs/tables/aws_detective_graph_members.md @@ -5,8 +5,8 @@ This table shows data for Amazon Detective Graph Members. https://docs.aws.amazon.com/detective/latest/APIReference/API_GetMembers.html The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from. -The composite primary key for this table is (**request_region**, **account_id**, **graph_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_region**, **account_id**, **graph_arn**). ## Relations This table depends on [aws_detective_graphs](aws_detective_graphs.md). @@ -15,16 +15,16 @@ This table depends on [aws_detective_graphs](aws_detective_graphs.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |request_account_id|`utf8`| -|request_region (PK)|`utf8`| -|account_id (PK)|`utf8`| +|request_region|`utf8`| +|account_id|`utf8`| |administrator_id|`utf8`| |datasource_package_ingest_states|`json`| |disabled_reason|`utf8`| |email_address|`utf8`| -|graph_arn (PK)|`utf8`| +|graph_arn|`utf8`| |invitation_type|`utf8`| |invited_time|`timestamp[us, tz=UTC]`| |master_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_detective_graphs.md b/plugins/source/aws/docs/tables/aws_detective_graphs.md index 7c2d9ddeca9723..30880d28b31107 100644 --- a/plugins/source/aws/docs/tables/aws_detective_graphs.md +++ b/plugins/source/aws/docs/tables/aws_detective_graphs.md @@ -4,8 +4,8 @@ This table shows data for Amazon Detective Graphs. https://docs.aws.amazon.com/detective/latest/APIReference/API_ListGraphs.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_detective_graphs: @@ -15,10 +15,10 @@ The following tables depend on aws_detective_graphs: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_directconnect_connections.md b/plugins/source/aws/docs/tables/aws_directconnect_connections.md index b8ebbd17ac15cf..a2814cf29dc722 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_connections.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_connections.md @@ -4,18 +4,19 @@ This table shows data for AWS Direct Connect Connections. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Connection.html -The composite primary key for this table is (**request_account_id**, **arn**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |request_region|`utf8`| -|arn (PK)|`utf8`| -|id (PK)|`utf8`| +|arn|`utf8`| +|id|`utf8`| |tags|`json`| |aws_device|`utf8`| |aws_device_v2|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_gateway_associations.md b/plugins/source/aws/docs/tables/aws_directconnect_gateway_associations.md index cc90ad602fbcb0..1bd1b7dbc950a5 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_gateway_associations.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_gateway_associations.md @@ -4,8 +4,8 @@ This table shows data for AWS Direct Connect Gateway Associations. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAssociation.html -The composite primary key for this table is (**request_account_id**, **gateway_arn**, **association_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **gateway_arn**, **association_id**). ## Relations This table depends on [aws_directconnect_gateways](aws_directconnect_gateways.md). @@ -14,15 +14,15 @@ This table depends on [aws_directconnect_gateways](aws_directconnect_gateways.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |request_region|`utf8`| -|gateway_arn (PK)|`utf8`| +|gateway_arn|`utf8`| |gateway_id|`utf8`| |allowed_prefixes_to_direct_connect_gateway|`json`| |associated_gateway|`json`| -|association_id (PK)|`utf8`| +|association_id|`utf8`| |association_state|`utf8`| |direct_connect_gateway_id|`utf8`| |direct_connect_gateway_owner_account|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_gateway_attachments.md b/plugins/source/aws/docs/tables/aws_directconnect_gateway_attachments.md index 7f31319fa2c566..e7dafc6a4776a4 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_gateway_attachments.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_gateway_attachments.md @@ -4,8 +4,8 @@ This table shows data for AWS Direct Connect Gateway Attachments. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAttachment.html -The composite primary key for this table is (**request_account_id**, **gateway_arn**, **virtual_interface_id**, **virtual_interface_owner_account**, **virtual_interface_region**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **gateway_arn**, **virtual_interface_id**, **virtual_interface_owner_account**, **virtual_interface_region**). ## Relations This table depends on [aws_directconnect_gateways](aws_directconnect_gateways.md). @@ -14,16 +14,16 @@ This table depends on [aws_directconnect_gateways](aws_directconnect_gateways.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |request_region|`utf8`| -|gateway_arn (PK)|`utf8`| +|gateway_arn|`utf8`| |gateway_id|`utf8`| |attachment_state|`utf8`| |attachment_type|`utf8`| |direct_connect_gateway_id|`utf8`| |state_change_error|`utf8`| -|virtual_interface_id (PK)|`utf8`| -|virtual_interface_owner_account (PK)|`utf8`| -|virtual_interface_region (PK)|`utf8`| \ No newline at end of file +|virtual_interface_id|`utf8`| +|virtual_interface_owner_account|`utf8`| +|virtual_interface_region|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_directconnect_gateways.md b/plugins/source/aws/docs/tables/aws_directconnect_gateways.md index 6f0e9060357518..753967fb23c5df 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_gateways.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_gateways.md @@ -4,8 +4,8 @@ This table shows data for AWS Direct Connect Gateways. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGateway.html -The composite primary key for this table is (**request_account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Relations The following tables depend on aws_directconnect_gateways: @@ -16,11 +16,11 @@ The following tables depend on aws_directconnect_gateways: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |request_region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |amazon_side_asn|`int64`| |direct_connect_gateway_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_lags.md b/plugins/source/aws/docs/tables/aws_directconnect_lags.md index bc0fa13a0bca0b..6fb265e8eb92db 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_lags.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_lags.md @@ -4,17 +4,18 @@ This table shows data for AWS Direct Connect Lags. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Lag.html -The composite primary key for this table is (**request_account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |request_region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |tags|`json`| |allows_hosted_connections|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_directconnect_locations.md b/plugins/source/aws/docs/tables/aws_directconnect_locations.md index 28a12de90ac48b..eeb0b06060cef4 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_locations.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_locations.md @@ -4,19 +4,20 @@ This table shows data for AWS Direct Connect Locations. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Location.html -The composite primary key for this table is (**request_account_id**, **request_region**, **location_code**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **location_code**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| |available_mac_sec_port_speeds|`list`| |available_port_speeds|`list`| |available_providers|`list`| -|location_code (PK)|`utf8`| +|location_code|`utf8`| |location_name|`utf8`| |region|`utf8`| \ No newline at end of file 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 db2bcf04c026cb..8ad3f3875b6968 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_virtual_gateways.md @@ -4,16 +4,17 @@ This table shows data for AWS Direct Connect Virtual Gateways. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualGateway.html -The composite primary key for this table is (**request_account_id**, **request_region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|id (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|id|`utf8`| |virtual_gateway_id|`utf8`| |virtual_gateway_state|`utf8`| \ 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 0ed97b4b1f9f57..3593205874ffec 100644 --- a/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md +++ b/plugins/source/aws/docs/tables/aws_directconnect_virtual_interfaces.md @@ -4,17 +4,18 @@ This table shows data for AWS Direct Connect Virtual Interfaces. https://docs.aws.amazon.com/directconnect/latest/APIReference/API_VirtualInterface.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |id|`utf8`| |tags|`json`| |address_family|`utf8`| 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 57aff30ca1a2e0..cd18bb732133c2 100644 --- a/plugins/source/aws/docs/tables/aws_dms_replication_instances.md +++ b/plugins/source/aws/docs/tables/aws_dms_replication_instances.md @@ -4,17 +4,18 @@ This table shows data for Dms Replication Instances. https://docs.aws.amazon.com/dms/latest/APIReference/API_ReplicationInstance.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |allocated_storage|`int64`| |auto_minor_version_upgrade|`bool`| |availability_zone|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_certificates.md b/plugins/source/aws/docs/tables/aws_docdb_certificates.md index 56de0e356c3952..ea6aa48f170a14 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_certificates.md +++ b/plugins/source/aws/docs/tables/aws_docdb_certificates.md @@ -4,17 +4,18 @@ This table shows data for Amazon DocumentDB Certificates. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Certificate.html -The composite primary key for this table is (**account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |certificate_arn|`utf8`| |certificate_identifier|`utf8`| |certificate_type|`utf8`| 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 2c066b07d206c5..637edcf9e712db 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 @@ -4,18 +4,19 @@ This table shows data for Amazon DocumentDB Cluster Parameter Groups. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterParameterGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |parameters|`json`| |db_cluster_parameter_group_name|`utf8`| |db_parameter_group_family|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_cluster_parameters.md b/plugins/source/aws/docs/tables/aws_docdb_cluster_parameters.md index b0826ce6d77527..d8570265008d5f 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_cluster_parameters.md +++ b/plugins/source/aws/docs/tables/aws_docdb_cluster_parameters.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Cluster Parameters. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Parameter.html -The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **engine**, **engine_version**, **parameter_name**). ## Relations This table depends on [aws_docdb_engine_versions](aws_docdb_engine_versions.md). @@ -14,12 +14,12 @@ This table depends on [aws_docdb_engine_versions](aws_docdb_engine_versions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|engine (PK)|`utf8`| -|engine_version (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|engine|`utf8`| +|engine_version|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -27,6 +27,6 @@ This table depends on [aws_docdb_engine_versions](aws_docdb_engine_versions.md). |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| \ 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 9b231e02fa54ba..6bea378f443377 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_docdb_cluster_snapshots.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Cluster Snapshots. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBClusterSnapshot.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |attributes|`json`| |db_cluster_identifier|`utf8`| |db_cluster_snapshot_identifier|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_clusters.md b/plugins/source/aws/docs/tables/aws_docdb_clusters.md index f904b2c1b44243..818a0cc977f700 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_clusters.md +++ b/plugins/source/aws/docs/tables/aws_docdb_clusters.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Clusters. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBCluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_docdb_clusters: @@ -16,12 +16,12 @@ The following tables depend on aws_docdb_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |associated_roles|`json`| |availability_zones|`list`| |backup_retention_period|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_engine_versions.md b/plugins/source/aws/docs/tables/aws_docdb_engine_versions.md index 9cbdb3c1115e13..78047bba6fc9dd 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_engine_versions.md +++ b/plugins/source/aws/docs/tables/aws_docdb_engine_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Engine Versions. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBEngineVersion.html -The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **engine**, **engine_version**). ## Relations The following tables depend on aws_docdb_engine_versions: @@ -16,15 +16,15 @@ The following tables depend on aws_docdb_engine_versions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |db_engine_description|`utf8`| |db_engine_version_description|`utf8`| |db_parameter_group_family|`utf8`| -|engine (PK)|`utf8`| -|engine_version (PK)|`utf8`| +|engine|`utf8`| +|engine_version|`utf8`| |exportable_log_types|`list`| |supported_ca_certificate_identifiers|`list`| |supports_certificate_rotation_without_restart|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_event_categories.md b/plugins/source/aws/docs/tables/aws_docdb_event_categories.md index 3f59d340fcb84d..28ccf4cbec1133 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_event_categories.md +++ b/plugins/source/aws/docs/tables/aws_docdb_event_categories.md @@ -4,15 +4,16 @@ This table shows data for Amazon DocumentDB Event Categories. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventCategoriesMap.html -The composite primary key for this table is (**account_id**, **region**, **source_type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **source_type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |event_categories|`list`| -|source_type (PK)|`utf8`| \ No newline at end of file +|source_type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_docdb_event_subscriptions.md b/plugins/source/aws/docs/tables/aws_docdb_event_subscriptions.md index dd4d259be98013..7603d1ae6871aa 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_docdb_event_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Amazon DocumentDB Event Subscriptions. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventSubscription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cust_subscription_id|`utf8`| |customer_aws_id|`utf8`| |enabled|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_events.md b/plugins/source/aws/docs/tables/aws_docdb_events.md index bd20fde8b36fa3..a5459d2f291bf9 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_events.md +++ b/plugins/source/aws/docs/tables/aws_docdb_events.md @@ -4,20 +4,21 @@ This table shows data for Amazon DocumentDB Events. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Event.html -The composite primary key for this table is (**account_id**, **region**, **categories_concat**, **date**, **source_arn**, **source_identifier**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **categories_concat**, **date**, **source_arn**, **source_identifier**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|categories_concat (PK)|`utf8`| -|date (PK)|`timestamp[us, tz=UTC]`| +|account_id|`utf8`| +|region|`utf8`| +|categories_concat|`utf8`| +|date|`timestamp[us, tz=UTC]`| |event_categories|`list`| |message|`utf8`| -|source_arn (PK)|`utf8`| -|source_identifier (PK)|`utf8`| +|source_arn|`utf8`| +|source_identifier|`utf8`| |source_type|`utf8`| \ No newline at end of file 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 34d581bb7b4c43..5222823f925c98 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md +++ b/plugins/source/aws/docs/tables/aws_docdb_global_clusters.md @@ -4,16 +4,17 @@ This table shows data for Amazon DocumentDB Global Clusters. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_GlobalCluster.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |database_name|`utf8`| |deletion_protection|`bool`| |engine|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_instances.md b/plugins/source/aws/docs/tables/aws_docdb_instances.md index 668f043739884e..950188c634f45e 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_instances.md +++ b/plugins/source/aws/docs/tables/aws_docdb_instances.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Instances. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBInstance.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_docdb_clusters](aws_docdb_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_minor_version_upgrade|`bool`| |availability_zone|`utf8`| |backup_retention_period|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_docdb_orderable_db_instance_options.md b/plugins/source/aws/docs/tables/aws_docdb_orderable_db_instance_options.md index 733fa4c53676cc..0dd54f3a892332 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_orderable_db_instance_options.md +++ b/plugins/source/aws/docs/tables/aws_docdb_orderable_db_instance_options.md @@ -4,8 +4,8 @@ This table shows data for Amazon DocumentDB Orderable DB Instance Options. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_OrderableDBInstanceOption.html -The composite primary key for this table is (**account_id**, **region**, **db_instance_class**, **engine**, **engine_version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **db_instance_class**, **engine**, **engine_version**). ## Relations This table depends on [aws_docdb_engine_versions](aws_docdb_engine_versions.md). @@ -14,14 +14,14 @@ This table depends on [aws_docdb_engine_versions](aws_docdb_engine_versions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |availability_zones|`json`| -|db_instance_class (PK)|`utf8`| -|engine (PK)|`utf8`| -|engine_version (PK)|`utf8`| +|db_instance_class|`utf8`| +|engine|`utf8`| +|engine_version|`utf8`| |license_model|`utf8`| |storage_type|`utf8`| |vpc|`bool`| \ No newline at end of file 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 6f69c2381fb1fd..8fd18aca225585 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 @@ -4,15 +4,16 @@ This table shows data for Amazon DocumentDB Pending Maintenance Actions. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_PendingMaintenanceAction.html -The composite primary key for this table is (**account_id**, **region**, **resource_identifier**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_identifier**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |pending_maintenance_action_details|`json`| -|resource_identifier (PK)|`utf8`| \ No newline at end of file +|resource_identifier|`utf8`| \ 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 1889d1a0e3b8a1..c07ad7e2d401e9 100644 --- a/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_docdb_subnet_groups.md @@ -4,18 +4,19 @@ This table shows data for Amazon DocumentDB Subnet Groups. https://docs.aws.amazon.com/documentdb/latest/developerguide/API_DBSubnetGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |db_subnet_group_arn|`utf8`| |db_subnet_group_description|`utf8`| |db_subnet_group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_backups.md b/plugins/source/aws/docs/tables/aws_dynamodb_backups.md index 70c8e02f0b6806..59e11e209c8c00 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_backups.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_backups.md @@ -4,17 +4,18 @@ This table shows data for Amazon DynamoDB Backups. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BackupDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |backup_details|`json`| |source_table_details|`json`| |source_table_feature_details|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_exports.md b/plugins/source/aws/docs/tables/aws_dynamodb_exports.md index 15ff9ab357c0bd..762c997ad5f7c5 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_exports.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_exports.md @@ -4,17 +4,18 @@ This table shows data for Amazon DynamoDB Exports. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ExportDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |billed_size_bytes|`int64`| |client_token|`utf8`| |end_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_global_tables.md b/plugins/source/aws/docs/tables/aws_dynamodb_global_tables.md index 851baae64b0ef6..3fa949f68e611a 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_global_tables.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_global_tables.md @@ -5,17 +5,18 @@ This table shows data for Amazon DynamoDB Global Tables. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_GlobalTableDescription.html This table only contains version 2017.11.29 (Legacy) Global Tables. See aws_dynamodb_tables for version 2019.11.21 (Current) Global Tables. -The composite primary key for this table is (**region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| +|region|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_date_time|`timestamp[us, tz=UTC]`| |global_table_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_table_continuous_backups.md b/plugins/source/aws/docs/tables/aws_dynamodb_table_continuous_backups.md index 684d5e941c3bcc..4078cd2f8ce6a1 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_table_continuous_backups.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_table_continuous_backups.md @@ -4,8 +4,8 @@ This table shows data for Amazon DynamoDB Table Continuous Backups. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ContinuousBackupsDescription.html -The primary key for this table is **table_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **table_arn**. ## Relations This table depends on [aws_dynamodb_tables](aws_dynamodb_tables.md). @@ -14,10 +14,10 @@ This table depends on [aws_dynamodb_tables](aws_dynamodb_tables.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|table_arn (PK)|`utf8`| +|table_arn|`utf8`| |continuous_backups_status|`utf8`| |point_in_time_recovery_description|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_table_replica_auto_scalings.md b/plugins/source/aws/docs/tables/aws_dynamodb_table_replica_auto_scalings.md index ca16a3bdd5a1a8..eb500aeceff252 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_table_replica_auto_scalings.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_table_replica_auto_scalings.md @@ -4,8 +4,8 @@ This table shows data for Amazon DynamoDB Table Replica Auto Scalings. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ReplicaAutoScalingDescription.html -The composite primary key for this table is (**table_arn**, **region_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**table_arn**, **region_name**). ## Relations This table depends on [aws_dynamodb_tables](aws_dynamodb_tables.md). @@ -14,13 +14,13 @@ This table depends on [aws_dynamodb_tables](aws_dynamodb_tables.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|table_arn (PK)|`utf8`| +|table_arn|`utf8`| |global_secondary_indexes|`json`| -|region_name (PK)|`utf8`| +|region_name|`utf8`| |replica_provisioned_read_capacity_auto_scaling_settings|`json`| |replica_provisioned_write_capacity_auto_scaling_settings|`json`| |replica_status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_dynamodb_tables.md b/plugins/source/aws/docs/tables/aws_dynamodb_tables.md index 7d2769ac21e572..1db5dcecdc19b7 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodb_tables.md +++ b/plugins/source/aws/docs/tables/aws_dynamodb_tables.md @@ -4,8 +4,8 @@ This table shows data for Amazon DynamoDB Tables. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_TableDescription.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_dynamodb_tables: @@ -16,12 +16,12 @@ The following tables depend on aws_dynamodb_tables: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |archival_summary|`json`| |attribute_definitions|`json`| |billing_mode_summary|`json`| diff --git a/plugins/source/aws/docs/tables/aws_dynamodbstreams_streams.md b/plugins/source/aws/docs/tables/aws_dynamodbstreams_streams.md index f145748eefb64e..b860a0de879438 100644 --- a/plugins/source/aws/docs/tables/aws_dynamodbstreams_streams.md +++ b/plugins/source/aws/docs/tables/aws_dynamodbstreams_streams.md @@ -4,17 +4,18 @@ This table shows data for Amazon DynamoDB Streams. https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_StreamDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_request_date_time|`timestamp[us, tz=UTC]`| |key_schema|`json`| |last_evaluated_shard_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_account_attributes.md b/plugins/source/aws/docs/tables/aws_ec2_account_attributes.md index 906d145efc7680..284d337299530a 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_account_attributes.md +++ b/plugins/source/aws/docs/tables/aws_ec2_account_attributes.md @@ -4,15 +4,16 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Account Attributes. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AccountAttribute.html -The composite primary key for this table is (**account_id**, **attribute_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **attribute_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |partition|`utf8`| -|attribute_name (PK)|`utf8`| +|attribute_name|`utf8`| |attribute_values|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_byoip_cidrs.md b/plugins/source/aws/docs/tables/aws_ec2_byoip_cidrs.md index 9f037015f374df..94709a63c59d69 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_byoip_cidrs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_byoip_cidrs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Bring your own IP a https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ByoipCidr.html -The composite primary key for this table is (**account_id**, **region**, **cidr**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **cidr**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|cidr (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|cidr|`utf8`| |asn_associations|`json`| |description|`utf8`| |state|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_capacity_reservations.md b/plugins/source/aws/docs/tables/aws_ec2_capacity_reservations.md index b548d2320f7d0c..20717756f08985 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_capacity_reservations.md +++ b/plugins/source/aws/docs/tables/aws_ec2_capacity_reservations.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Capacity Reservatio https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeCapacityReservations.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |availability_zone|`utf8`| |availability_zone_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_customer_gateways.md b/plugins/source/aws/docs/tables/aws_ec2_customer_gateways.md index daf4bf59ae1c24..cd6334947e33aa 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_customer_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_customer_gateways.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Customer Gateways. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CustomerGateway.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |bgp_asn|`utf8`| |certificate_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_dhcp_options.md b/plugins/source/aws/docs/tables/aws_ec2_dhcp_options.md index c3a2850eb74319..42313e2d0a5ff7 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_dhcp_options.md +++ b/plugins/source/aws/docs/tables/aws_ec2_dhcp_options.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) DHCP Options. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DhcpOptions.html -The composite primary key for this table is (**account_id**, **region**, **dhcp_options_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **dhcp_options_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |dhcp_configurations|`json`| -|dhcp_options_id (PK)|`utf8`| +|dhcp_options_id|`utf8`| |owner_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshot_attributes.md b/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshot_attributes.md index 9a6b61964489e3..9477fd6ab6a90d 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshot_attributes.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshot_attributes.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Amazon Elastic Bloc https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeSnapshotAttribute.html -The primary key for this table is **snapshot_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **snapshot_arn**. ## Relations This table depends on [aws_ec2_ebs_snapshots](aws_ec2_ebs_snapshots.md). @@ -14,11 +14,11 @@ This table depends on [aws_ec2_ebs_snapshots](aws_ec2_ebs_snapshots.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|snapshot_arn (PK)|`utf8`| +|snapshot_arn|`utf8`| |create_volume_permissions|`json`| |product_codes|`json`| |snapshot_id|`utf8`| \ No newline at end of file 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 ff2b9b8b8c8a17..12ba65f212b1a7 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_snapshots.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Amazon Elastic Bloc https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Snapshot.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ec2_ebs_snapshots: @@ -15,11 +15,11 @@ The following tables depend on aws_ec2_ebs_snapshots: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |data_encryption_key_id|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_ebs_volume_statuses.md b/plugins/source/aws/docs/tables/aws_ec2_ebs_volume_statuses.md index 3046bb63460acb..4083c17abb4b9b 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_volume_statuses.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_volume_statuses.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Amazon Elastic Bloc https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VolumeStatusItem.html -The primary key for this table is **volume_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **volume_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|volume_arn (PK)|`utf8`| +|volume_arn|`utf8`| |actions|`json`| |attachment_statuses|`json`| |availability_zone|`utf8`| 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 1ad8afd16c9987..5abf5961658379 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md +++ b/plugins/source/aws/docs/tables/aws_ec2_ebs_volumes.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Amazon Elastic Bloc https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Volume.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |attachments|`json`| |availability_zone|`utf8`| 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 e23a71123f4e5e..f4ac7b45e4dc45 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 @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Egress Only Interne https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EgressOnlyInternetGateway.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |attachments|`json`| |egress_only_internet_gateway_id|`utf8`| \ 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 af25636bfc863b..efca8c1cc6aeaf 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_eips.md +++ b/plugins/source/aws/docs/tables/aws_ec2_eips.md @@ -4,18 +4,19 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Eips. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Address.html -The composite primary key for this table is (**account_id**, **region**, **allocation_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **allocation_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|allocation_id (PK)|`utf8`| +|allocation_id|`utf8`| |association_id|`utf8`| |carrier_ip|`utf8`| |customer_owned_ip|`utf8`| 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 f5ce94d5c99d4b..a13a44a86fe573 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_flow_logs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Flow Logs. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_FlowLog.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |deliver_cross_account_role|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_hosts.md b/plugins/source/aws/docs/tables/aws_ec2_hosts.md index 87345c67385f1f..fc5d04fbfac5f4 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_hosts.md +++ b/plugins/source/aws/docs/tables/aws_ec2_hosts.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Hosts. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Host.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |allocation_time|`timestamp[us, tz=UTC]`| |allows_multiple_instance_types|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_image_last_launched_times.md b/plugins/source/aws/docs/tables/aws_ec2_image_last_launched_times.md index 69d8c0a535b17c..de7c239718a005 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_image_last_launched_times.md +++ b/plugins/source/aws/docs/tables/aws_ec2_image_last_launched_times.md @@ -5,8 +5,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Image Last Launched https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImageAttribute.html. The date and time, in ISO 8601 date-time format, when the AMI was last used to launch an EC2 instance. When the AMI is used to launch an instance, there is a 24-hour delay before that usage is reported. -The primary key for this table is **image_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **image_arn**. ## Relations This table depends on [aws_ec2_images](aws_ec2_images.md). @@ -15,7 +15,7 @@ This table depends on [aws_ec2_images](aws_ec2_images.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|image_arn (PK)|`utf8`| +|image_arn|`utf8`| |last_launched_time|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_image_launch_permissions.md b/plugins/source/aws/docs/tables/aws_ec2_image_launch_permissions.md index 42465a2b291f60..22d33d1f7d2803 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_image_launch_permissions.md +++ b/plugins/source/aws/docs/tables/aws_ec2_image_launch_permissions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Image Launch Permis https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchPermission.html -The primary key for this table is **image_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **image_arn**. ## Relations This table depends on [aws_ec2_images](aws_ec2_images.md). @@ -14,9 +14,9 @@ This table depends on [aws_ec2_images](aws_ec2_images.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|image_arn (PK)|`utf8`| +|image_arn|`utf8`| |group|`utf8`| |organization_arn|`utf8`| |organizational_unit_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_images.md b/plugins/source/aws/docs/tables/aws_ec2_images.md index b9c7681b81f043..9579d2dfb50e5c 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_images.md +++ b/plugins/source/aws/docs/tables/aws_ec2_images.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Images. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Image.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_ec2_images: @@ -16,11 +16,11 @@ The following tables depend on aws_ec2_images: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|arn|`utf8`| |tags|`json`| |architecture|`utf8`| |block_device_mappings|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_instance_connect_endpoints.md b/plugins/source/aws/docs/tables/aws_ec2_instance_connect_endpoints.md index 74bf57d793439f..6f016d7eba8dd7 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_instance_connect_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_ec2_instance_connect_endpoints.md @@ -5,17 +5,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Instance Connect En https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Ec2InstanceConnectEndpoint.html The 'request_account_id' and 'request_region' columns are added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |availability_zone|`utf8`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_instance_statuses.md b/plugins/source/aws/docs/tables/aws_ec2_instance_statuses.md index 2784ca0813a36f..f96fefaea9589e 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_instance_statuses.md +++ b/plugins/source/aws/docs/tables/aws_ec2_instance_statuses.md @@ -4,19 +4,20 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Instance Statuses. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceStatus.html -The composite primary key for this table is (**account_id**, **region**, **instance_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **instance_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |availability_zone|`utf8`| |events|`json`| -|instance_id (PK)|`utf8`| +|instance_id|`utf8`| |instance_state|`json`| |instance_status|`json`| |outpost_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_instance_types.md b/plugins/source/aws/docs/tables/aws_ec2_instance_types.md index 24a5696f6f0f37..38b93945991c9d 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_instance_types.md +++ b/plugins/source/aws/docs/tables/aws_ec2_instance_types.md @@ -4,16 +4,17 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Instance Types. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceTypeInfo.html -The composite primary key for this table is (**account_id**, **region**, **instance_type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **instance_type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |auto_recovery_supported|`bool`| |bare_metal|`bool`| |burstable_performance_supported|`bool`| @@ -28,7 +29,7 @@ The composite primary key for this table is (**account_id**, **region**, **insta |inference_accelerator_info|`json`| |instance_storage_info|`json`| |instance_storage_supported|`bool`| -|instance_type (PK)|`utf8`| +|instance_type|`utf8`| |memory_info|`json`| |network_info|`json`| |nitro_enclaves_support|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_instances.md b/plugins/source/aws/docs/tables/aws_ec2_instances.md index 700a8e3b19f047..79e2979ac0a518 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_instances.md +++ b/plugins/source/aws/docs/tables/aws_ec2_instances.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Instances. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Instance.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |state_transition_reason_time|`timestamp[us, tz=UTC]`| |tags|`json`| |ami_launch_index|`int64`| 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 49bb250603f1bd..5ad4516d698d39 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_internet_gateways.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Internet Gateways. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InternetGateway.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |attachments|`json`| |internet_gateway_id|`utf8`| 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 11c62af2778898..1143cfd0dc5c89 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_key_pairs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Key Pairs. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_KeyPairInfo.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |create_time|`timestamp[us, tz=UTC]`| |key_fingerprint|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_launch_template_versions.md b/plugins/source/aws/docs/tables/aws_ec2_launch_template_versions.md index 7e79b3a5611831..dcf711e19340dc 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_launch_template_versions.md +++ b/plugins/source/aws/docs/tables/aws_ec2_launch_template_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Launch Template Ver https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchTemplateVersion.html -The composite primary key for this table is (**arn**, **version_number**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **version_number**). ## Relations This table depends on [aws_ec2_launch_templates](aws_ec2_launch_templates.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_launch_templates](aws_ec2_launch_templates.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| -|version_number (PK)|`int64`| +|arn|`utf8`| +|version_number|`int64`| |create_time|`timestamp[us, tz=UTC]`| |created_by|`utf8`| |default_version|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_launch_templates.md b/plugins/source/aws/docs/tables/aws_ec2_launch_templates.md index 268e3062ad46de..33843ae4c95aad 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_launch_templates.md +++ b/plugins/source/aws/docs/tables/aws_ec2_launch_templates.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Launch Templates. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchTemplate.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ec2_launch_templates: @@ -15,11 +15,11 @@ The following tables depend on aws_ec2_launch_templates: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |create_time|`timestamp[us, tz=UTC]`| |created_by|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_managed_prefix_lists.md b/plugins/source/aws/docs/tables/aws_ec2_managed_prefix_lists.md index 1a8c2027c76b2e..ef15427b68f4a1 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_managed_prefix_lists.md +++ b/plugins/source/aws/docs/tables/aws_ec2_managed_prefix_lists.md @@ -5,17 +5,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Managed Prefix List https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ManagedPrefixList.html. The 'request_account_id' and 'request_region' columns are added to show the account_id and region of where the request was made from. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |address_family|`utf8`| |max_entries|`int64`| 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 6244635c2a68c8..7472ceb8a96e97 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_nat_gateways.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) NAT Gateways. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NatGateway.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |connectivity_type|`utf8`| |create_time|`timestamp[us, tz=UTC]`| 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 564120353cdc80..c03493481dc1c1 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_network_acls.md +++ b/plugins/source/aws/docs/tables/aws_ec2_network_acls.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Network ACLs. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkAcl.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |associations|`json`| |entries|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_network_interfaces.md b/plugins/source/aws/docs/tables/aws_ec2_network_interfaces.md index d7203ae6edb234..0002301316c04c 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_network_interfaces.md +++ b/plugins/source/aws/docs/tables/aws_ec2_network_interfaces.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Network Interfaces. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_NetworkInterface.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |association|`json`| |attachment|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_regional_configs.md b/plugins/source/aws/docs/tables/aws_ec2_regional_configs.md index 953055c4b88c60..94f2311bb114ca 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_regional_configs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_regional_configs.md @@ -5,15 +5,16 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Regional Configs. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetEbsDefaultKmsKeyId.html https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetEbsEncryptionByDefault.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |ebs_encryption_enabled_by_default|`bool`| |ebs_default_kms_key_id|`utf8`| \ 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 b8c69e8c92dfa4..b03b0e18ee7c35 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md +++ b/plugins/source/aws/docs/tables/aws_ec2_reserved_instances.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Reserved Instances. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReservedInstances.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |availability_zone|`utf8`| |currency_code|`utf8`| 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 3b376129f4777f..076e3bd32a1d19 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_route_tables.md +++ b/plugins/source/aws/docs/tables/aws_ec2_route_tables.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Route Tables. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RouteTable.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |associations|`json`| |owner_id|`utf8`| 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 19bc00b20043b9..ef1f0933ea05fd 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_security_groups.md +++ b/plugins/source/aws/docs/tables/aws_ec2_security_groups.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Security Groups. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |description|`utf8`| |group_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_instances.md b/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_instances.md index 6fa4ab0d3ad78b..4445f972ad2db3 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_instances.md +++ b/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_instances.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Spot Fleet Instance https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ActiveInstance.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_ec2_spot_fleet_requests](aws_ec2_spot_fleet_requests.md). @@ -14,11 +14,11 @@ This table depends on [aws_ec2_spot_fleet_requests](aws_ec2_spot_fleet_requests. | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |spot_fleet_request_id|`utf8`| |instance_health|`utf8`| |instance_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_requests.md b/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_requests.md index 72a7a5b89dc9de..d288dda6012969 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_requests.md +++ b/plugins/source/aws/docs/tables/aws_ec2_spot_fleet_requests.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Spot Fleet Requests https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetRequestConfig.html -The composite primary key for this table is (**account_id**, **region**, **spot_fleet_request_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **spot_fleet_request_id**). ## Relations The following tables depend on aws_ec2_spot_fleet_requests: @@ -15,13 +15,13 @@ The following tables depend on aws_ec2_spot_fleet_requests: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |activity_status|`utf8`| |create_time|`timestamp[us, tz=UTC]`| |spot_fleet_request_config|`json`| -|spot_fleet_request_id (PK)|`utf8`| +|spot_fleet_request_id|`utf8`| |spot_fleet_request_state|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ec2_spot_instance_requests.md b/plugins/source/aws/docs/tables/aws_ec2_spot_instance_requests.md index 2b904986479e7d..8986f2c17dc2e4 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_spot_instance_requests.md +++ b/plugins/source/aws/docs/tables/aws_ec2_spot_instance_requests.md @@ -4,16 +4,17 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Spot Instance Reque https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotInstanceRequest.html -The composite primary key for this table is (**account_id**, **region**, **spot_instance_request_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **spot_instance_request_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |actual_block_hourly_price|`utf8`| |availability_zone_group|`utf8`| @@ -26,7 +27,7 @@ The composite primary key for this table is (**account_id**, **region**, **spot_ |launch_specification|`json`| |launched_availability_zone|`utf8`| |product_description|`utf8`| -|spot_instance_request_id (PK)|`utf8`| +|spot_instance_request_id|`utf8`| |spot_price|`utf8`| |state|`utf8`| |status|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_subnets.md b/plugins/source/aws/docs/tables/aws_ec2_subnets.md index 3866d19af65d69..46dafc62d4d461 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_subnets.md +++ b/plugins/source/aws/docs/tables/aws_ec2_subnets.md @@ -5,17 +5,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Subnets. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html The 'request_account_id' and 'request_region' columns are added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |assign_ipv6_address_on_creation|`bool`| |availability_zone|`utf8`| 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 4c67d56c95fae0..bed9a80a4b5205 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateway Att https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayAttachment.html -The composite primary key for this table is (**account_id**, **region**, **transit_gateway_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **transit_gateway_arn**, **id**). ## Relations This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|transit_gateway_arn (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|transit_gateway_arn|`utf8`| +|id|`utf8`| |association|`json`| |creation_time|`timestamp[us, tz=UTC]`| |resource_id|`utf8`| 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 840ded92c484ef..3a1c32c5d4720e 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateway Mul https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayMulticastDomain.html -The composite primary key for this table is (**account_id**, **region**, **transit_gateway_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **transit_gateway_arn**, **arn**). ## Relations This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|transit_gateway_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|transit_gateway_arn|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |options|`json`| |owner_id|`utf8`| 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 e6284976c0e8b6..652b3cb3682c61 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateway Pee https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayPeeringAttachment.html -The composite primary key for this table is (**account_id**, **region**, **transit_gateway_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **transit_gateway_arn**, **id**). ## Relations This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|transit_gateway_arn (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|transit_gateway_arn|`utf8`| +|id|`utf8`| |accepter_tgw_info|`json`| |accepter_transit_gateway_attachment_id|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| 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 711ddc95442622..47b20f1ea9ebd5 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateway Rou https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayRouteTable.html -The composite primary key for this table is (**account_id**, **region**, **transit_gateway_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **transit_gateway_arn**, **id**). ## Relations This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|transit_gateway_arn (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|transit_gateway_arn|`utf8`| +|id|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |default_association_route_table|`bool`| |default_propagation_route_table|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_vpc_attachments.md b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_vpc_attachments.md index 38402bf4cfc420..1b58c01bc865ac 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_vpc_attachments.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateway_vpc_attachments.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateway VPC https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGatewayVpcAttachment.html -The composite primary key for this table is (**account_id**, **region**, **transit_gateway_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **transit_gateway_arn**, **id**). ## Relations This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_transit_gateways](aws_ec2_transit_gateways.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|transit_gateway_arn (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|transit_gateway_arn|`utf8`| +|id|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |options|`json`| |state|`utf8`| 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 b18965dae98da9..2cfefe75b6efe6 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_transit_gateways.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) Transit Gateways. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TransitGateway.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_ec2_transit_gateways: @@ -19,12 +19,12 @@ The following tables depend on aws_ec2_transit_gateways: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |description|`utf8`| |options|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_connections.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_connections.md index cf314f36cdd07f..4d250107a9fd36 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_connections.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_connections.md @@ -4,16 +4,17 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Endpoint Connec https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcEndpointConnection.html -The composite primary key for this table is (**account_id**, **region**, **vpc_endpoint_connection_id**, **vpc_endpoint_owner**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **vpc_endpoint_connection_id**, **vpc_endpoint_owner**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |creation_timestamp|`timestamp[us, tz=UTC]`| |dns_entries|`json`| @@ -21,7 +22,7 @@ The composite primary key for this table is (**account_id**, **region**, **vpc_e |ip_address_type|`utf8`| |network_load_balancer_arns|`list`| |service_id|`utf8`| -|vpc_endpoint_connection_id (PK)|`utf8`| +|vpc_endpoint_connection_id|`utf8`| |vpc_endpoint_id|`utf8`| -|vpc_endpoint_owner (PK)|`utf8`| +|vpc_endpoint_owner|`utf8`| |vpc_endpoint_state|`utf8`| \ 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 96f38c6cce33d8..b0a8a67ca66dc4 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 @@ -4,16 +4,17 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Endpoint Servic https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceConfiguration.html -The composite primary key for this table is (**account_id**, **region**, **service_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **service_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |acceptance_required|`bool`| |availability_zones|`list`| @@ -24,7 +25,7 @@ The composite primary key for this table is (**account_id**, **region**, **servi |payer_responsibility|`utf8`| |private_dns_name|`utf8`| |private_dns_name_configuration|`json`| -|service_id (PK)|`utf8`| +|service_id|`utf8`| |service_name|`utf8`| |service_state|`utf8`| |service_type|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_permissions.md b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_permissions.md index 0be95ad3af6ed7..0ce982d05a52ef 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_permissions.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoint_service_permissions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Endpoint Servic https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AllowedPrincipal.html -The composite primary key for this table is (**account_id**, **service_id**, **service_permission_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **service_id**, **service_permission_id**). ## Relations This table depends on [aws_ec2_vpc_endpoint_services](aws_ec2_vpc_endpoint_services.md). @@ -14,12 +14,12 @@ This table depends on [aws_ec2_vpc_endpoint_services](aws_ec2_vpc_endpoint_servi | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| |tags|`json`| |principal|`utf8`| |principal_type|`utf8`| -|service_id (PK)|`utf8`| -|service_permission_id (PK)|`utf8`| \ No newline at end of file +|service_id|`utf8`| +|service_permission_id|`utf8`| \ 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 0d1f271b590219..028a176a9fd14d 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Endpoint Servic https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceDetail.html -The composite primary key for this table is (**account_id**, **region**, **service_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **service_id**). ## Relations The following tables depend on aws_ec2_vpc_endpoint_services: @@ -15,10 +15,10 @@ The following tables depend on aws_ec2_vpc_endpoint_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |acceptance_required|`bool`| |availability_zones|`list`| @@ -29,7 +29,7 @@ The following tables depend on aws_ec2_vpc_endpoint_services: |private_dns_name|`utf8`| |private_dns_name_verification_state|`utf8`| |private_dns_names|`json`| -|service_id (PK)|`utf8`| +|service_id|`utf8`| |service_name|`utf8`| |service_type|`json`| |supported_ip_address_types|`list`| 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 f887bbd42b07c7..2ffef7a830a6ce 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpc_endpoints.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Endpoints. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcEndpoint.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_timestamp|`timestamp[us, tz=UTC]`| |dns_entries|`json`| 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 3354b56b58e2ce..161a892ffca40d 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 @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPC Peering Connect https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcPeeringConnection.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |accepter_vpc_info|`json`| |expiration_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpcs.md b/plugins/source/aws/docs/tables/aws_ec2_vpcs.md index c9b331fd55d7fa..17ae12ba4d0a85 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpcs.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpcs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPCs. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Vpc.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cidr_block|`utf8`| |cidr_block_association_set|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ec2_vpn_connections.md b/plugins/source/aws/docs/tables/aws_ec2_vpn_connections.md index b00a78a0816558..23fb7548fd4b70 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpn_connections.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpn_connections.md @@ -4,16 +4,17 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPN Connections. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpnConnections.html -The composite primary key for this table is (**account_id**, **region**, **vpn_connection_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **vpn_connection_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |category|`utf8`| |core_network_arn|`utf8`| @@ -27,5 +28,5 @@ The composite primary key for this table is (**account_id**, **region**, **vpn_c |transit_gateway_id|`utf8`| |type|`utf8`| |vgw_telemetry|`json`| -|vpn_connection_id (PK)|`utf8`| +|vpn_connection_id|`utf8`| |vpn_gateway_id|`utf8`| \ 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 59289923dc5fe9..ed3e30198a71b8 100644 --- a/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md +++ b/plugins/source/aws/docs/tables/aws_ec2_vpn_gateways.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Compute Cloud (EC2) VPN Gateways. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpnGateway.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |amazon_side_asn|`int64`| |availability_zone|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ecr_pull_through_cache_rules.md b/plugins/source/aws/docs/tables/aws_ecr_pull_through_cache_rules.md index c2ec3afc34fc8e..ee3b8f757b85fb 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_pull_through_cache_rules.md +++ b/plugins/source/aws/docs/tables/aws_ecr_pull_through_cache_rules.md @@ -4,20 +4,21 @@ This table shows data for Amazon Elastic Container Registry (ECR) Pull Through C https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_DescribePullThroughCacheRules.html -The composite primary key for this table is (**account_id**, **region**, **ecr_repository_prefix**, **registry_id**, **upstream_registry_url**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **ecr_repository_prefix**, **registry_id**, **upstream_registry_url**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |credential_arn|`utf8`| -|ecr_repository_prefix (PK)|`utf8`| -|registry_id (PK)|`utf8`| +|ecr_repository_prefix|`utf8`| +|registry_id|`utf8`| |updated_at|`timestamp[us, tz=UTC]`| |upstream_registry|`utf8`| -|upstream_registry_url (PK)|`utf8`| \ No newline at end of file +|upstream_registry_url|`utf8`| \ 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 44c564ae361d15..16e6d615afceee 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_registries.md +++ b/plugins/source/aws/docs/tables/aws_ecr_registries.md @@ -4,15 +4,16 @@ This table shows data for Amazon Elastic Container Registry (ECR) Registries. https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_DescribeRegistry.html -The composite primary key for this table is (**account_id**, **region**, **registry_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **registry_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|registry_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|registry_id|`utf8`| |replication_configuration|`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 4b1e98f902a73a..66c07a7dc4357e 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md +++ b/plugins/source/aws/docs/tables/aws_ecr_registry_policies.md @@ -4,15 +4,16 @@ This table shows data for Amazon Elastic Container Registry (ECR) Registry Polic https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetRegistryPolicy.html -The composite primary key for this table is (**account_id**, **region**, **registry_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **registry_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |policy_text|`json`| -|registry_id (PK)|`utf8`| \ No newline at end of file +|registry_id|`utf8`| \ 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 076c81b9d2627d..cb90b71aec93c0 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repositories.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repositories.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Registry (ECR) Repositories. https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html -The composite primary key for this table is (**arn**, **registry_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **registry_id**). ## Relations The following tables depend on aws_ecr_repositories: @@ -17,17 +17,17 @@ The following tables depend on aws_ecr_repositories: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |encryption_configuration|`json`| |image_scanning_configuration|`json`| |image_tag_mutability|`utf8`| -|registry_id (PK)|`utf8`| +|registry_id|`utf8`| |repository_arn|`utf8`| |repository_name|`utf8`| |repository_uri|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_repository_image_scan_findings.md b/plugins/source/aws/docs/tables/aws_ecr_repository_image_scan_findings.md index cb5d6df7a5d42e..7f00854a18ba5b 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repository_image_scan_findings.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repository_image_scan_findings.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Registry (ECR) Repository Ima https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageScanFindings.html -The composite primary key for this table is (**repository_arn**, **image_digest**, **registry_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**repository_arn**, **image_digest**, **registry_id**). ## Relations This table depends on [aws_ecr_repository_images](aws_ecr_repository_images.md). @@ -14,14 +14,14 @@ This table depends on [aws_ecr_repository_images](aws_ecr_repository_images.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|repository_arn (PK)|`utf8`| -|image_digest (PK)|`utf8`| +|repository_arn|`utf8`| +|image_digest|`utf8`| |image_id|`json`| |image_scan_findings|`json`| |image_scan_status|`json`| -|registry_id (PK)|`utf8`| +|registry_id|`utf8`| |repository_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_repository_images.md b/plugins/source/aws/docs/tables/aws_ecr_repository_images.md index 519c5b79173676..24b304faee3b78 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repository_images.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repository_images.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Registry (ECR) Repository Ima https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageDetail.html -The composite primary key for this table is (**repository_arn**, **image_digest**, **registry_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**repository_arn**, **image_digest**, **registry_id**). ## Relations This table depends on [aws_ecr_repositories](aws_ecr_repositories.md). @@ -17,13 +17,13 @@ The following tables depend on aws_ecr_repository_images: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|repository_arn (PK)|`utf8`| +|repository_arn|`utf8`| |artifact_media_type|`utf8`| -|image_digest (PK)|`utf8`| +|image_digest|`utf8`| |image_manifest_media_type|`utf8`| |image_pushed_at|`timestamp[us, tz=UTC]`| |image_scan_findings_summary|`json`| @@ -31,5 +31,5 @@ The following tables depend on aws_ecr_repository_images: |image_size_in_bytes|`int64`| |image_tags|`list`| |last_recorded_pull_time|`timestamp[us, tz=UTC]`| -|registry_id (PK)|`utf8`| +|registry_id|`utf8`| |repository_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_repository_lifecycle_policies.md b/plugins/source/aws/docs/tables/aws_ecr_repository_lifecycle_policies.md index d8baff32a1aa8b..e9ba601ed9f3a3 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repository_lifecycle_policies.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repository_lifecycle_policies.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Registry (ECR) Repository Lif https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetLifecyclePolicy.html -The composite primary key for this table is (**repository_arn**, **registry_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**repository_arn**, **registry_id**). ## Relations This table depends on [aws_ecr_repositories](aws_ecr_repositories.md). @@ -14,13 +14,13 @@ This table depends on [aws_ecr_repositories](aws_ecr_repositories.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|repository_arn (PK)|`utf8`| +|repository_arn|`utf8`| |policy_json|`json`| |last_evaluated_at|`timestamp[us, tz=UTC]`| |lifecycle_policy_text|`utf8`| -|registry_id (PK)|`utf8`| +|registry_id|`utf8`| |repository_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ecr_repository_policies.md b/plugins/source/aws/docs/tables/aws_ecr_repository_policies.md index 6407be9907395d..ff932d169a9883 100644 --- a/plugins/source/aws/docs/tables/aws_ecr_repository_policies.md +++ b/plugins/source/aws/docs/tables/aws_ecr_repository_policies.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Registry (ECR) Repository Pol https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetRepositoryPolicy.html -The composite primary key for this table is (**repository_arn**, **registry_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**repository_arn**, **registry_id**). ## Relations This table depends on [aws_ecr_repositories](aws_ecr_repositories.md). @@ -14,12 +14,12 @@ This table depends on [aws_ecr_repositories](aws_ecr_repositories.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|repository_arn (PK)|`utf8`| +|repository_arn|`utf8`| |policy_json|`json`| |policy_text|`utf8`| -|registry_id (PK)|`utf8`| +|registry_id|`utf8`| |repository_name|`utf8`| \ 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 43997de8d8140c..2cfb988242b337 100644 --- a/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md +++ b/plugins/source/aws/docs/tables/aws_ecrpublic_repositories.md @@ -4,8 +4,8 @@ This table shows data for Ecrpublic Repositories. https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_Repository.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ecrpublic_repositories: @@ -15,11 +15,11 @@ The following tables depend on aws_ecrpublic_repositories: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |registry_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ecrpublic_repository_images.md b/plugins/source/aws/docs/tables/aws_ecrpublic_repository_images.md index 6c1a460abfee39..2ae64083f44116 100644 --- a/plugins/source/aws/docs/tables/aws_ecrpublic_repository_images.md +++ b/plugins/source/aws/docs/tables/aws_ecrpublic_repository_images.md @@ -4,8 +4,8 @@ This table shows data for Ecrpublic Repository Images. https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_ImageDetail.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_ecrpublic_repositories](aws_ecrpublic_repositories.md). @@ -14,11 +14,11 @@ This table depends on [aws_ecrpublic_repositories](aws_ecrpublic_repositories.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |artifact_media_type|`utf8`| |image_digest|`utf8`| |image_manifest_media_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ecs_cluster_container_instances.md b/plugins/source/aws/docs/tables/aws_ecs_cluster_container_instances.md index 36ba6163dec019..df60bb25c0ac62 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_container_instances.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_container_instances.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Service (ECS) Cluster Contain https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerInstance.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |cluster_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |agent_connected|`bool`| |agent_update_status|`utf8`| 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 ea0ae3a70325c4..9337fd52c79d96 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_services.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Service (ECS) Cluster Service https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Service.html -The composite primary key for this table is (**arn**, **cluster_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **cluster_arn**). ## Relations This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). @@ -17,14 +17,14 @@ The following tables depend on aws_ecs_cluster_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |capacity_provider_strategy|`json`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |created_by|`utf8`| |deployment_configuration|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ecs_cluster_task_sets.md b/plugins/source/aws/docs/tables/aws_ecs_cluster_task_sets.md index cc1b00c68a51c1..3769a9edadd6cf 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_task_sets.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_task_sets.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Service (ECS) Cluster Task Se https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskSet.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_ecs_cluster_services](aws_ecs_cluster_services.md). @@ -14,11 +14,11 @@ This table depends on [aws_ecs_cluster_services](aws_ecs_cluster_services.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |capacity_provider_strategy|`json`| |cluster_arn|`utf8`| 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 bc0773673c5cda..8cfc7c569e845e 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md +++ b/plugins/source/aws/docs/tables/aws_ecs_cluster_tasks.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Service (ECS) Cluster Tasks. https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Task.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_ecs_clusters](aws_ecs_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |task_protection|`json`| |attachments|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ecs_clusters.md b/plugins/source/aws/docs/tables/aws_ecs_clusters.md index d2bed6cbf93ec2..430a5750a72d5c 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_clusters.md +++ b/plugins/source/aws/docs/tables/aws_ecs_clusters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Container Service (ECS) Clusters. https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Cluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ecs_clusters: @@ -17,11 +17,11 @@ The following tables depend on aws_ecs_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |active_services_count|`int64`| |attachments|`json`| 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 d71403c4ff5726..5fc5e8cad0df7b 100644 --- a/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md +++ b/plugins/source/aws/docs/tables/aws_ecs_task_definitions.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Container Service (ECS) Task Definition https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskDefinition.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |compatibilities|`list`| |container_definitions|`json`| diff --git a/plugins/source/aws/docs/tables/aws_efs_access_points.md b/plugins/source/aws/docs/tables/aws_efs_access_points.md index d8c64486bc8a64..310569fabd41a9 100644 --- a/plugins/source/aws/docs/tables/aws_efs_access_points.md +++ b/plugins/source/aws/docs/tables/aws_efs_access_points.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic File System (EFS) Access Points. https://docs.aws.amazon.com/efs/latest/ug/API_AccessPointDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |access_point_arn|`utf8`| |access_point_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_efs_filesystems.md b/plugins/source/aws/docs/tables/aws_efs_filesystems.md index c14ef55c1efff5..ceb95e210aa09b 100644 --- a/plugins/source/aws/docs/tables/aws_efs_filesystems.md +++ b/plugins/source/aws/docs/tables/aws_efs_filesystems.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic File System (EFS) Filesystems. https://docs.aws.amazon.com/efs/latest/ug/API_FileSystemDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |backup_policy_status|`utf8`| |file_system_policy|`utf8`| |tags|`json`| diff --git a/plugins/source/aws/docs/tables/aws_eks_cluster_addons.md b/plugins/source/aws/docs/tables/aws_eks_cluster_addons.md index 06e4e11581e867..27140980654fd8 100644 --- a/plugins/source/aws/docs/tables/aws_eks_cluster_addons.md +++ b/plugins/source/aws/docs/tables/aws_eks_cluster_addons.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Kubernetes Service (EKS) Cluster Addons https://docs.aws.amazon.com/eks/latest/APIReference/API_Addon.html -The composite primary key for this table is (**arn**, **cluster_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **cluster_arn**). ## Relations This table depends on [aws_eks_clusters](aws_eks_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_eks_clusters](aws_eks_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| -|cluster_arn (PK)|`utf8`| +|arn|`utf8`| +|cluster_arn|`utf8`| |addon_arn|`utf8`| |addon_name|`utf8`| |addon_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eks_cluster_node_groups.md b/plugins/source/aws/docs/tables/aws_eks_cluster_node_groups.md index 2d907c5fcfd4f4..87313d45768166 100644 --- a/plugins/source/aws/docs/tables/aws_eks_cluster_node_groups.md +++ b/plugins/source/aws/docs/tables/aws_eks_cluster_node_groups.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Kubernetes Service (EKS) Cluster Node G https://docs.aws.amazon.com/eks/latest/APIReference/API_Nodegroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_eks_clusters](aws_eks_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_eks_clusters](aws_eks_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |ami_type|`utf8`| |capacity_type|`utf8`| |cluster_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eks_cluster_oidc_identity_provider_configs.md b/plugins/source/aws/docs/tables/aws_eks_cluster_oidc_identity_provider_configs.md index 709916dfbde133..4e7f17a769aa87 100644 --- a/plugins/source/aws/docs/tables/aws_eks_cluster_oidc_identity_provider_configs.md +++ b/plugins/source/aws/docs/tables/aws_eks_cluster_oidc_identity_provider_configs.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Kubernetes Service (EKS) Cluster Oidc I https://docs.aws.amazon.com/eks/latest/APIReference/API_OidcIdentityProviderConfig.html -The composite primary key for this table is (**arn**, **cluster_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **cluster_arn**). ## Relations This table depends on [aws_eks_clusters](aws_eks_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_eks_clusters](aws_eks_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| -|cluster_arn (PK)|`utf8`| +|arn|`utf8`| +|cluster_arn|`utf8`| |client_id|`utf8`| |cluster_name|`utf8`| |groups_claim|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eks_clusters.md b/plugins/source/aws/docs/tables/aws_eks_clusters.md index 4351e373f85001..d6d7d904d1a12b 100644 --- a/plugins/source/aws/docs/tables/aws_eks_clusters.md +++ b/plugins/source/aws/docs/tables/aws_eks_clusters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Kubernetes Service (EKS) Clusters. https://docs.aws.amazon.com/eks/latest/APIReference/API_Cluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_eks_clusters: @@ -18,11 +18,11 @@ The following tables depend on aws_eks_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |certificate_authority|`json`| |client_request_token|`utf8`| |connector_config|`json`| diff --git a/plugins/source/aws/docs/tables/aws_eks_fargate_profiles.md b/plugins/source/aws/docs/tables/aws_eks_fargate_profiles.md index 99cb2066f2426d..4f8d90a0deae7f 100644 --- a/plugins/source/aws/docs/tables/aws_eks_fargate_profiles.md +++ b/plugins/source/aws/docs/tables/aws_eks_fargate_profiles.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Kubernetes Service (EKS) Fargate Profil https://docs.aws.amazon.com/eks/latest/APIReference/API_FargateProfile.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_eks_clusters](aws_eks_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_eks_clusters](aws_eks_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cluster_name|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |fargate_profile_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_clusters.md b/plugins/source/aws/docs/tables/aws_elasticache_clusters.md index b47763e324029b..509a39c82d6e56 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_clusters.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_clusters.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Clusters. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheCluster.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |at_rest_encryption_enabled|`bool`| |auth_token_enabled|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_engine_versions.md b/plugins/source/aws/docs/tables/aws_elasticache_engine_versions.md index 1548bc315e50e8..c5bb7283769a93 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_engine_versions.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_engine_versions.md @@ -4,18 +4,19 @@ This table shows data for Elasticache Engine Versions. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheEngineVersion.html -The composite primary key for this table is (**account_id**, **region**, **engine**, **engine_version**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **engine**, **engine_version**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|engine (PK)|`utf8`| -|engine_version (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|engine|`utf8`| +|engine_version|`utf8`| |cache_engine_description|`utf8`| |cache_engine_version_description|`utf8`| |cache_parameter_group_family|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticache_events.md b/plugins/source/aws/docs/tables/aws_elasticache_events.md index aea499375efedb..950a309fa50154 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_events.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_events.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Events. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_Event.html -The primary key for this table is **_event_hash**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **_event_hash**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|_event_hash (PK)|`utf8`| +|_event_hash|`utf8`| |date|`timestamp[us, tz=UTC]`| |message|`utf8`| |source_identifier|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_global_replication_groups.md b/plugins/source/aws/docs/tables/aws_elasticache_global_replication_groups.md index f78bc40d4da870..f11eba0528e8b9 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_global_replication_groups.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_global_replication_groups.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Global Replication Groups. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_GlobalReplicationGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |at_rest_encryption_enabled|`bool`| |auth_token_enabled|`bool`| |cache_node_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_parameter_groups.md b/plugins/source/aws/docs/tables/aws_elasticache_parameter_groups.md index 688f4751246002..fdfadc2a712a57 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_parameter_groups.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Parameter Groups. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheParameterGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cache_parameter_group_family|`utf8`| |cache_parameter_group_name|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_replication_groups.md b/plugins/source/aws/docs/tables/aws_elasticache_replication_groups.md index 8a6334b092801c..6414da161b302d 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_replication_groups.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_replication_groups.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Replication Groups. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReplicationGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |at_rest_encryption_enabled|`bool`| |auth_token_enabled|`bool`| 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 0ba6b09dc5ad63..6c2e1e28084f94 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 @@ -4,17 +4,18 @@ This table shows data for Elasticache Reserved Cache Nodes. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNode.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cache_node_count|`int64`| |cache_node_type|`utf8`| |duration|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes_offerings.md b/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes_offerings.md index 2ee6424afa70b4..5717b471b48c78 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes_offerings.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_reserved_cache_nodes_offerings.md @@ -4,21 +4,22 @@ This table shows data for Elasticache Reserved Cache Nodes Offerings. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNodesOffering.html -The composite primary key for this table is (**account_id**, **region**, **reserved_cache_nodes_offering_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **reserved_cache_nodes_offering_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |cache_node_type|`utf8`| |duration|`int64`| |fixed_price|`float64`| |offering_type|`utf8`| |product_description|`utf8`| |recurring_charges|`json`| -|reserved_cache_nodes_offering_id (PK)|`utf8`| +|reserved_cache_nodes_offering_id|`utf8`| |usage_price|`float64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticache_service_updates.md b/plugins/source/aws/docs/tables/aws_elasticache_service_updates.md index 2bbcbb3f862175..72e446bfd1286a 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_service_updates.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_service_updates.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Service Updates. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ServiceUpdate.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_update_after_recommended_apply_by_date|`bool`| |engine|`utf8`| |engine_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_snapshots.md b/plugins/source/aws/docs/tables/aws_elasticache_snapshots.md index 75fe73a1ed8dfe..6af372fa3c02a5 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Snapshots. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_Snapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_minor_version_upgrade|`bool`| |automatic_failover|`utf8`| |cache_cluster_create_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_subnet_groups.md b/plugins/source/aws/docs/tables/aws_elasticache_subnet_groups.md index fc27ad8096f7ae..852057978526eb 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_subnet_groups.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Subnet Groups. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CacheSubnetGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cache_subnet_group_description|`utf8`| |cache_subnet_group_name|`utf8`| |subnets|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_update_actions.md b/plugins/source/aws/docs/tables/aws_elasticache_update_actions.md index f5e8c251cd1b25..b0bba9fc236623 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_update_actions.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_update_actions.md @@ -4,24 +4,25 @@ This table shows data for Elasticache Update Actions. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_UpdateAction.html -The composite primary key for this table is (**account_id**, **region**, **cache_cluster_id**, **replication_group_id**, **service_update_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **cache_cluster_id**, **replication_group_id**, **service_update_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|cache_cluster_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|cache_cluster_id|`utf8`| |cache_node_update_status|`json`| |engine|`utf8`| |estimated_update_time|`utf8`| |node_group_update_status|`json`| |nodes_updated|`utf8`| -|replication_group_id (PK)|`utf8`| -|service_update_name (PK)|`utf8`| +|replication_group_id|`utf8`| +|service_update_name|`utf8`| |service_update_recommended_apply_by_date|`timestamp[us, tz=UTC]`| |service_update_release_date|`timestamp[us, tz=UTC]`| |service_update_severity|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_user_groups.md b/plugins/source/aws/docs/tables/aws_elasticache_user_groups.md index 86c5ef9c4c1309..2cafb5779b48fe 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_user_groups.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_user_groups.md @@ -4,17 +4,18 @@ This table shows data for Elasticache User Groups. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_UserGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |engine|`utf8`| |minimum_engine_version|`utf8`| |pending_changes|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elasticache_users.md b/plugins/source/aws/docs/tables/aws_elasticache_users.md index ed7c7c9f92fe5f..d4a60ef3e14045 100644 --- a/plugins/source/aws/docs/tables/aws_elasticache_users.md +++ b/plugins/source/aws/docs/tables/aws_elasticache_users.md @@ -4,17 +4,18 @@ This table shows data for Elasticache Users. https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_User.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |access_string|`utf8`| |authentication|`json`| |engine|`utf8`| 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 ebb629a82fc853..09b51d10dc1ac9 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_application_versions.md @@ -4,17 +4,18 @@ This table shows data for AWS Elastic Beanstalk Application Versions. https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationVersionDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |application_name|`utf8`| |application_version_arn|`utf8`| |build_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md index ded63422407598..475da9463f169c 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_applications.md @@ -4,18 +4,19 @@ This table shows data for AWS Elastic Beanstalk Applications. https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ApplicationDescription.html -The composite primary key for this table is (**arn**, **date_created**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **date_created**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| -|date_created (PK)|`timestamp[us, tz=UTC]`| +|arn|`utf8`| +|date_created|`timestamp[us, tz=UTC]`| |tags|`json`| |application_arn|`utf8`| |application_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_options.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_options.md index 834d95019a8281..158450f94c51ac 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_options.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_options.md @@ -4,8 +4,8 @@ This table shows data for AWS Elastic Beanstalk Configuration Options. https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationOptionDescription.html -The composite primary key for this table is (**environment_arn**, **name**, **application_arn**, **solution_stack_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**environment_arn**, **name**, **application_arn**, **solution_stack_name**). ## Relations This table depends on [aws_elasticbeanstalk_environments](aws_elasticbeanstalk_environments.md). @@ -14,21 +14,21 @@ This table depends on [aws_elasticbeanstalk_environments](aws_elasticbeanstalk_e | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|environment_arn (PK)|`utf8`| +|environment_arn|`utf8`| |change_severity|`utf8`| |default_value|`utf8`| |max_length|`int64`| |max_value|`int64`| |min_value|`int64`| -|name (PK)|`utf8`| +|name|`utf8`| |namespace|`utf8`| |regex|`json`| |user_defined|`bool`| |value_options|`list`| |value_type|`utf8`| -|application_arn (PK)|`utf8`| -|solution_stack_name (PK)|`utf8`| \ No newline at end of file +|application_arn|`utf8`| +|solution_stack_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_settings.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_settings.md index 8e1675d59e6dcc..47884458de9f30 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_settings.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_configuration_settings.md @@ -4,8 +4,8 @@ This table shows data for AWS Elastic Beanstalk Configuration Settings. https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_ConfigurationSettingsDescription.html -The composite primary key for this table is (**environment_arn**, **solution_stack_name**, **application_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**environment_arn**, **solution_stack_name**, **application_arn**). ## Relations This table depends on [aws_elasticbeanstalk_environments](aws_elasticbeanstalk_environments.md). @@ -14,11 +14,11 @@ This table depends on [aws_elasticbeanstalk_environments](aws_elasticbeanstalk_e | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|environment_arn (PK)|`utf8`| +|environment_arn|`utf8`| |application_name|`utf8`| |date_created|`timestamp[us, tz=UTC]`| |date_updated|`timestamp[us, tz=UTC]`| @@ -27,6 +27,6 @@ This table depends on [aws_elasticbeanstalk_environments](aws_elasticbeanstalk_e |environment_name|`utf8`| |option_settings|`json`| |platform_arn|`utf8`| -|solution_stack_name (PK)|`utf8`| +|solution_stack_name|`utf8`| |template_name|`utf8`| -|application_arn (PK)|`utf8`| \ No newline at end of file +|application_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md index da5ddb9a5f40ba..f51c9ef1430505 100644 --- a/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md +++ b/plugins/source/aws/docs/tables/aws_elasticbeanstalk_environments.md @@ -4,8 +4,8 @@ This table shows data for AWS Elastic Beanstalk Environments. https://docs.aws.amazon.com/elasticbeanstalk/latest/APIReference/API_EnvironmentDescription.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_elasticbeanstalk_environments: @@ -16,11 +16,11 @@ The following tables depend on aws_elasticbeanstalk_environments: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |id|`utf8`| |listeners|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elasticsearch_domains.md b/plugins/source/aws/docs/tables/aws_elasticsearch_domains.md index c00695ad8b3df7..57dea84c0d8f0e 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_domains.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_domains.md @@ -4,19 +4,20 @@ This table shows data for Elasticsearch Domains. https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_DomainStatus.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |authorized_principals|`json`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |domain_id|`utf8`| |domain_name|`utf8`| |elasticsearch_cluster_config|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md b/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md index bd1054922cf7ad..7f2439fede1713 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_packages.md @@ -4,17 +4,18 @@ This table shows data for Elasticsearch Packages. https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_PackageDetails.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |available_package_version|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |error_details|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elasticsearch_versions.md b/plugins/source/aws/docs/tables/aws_elasticsearch_versions.md index c297fcaf70d4a1..88ca6962100d9c 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_versions.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_versions.md @@ -4,15 +4,16 @@ This table shows data for Elasticsearch Versions. https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_ListVersions.html -The composite primary key for this table is (**account_id**, **region**, **version**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **version**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|version (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|version|`utf8`| |instance_types|`json`| \ 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 61a61a213be353..fcbf373a6f952c 100644 --- a/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_elasticsearch_vpc_endpoints.md @@ -4,17 +4,18 @@ This table shows data for Elasticsearch VPC Endpoints. https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_VpcEndpoint.html -The primary key for this table is **id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |domain_arn|`utf8`| |endpoint|`utf8`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elastictranscoder_pipeline_jobs.md b/plugins/source/aws/docs/tables/aws_elastictranscoder_pipeline_jobs.md index 6811c09ca8d0f1..0addfe48d1caa2 100644 --- a/plugins/source/aws/docs/tables/aws_elastictranscoder_pipeline_jobs.md +++ b/plugins/source/aws/docs/tables/aws_elastictranscoder_pipeline_jobs.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Transcoder Pipeline Jobs. https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-jobs-by-pipeline.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_elastictranscoder_pipelines](aws_elastictranscoder_pipelines.md). @@ -14,11 +14,11 @@ This table depends on [aws_elastictranscoder_pipelines](aws_elastictranscoder_pi | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |input|`json`| |inputs|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elastictranscoder_pipelines.md b/plugins/source/aws/docs/tables/aws_elastictranscoder_pipelines.md index 33fa0e7edb60eb..aae0ca37a9bba5 100644 --- a/plugins/source/aws/docs/tables/aws_elastictranscoder_pipelines.md +++ b/plugins/source/aws/docs/tables/aws_elastictranscoder_pipelines.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Transcoder Pipelines. https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-pipelines.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_elastictranscoder_pipelines: @@ -15,11 +15,11 @@ The following tables depend on aws_elastictranscoder_pipelines: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |aws_kms_key_arn|`utf8`| |content_config|`json`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elastictranscoder_presets.md b/plugins/source/aws/docs/tables/aws_elastictranscoder_presets.md index e7de756a645620..5aff6b65d3f7e5 100644 --- a/plugins/source/aws/docs/tables/aws_elastictranscoder_presets.md +++ b/plugins/source/aws/docs/tables/aws_elastictranscoder_presets.md @@ -4,17 +4,18 @@ This table shows data for Amazon Elastic Transcoder Presets. https://docs.aws.amazon.com/elastictranscoder/latest/developerguide/list-presets.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |audio|`json`| |container|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elbv1_load_balancer_policies.md b/plugins/source/aws/docs/tables/aws_elbv1_load_balancer_policies.md index 892c7143659a02..afa08b29dc00fb 100644 --- a/plugins/source/aws/docs/tables/aws_elbv1_load_balancer_policies.md +++ b/plugins/source/aws/docs/tables/aws_elbv1_load_balancer_policies.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v1 Load Balancer Po https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_PolicyDescription.html -The composite primary key for this table is (**load_balancer_arn**, **policy_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**load_balancer_arn**, **policy_name**). ## Relations This table depends on [aws_elbv1_load_balancers](aws_elbv1_load_balancers.md). @@ -14,12 +14,12 @@ This table depends on [aws_elbv1_load_balancers](aws_elbv1_load_balancers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|load_balancer_arn (PK)|`utf8`| +|load_balancer_arn|`utf8`| |load_balancer_name|`utf8`| |policy_attribute_descriptions|`json`| -|policy_name (PK)|`utf8`| +|policy_name|`utf8`| |policy_type_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elbv1_load_balancers.md b/plugins/source/aws/docs/tables/aws_elbv1_load_balancers.md index 774ef67f50ff50..fe92cca8c84133 100644 --- a/plugins/source/aws/docs/tables/aws_elbv1_load_balancers.md +++ b/plugins/source/aws/docs/tables/aws_elbv1_load_balancers.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v1 Load Balancers. https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_LoadBalancerDescription.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_elbv1_load_balancers: @@ -15,11 +15,11 @@ The following tables depend on aws_elbv1_load_balancers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |availability_zones|`list`| |backend_server_descriptions|`json`| |canonical_hosted_zone_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_listener_certificates.md b/plugins/source/aws/docs/tables/aws_elbv2_listener_certificates.md index 17ce1fd7ac8e82..bb51f10837b2fe 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_listener_certificates.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_listener_certificates.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Listener Certifi https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Certificate.html -The composite primary key for this table is (**listener_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**listener_arn**, **arn**). ## Relations This table depends on [aws_elbv2_listeners](aws_elbv2_listeners.md). @@ -14,11 +14,11 @@ This table depends on [aws_elbv2_listeners](aws_elbv2_listeners.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|listener_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|listener_arn|`utf8`| +|arn|`utf8`| |certificate_arn|`utf8`| |is_default|`bool`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elbv2_listener_rules.md b/plugins/source/aws/docs/tables/aws_elbv2_listener_rules.md index f1d3c82fb2472c..25a82308ba9984 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_listener_rules.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_listener_rules.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Listener Rules. https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Rule.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_elbv2_listeners](aws_elbv2_listeners.md). @@ -14,12 +14,12 @@ This table depends on [aws_elbv2_listeners](aws_elbv2_listeners.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |listener_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |actions|`json`| |conditions|`json`| |is_default|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_listeners.md b/plugins/source/aws/docs/tables/aws_elbv2_listeners.md index 956af85a4ad1c8..7777ff464041d8 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_listeners.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_listeners.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Listeners. https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_Listener.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_elbv2_load_balancers](aws_elbv2_load_balancers.md). @@ -18,11 +18,11 @@ The following tables depend on aws_elbv2_listeners: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |alpn_policy|`list`| |certificates|`json`| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_attributes.md b/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_attributes.md index ca40ef53fa65eb..5cb221a745419c 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_attributes.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_attributes.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Load Balancer At https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancerAttribute.html -The composite primary key for this table is (**load_balancer_arn**, **key**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**load_balancer_arn**, **key**). ## Relations This table depends on [aws_elbv2_load_balancers](aws_elbv2_load_balancers.md). @@ -14,10 +14,10 @@ This table depends on [aws_elbv2_load_balancers](aws_elbv2_load_balancers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|load_balancer_arn (PK)|`utf8`| -|key (PK)|`utf8`| +|load_balancer_arn|`utf8`| +|key|`utf8`| |value|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_web_acls.md b/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_web_acls.md index 962d2d0e43e5dc..cd247882e71acc 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_load_balancer_web_acls.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Load Balancer We https://docs.aws.amazon.com/waf/latest/APIReference/API_GetWebACLForResource.html -The composite primary key for this table is (**load_balancer_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**load_balancer_arn**, **arn**). ## Relations This table depends on [aws_elbv2_load_balancers](aws_elbv2_load_balancers.md). @@ -14,12 +14,12 @@ This table depends on [aws_elbv2_load_balancers](aws_elbv2_load_balancers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|load_balancer_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|load_balancer_arn|`utf8`| +|arn|`utf8`| |default_action|`json`| |id|`utf8`| |name|`utf8`| 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 13f4c1afe77656..1e8b090e85327a 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_load_balancers.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Load Balancers. https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancer.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_elbv2_load_balancers: @@ -17,12 +17,12 @@ The following tables depend on aws_elbv2_load_balancers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |availability_zones|`json`| |canonical_hosted_zone_id|`utf8`| |created_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_elbv2_target_group_target_health_descriptions.md b/plugins/source/aws/docs/tables/aws_elbv2_target_group_target_health_descriptions.md index 42f41f2bc1686d..4e36065c9103c3 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_target_group_target_health_descriptions.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_target_group_target_health_descriptions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Target Group Tar https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetHealthDescription.html -The composite primary key for this table is (**target_group_arn**, **target_id**, **target_port**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**target_group_arn**, **target_id**, **target_port**). ## Relations This table depends on [aws_elbv2_target_groups](aws_elbv2_target_groups.md). @@ -14,14 +14,14 @@ This table depends on [aws_elbv2_target_groups](aws_elbv2_target_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|target_group_arn (PK)|`utf8`| +|target_group_arn|`utf8`| |anomaly_detection|`json`| |health_check_port|`utf8`| -|target_id (PK)|`utf8`| +|target_id|`utf8`| |target_availability_zone|`utf8`| -|target_port (PK)|`int64`| +|target_port|`int64`| |target_health|`json`| \ No newline at end of file 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 5d7820455be620..8b274a5a9450d8 100644 --- a/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md +++ b/plugins/source/aws/docs/tables/aws_elbv2_target_groups.md @@ -4,8 +4,8 @@ This table shows data for Amazon Elastic Load Balancer (ELB) v2 Target Groups. https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_elbv2_target_groups: @@ -15,12 +15,12 @@ The following tables depend on aws_elbv2_target_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |health_check_enabled|`bool`| |health_check_interval_seconds|`int64`| |health_check_path|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_emr_block_public_access_configs.md b/plugins/source/aws/docs/tables/aws_emr_block_public_access_configs.md index 81098b63c586aa..f82346a727291a 100644 --- a/plugins/source/aws/docs/tables/aws_emr_block_public_access_configs.md +++ b/plugins/source/aws/docs/tables/aws_emr_block_public_access_configs.md @@ -4,15 +4,16 @@ This table shows data for Amazon EMR Block Public Access Configs. https://docs.aws.amazon.com/emr/latest/APIReference/API_GetBlockPublicAccessConfiguration.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |block_public_access_configuration|`json`| |block_public_access_configuration_metadata|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_emr_cluster_instance_fleets.md b/plugins/source/aws/docs/tables/aws_emr_cluster_instance_fleets.md index 2e93180d3fb92a..b5caceeb8731a4 100644 --- a/plugins/source/aws/docs/tables/aws_emr_cluster_instance_fleets.md +++ b/plugins/source/aws/docs/tables/aws_emr_cluster_instance_fleets.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Cluster Instance Fleets. https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceFleet.html -The composite primary key for this table is (**cluster_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **id**). ## Relations This table depends on [aws_emr_clusters](aws_emr_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| -|id (PK)|`utf8`| +|cluster_arn|`utf8`| +|id|`utf8`| |instance_fleet_type|`utf8`| |instance_type_specifications|`json`| |launch_specifications|`json`| diff --git a/plugins/source/aws/docs/tables/aws_emr_cluster_instance_groups.md b/plugins/source/aws/docs/tables/aws_emr_cluster_instance_groups.md index 6e121e07c9af55..f7bf21a85d8ccf 100644 --- a/plugins/source/aws/docs/tables/aws_emr_cluster_instance_groups.md +++ b/plugins/source/aws/docs/tables/aws_emr_cluster_instance_groups.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Cluster Instance Groups. https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceGroup.html -The composite primary key for this table is (**cluster_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **id**). ## Relations This table depends on [aws_emr_clusters](aws_emr_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |auto_scaling_policy|`json`| |bid_price|`utf8`| |configurations|`json`| @@ -26,7 +26,7 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). |custom_ami_id|`utf8`| |ebs_block_devices|`json`| |ebs_optimized|`bool`| -|id (PK)|`utf8`| +|id|`utf8`| |instance_group_type|`utf8`| |instance_type|`utf8`| |last_successfully_applied_configurations|`json`| diff --git a/plugins/source/aws/docs/tables/aws_emr_cluster_instances.md b/plugins/source/aws/docs/tables/aws_emr_cluster_instances.md index eaee4eeaea900b..f610fc571a5b14 100644 --- a/plugins/source/aws/docs/tables/aws_emr_cluster_instances.md +++ b/plugins/source/aws/docs/tables/aws_emr_cluster_instances.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Cluster Instances. https://docs.aws.amazon.com/emr/latest/APIReference/API_Instance.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_emr_clusters](aws_emr_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |ebs_volumes|`json`| |ec2_instance_id|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_emr_clusters.md b/plugins/source/aws/docs/tables/aws_emr_clusters.md index cb133dcd0b8eab..05f89869a0792b 100644 --- a/plugins/source/aws/docs/tables/aws_emr_clusters.md +++ b/plugins/source/aws/docs/tables/aws_emr_clusters.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Clusters. https://docs.aws.amazon.com/emr/latest/APIReference/API_Cluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_emr_clusters: @@ -19,11 +19,11 @@ The following tables depend on aws_emr_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |applications|`json`| |auto_scaling_role|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_emr_notebook_executions.md b/plugins/source/aws/docs/tables/aws_emr_notebook_executions.md index 07b2d803002396..079a0a95230e00 100644 --- a/plugins/source/aws/docs/tables/aws_emr_notebook_executions.md +++ b/plugins/source/aws/docs/tables/aws_emr_notebook_executions.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Notebook Executions. https://docs.aws.amazon.com/emr/latest/APIReference/API_NotebookExecution.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_emr_clusters](aws_emr_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |cluster_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |editor_id|`utf8`| |end_time|`timestamp[us, tz=UTC]`| |environment_variables|`json`| diff --git a/plugins/source/aws/docs/tables/aws_emr_release_labels.md b/plugins/source/aws/docs/tables/aws_emr_release_labels.md index 17e5f7bdab5c00..f9325f18db8a6f 100644 --- a/plugins/source/aws/docs/tables/aws_emr_release_labels.md +++ b/plugins/source/aws/docs/tables/aws_emr_release_labels.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Release Labels. https://docs.aws.amazon.com/emr/latest/APIReference/API_DescribeReleaseLabel.html -The composite primary key for this table is (**account_id**, **region**, **release_label**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **release_label**). ## Relations The following tables depend on aws_emr_release_labels: @@ -15,10 +15,10 @@ The following tables depend on aws_emr_release_labels: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |applications|`json`| |available_os_releases|`json`| -|release_label (PK)|`utf8`| \ No newline at end of file +|release_label|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_emr_security_configurations.md b/plugins/source/aws/docs/tables/aws_emr_security_configurations.md index a2ca2c8ef844a3..f5a1393a68eeda 100644 --- a/plugins/source/aws/docs/tables/aws_emr_security_configurations.md +++ b/plugins/source/aws/docs/tables/aws_emr_security_configurations.md @@ -4,16 +4,17 @@ This table shows data for Amazon EMR Security Configurations. https://docs.aws.amazon.com/emr/latest/APIReference/API_DescribeSecurityConfiguration.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |security_configuration|`json`| |creation_date_time|`timestamp[us, tz=UTC]`| -|name (PK)|`utf8`| \ No newline at end of file +|name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_emr_steps.md b/plugins/source/aws/docs/tables/aws_emr_steps.md index 5301facb19b914..d6c8789e629f9a 100644 --- a/plugins/source/aws/docs/tables/aws_emr_steps.md +++ b/plugins/source/aws/docs/tables/aws_emr_steps.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Steps. https://docs.aws.amazon.com/emr/latest/APIReference/API_Step.html -The composite primary key for this table is (**cluster_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **id**). ## Relations This table depends on [aws_emr_clusters](aws_emr_clusters.md). @@ -14,14 +14,14 @@ This table depends on [aws_emr_clusters](aws_emr_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |action_on_failure|`utf8`| |config|`json`| |execution_role_arn|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |name|`utf8`| |status|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_emr_studio_session_mappings.md b/plugins/source/aws/docs/tables/aws_emr_studio_session_mappings.md index 52d20126fae294..6f4b657a9fa449 100644 --- a/plugins/source/aws/docs/tables/aws_emr_studio_session_mappings.md +++ b/plugins/source/aws/docs/tables/aws_emr_studio_session_mappings.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Studio Session Mappings. https://docs.aws.amazon.com/emr/latest/APIReference/API_GetStudioSessionMapping.html -The composite primary key for this table is (**studio_arn**, **identity_id**, **identity_type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**studio_arn**, **identity_id**, **identity_type**). ## Relations This table depends on [aws_emr_studios](aws_emr_studios.md). @@ -14,15 +14,15 @@ This table depends on [aws_emr_studios](aws_emr_studios.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|studio_arn (PK)|`utf8`| +|studio_arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| -|identity_id (PK)|`utf8`| +|identity_id|`utf8`| |identity_name|`utf8`| -|identity_type (PK)|`utf8`| +|identity_type|`utf8`| |last_modified_time|`timestamp[us, tz=UTC]`| |session_policy_arn|`utf8`| |studio_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_emr_studios.md b/plugins/source/aws/docs/tables/aws_emr_studios.md index 40090f243aa03c..b94a11c56acf76 100644 --- a/plugins/source/aws/docs/tables/aws_emr_studios.md +++ b/plugins/source/aws/docs/tables/aws_emr_studios.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Studios. https://docs.aws.amazon.com/emr/latest/APIReference/API_Studio.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_emr_studios: @@ -15,11 +15,11 @@ The following tables depend on aws_emr_studios: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auth_mode|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |default_s3_location|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_emr_supported_instance_types.md b/plugins/source/aws/docs/tables/aws_emr_supported_instance_types.md index 66eb23e13877fd..746b5df903fe10 100644 --- a/plugins/source/aws/docs/tables/aws_emr_supported_instance_types.md +++ b/plugins/source/aws/docs/tables/aws_emr_supported_instance_types.md @@ -4,8 +4,8 @@ This table shows data for Amazon EMR Supported Instance Types. https://docs.aws.amazon.com/emr/latest/APIReference/API_SupportedInstanceType.html -The composite primary key for this table is (**account_id**, **region**, **release_label**, **type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **release_label**, **type**). ## Relations This table depends on [aws_emr_release_labels](aws_emr_release_labels.md). @@ -14,11 +14,11 @@ This table depends on [aws_emr_release_labels](aws_emr_release_labels.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|release_label (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|release_label|`utf8`| |architecture|`utf8`| |ebs_optimized_available|`bool`| |ebs_optimized_by_default|`bool`| @@ -28,5 +28,5 @@ This table depends on [aws_emr_release_labels](aws_emr_release_labels.md). |memory_gb|`float64`| |number_of_disks|`int64`| |storage_gb|`int64`| -|type (PK)|`utf8`| +|type|`utf8`| |vcpu|`int64`| \ 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 56e29b244b36c8..88d4c0e94dfe0a 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_api_destinations.md @@ -4,17 +4,18 @@ This table shows data for Amazon EventBridge API Destinations. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_ApiDestination.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |api_destination_arn|`utf8`| |api_destination_state|`utf8`| |connection_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_archives.md b/plugins/source/aws/docs/tables/aws_eventbridge_archives.md index 4ef4213b201314..b3a2972b443682 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_archives.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_archives.md @@ -4,17 +4,18 @@ This table shows data for Amazon EventBridge Archives. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Archive.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |archive_name|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |event_count|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_connections.md b/plugins/source/aws/docs/tables/aws_eventbridge_connections.md index 20a880715659af..a05f270f1bdf7f 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_connections.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_connections.md @@ -4,17 +4,18 @@ This table shows data for Amazon EventBridge Connections. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Connection.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |authorization_type|`utf8`| |connection_arn|`utf8`| |connection_state|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_endpoints.md b/plugins/source/aws/docs/tables/aws_eventbridge_endpoints.md index a1f1ff6c07797e..b60449bdf10bda 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_endpoints.md @@ -4,16 +4,17 @@ This table shows data for Amazon EventBridge Endpoints. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Endpoint.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |description|`utf8`| |endpoint_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_rules.md b/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_rules.md index 219ac15762be60..8e55dfb260f4f1 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_rules.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_rules.md @@ -4,8 +4,8 @@ This table shows data for Amazon EventBridge Event Bus Rules. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Rule.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_eventbridge_event_buses](aws_eventbridge_event_buses.md). @@ -17,13 +17,13 @@ The following tables depend on aws_eventbridge_event_bus_rules: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |event_bus_arn|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |event_bus_name|`utf8`| |event_pattern|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_targets.md b/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_targets.md index 6b3b075bc978e1..352b3fe88c1023 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_targets.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_event_bus_targets.md @@ -4,8 +4,8 @@ This table shows data for Amazon EventBridge Event Bus Targets. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Target.html -The composite primary key for this table is (**rule_arn**, **event_bus_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**rule_arn**, **event_bus_arn**, **id**). ## Relations This table depends on [aws_eventbridge_event_bus_rules](aws_eventbridge_event_bus_rules.md). @@ -14,14 +14,14 @@ This table depends on [aws_eventbridge_event_bus_rules](aws_eventbridge_event_bu | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|rule_arn (PK)|`utf8`| -|event_bus_arn (PK)|`utf8`| +|rule_arn|`utf8`| +|event_bus_arn|`utf8`| |arn|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |batch_parameters|`json`| |dead_letter_config|`json`| |ecs_parameters|`json`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_event_buses.md b/plugins/source/aws/docs/tables/aws_eventbridge_event_buses.md index 61f076a37df157..769614baa73179 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_event_buses.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_event_buses.md @@ -4,8 +4,8 @@ This table shows data for Amazon EventBridge Event Buses. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventBus.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_eventbridge_event_buses: @@ -15,11 +15,11 @@ The following tables depend on aws_eventbridge_event_buses: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name|`utf8`| |policy|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_event_sources.md b/plugins/source/aws/docs/tables/aws_eventbridge_event_sources.md index 38ab45e7ef668c..2c0cfe5b395b49 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_event_sources.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_event_sources.md @@ -4,17 +4,18 @@ This table shows data for Amazon EventBridge Event Sources. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_EventSource.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_by|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |expiration_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_eventbridge_replays.md b/plugins/source/aws/docs/tables/aws_eventbridge_replays.md index ca075c7dfcaf1c..d053fa977482c1 100644 --- a/plugins/source/aws/docs/tables/aws_eventbridge_replays.md +++ b/plugins/source/aws/docs/tables/aws_eventbridge_replays.md @@ -4,17 +4,18 @@ This table shows data for Amazon EventBridge Replays. https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_DescribeReplay.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |destination|`json`| |event_end_time|`timestamp[us, tz=UTC]`| 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 89e26ab42aec9c..894fda5109e144 100644 --- a/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md +++ b/plugins/source/aws/docs/tables/aws_firehose_delivery_streams.md @@ -4,18 +4,19 @@ This table shows data for Firehose Delivery Streams. https://docs.aws.amazon.com/firehose/latest/APIReference/API_DeliveryStreamDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |delivery_stream_arn|`utf8`| |delivery_stream_name|`utf8`| |delivery_stream_status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_batch_imports.md b/plugins/source/aws/docs/tables/aws_frauddetector_batch_imports.md index da9a2d63b8d4bf..8341acdffec8c4 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_batch_imports.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_batch_imports.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Batch Imports. https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchImport.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |completion_time|`utf8`| |event_type_name|`utf8`| |failed_records_count|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_batch_predictions.md b/plugins/source/aws/docs/tables/aws_frauddetector_batch_predictions.md index a1d306cb939d60..d762c9904c9ad3 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_batch_predictions.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_batch_predictions.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Batch Predictions. https://docs.aws.amazon.com/frauddetector/latest/api/API_BatchPrediction.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |completion_time|`utf8`| |detector_name|`utf8`| |detector_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_detectors.md b/plugins/source/aws/docs/tables/aws_frauddetector_detectors.md index c44e163d1785fc..6c901f470afa26 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_detectors.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_detectors.md @@ -4,8 +4,8 @@ This table shows data for Amazon Fraud Detector Detectors. https://docs.aws.amazon.com/frauddetector/latest/api/API_Detector.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_frauddetector_detectors: @@ -15,11 +15,11 @@ The following tables depend on aws_frauddetector_detectors: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_entity_types.md b/plugins/source/aws/docs/tables/aws_frauddetector_entity_types.md index b205b91ea16f34..ba73cead4280f7 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_entity_types.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_entity_types.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Entity Types. https://docs.aws.amazon.com/frauddetector/latest/api/API_EntityType.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_event_types.md b/plugins/source/aws/docs/tables/aws_frauddetector_event_types.md index d74e0b39538060..f4d5a403774d17 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_event_types.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_event_types.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Event Types. https://docs.aws.amazon.com/frauddetector/latest/api/API_EventType.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_external_models.md b/plugins/source/aws/docs/tables/aws_frauddetector_external_models.md index 8ca8cac78d3fe4..49c2d18884f1d9 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_external_models.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_external_models.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector External Models. https://docs.aws.amazon.com/frauddetector/latest/api/API_ExternalModel.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`utf8`| |input_configuration|`json`| |invoke_model_endpoint_role_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_labels.md b/plugins/source/aws/docs/tables/aws_frauddetector_labels.md index 1aee7a6fa1f0a9..cc53196f5f68d8 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_labels.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_labels.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Labels. https://docs.aws.amazon.com/frauddetector/latest/api/API_Label.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_model_versions.md b/plugins/source/aws/docs/tables/aws_frauddetector_model_versions.md index 4003a27f03c465..7388108db084bd 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_model_versions.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_model_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Fraud Detector Model Versions. https://docs.aws.amazon.com/frauddetector/latest/api/API_ModelVersionDetail.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_frauddetector_models](aws_frauddetector_models.md). @@ -14,11 +14,11 @@ This table depends on [aws_frauddetector_models](aws_frauddetector_models.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`utf8`| |external_events_detail|`json`| |ingested_events_detail|`json`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_models.md b/plugins/source/aws/docs/tables/aws_frauddetector_models.md index 51722d7e371399..cf56fb56b25a74 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_models.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_models.md @@ -4,8 +4,8 @@ This table shows data for Amazon Fraud Detector Models. https://docs.aws.amazon.com/frauddetector/latest/api/API_Model.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_frauddetector_models: @@ -15,11 +15,11 @@ The following tables depend on aws_frauddetector_models: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`utf8`| |description|`utf8`| |event_type_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_outcomes.md b/plugins/source/aws/docs/tables/aws_frauddetector_outcomes.md index 1e84f059d5b972..347eb4d88ccdbd 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_outcomes.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_outcomes.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Outcomes. https://docs.aws.amazon.com/frauddetector/latest/api/API_Outcome.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_rules.md b/plugins/source/aws/docs/tables/aws_frauddetector_rules.md index 72d54e9d209495..4dd691717afb3b 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_rules.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_rules.md @@ -4,8 +4,8 @@ This table shows data for Amazon Fraud Detector Rules. https://docs.aws.amazon.com/frauddetector/latest/api/API_RuleDetail.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_frauddetector_detectors](aws_frauddetector_detectors.md). @@ -14,11 +14,11 @@ This table depends on [aws_frauddetector_detectors](aws_frauddetector_detectors. | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`utf8`| |description|`utf8`| |detector_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_frauddetector_variables.md b/plugins/source/aws/docs/tables/aws_frauddetector_variables.md index a0ce35f5764161..a92abc1ca3e455 100644 --- a/plugins/source/aws/docs/tables/aws_frauddetector_variables.md +++ b/plugins/source/aws/docs/tables/aws_frauddetector_variables.md @@ -4,17 +4,18 @@ This table shows data for Amazon Fraud Detector Variables. https://docs.aws.amazon.com/frauddetector/latest/api/API_Variable.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |data_source|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_fsx_backups.md b/plugins/source/aws/docs/tables/aws_fsx_backups.md index 2399b48ccd957c..4bbca2dc2a7b5e 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_backups.md +++ b/plugins/source/aws/docs/tables/aws_fsx_backups.md @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Backups. https://docs.aws.amazon.com/fsx/latest/APIReference/API_Backup.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |tags|`json`| |backup_id|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| 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 d0cd32becac6f8..f9cc419016fd8c 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 @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Data Repository Associations. https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryAssociation.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |association_id|`utf8`| |batch_import_meta_data_on_create|`bool`| 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 73915f3e524310..f52d6d88f8a002 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 @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Data Repository Tasks. https://docs.aws.amazon.com/fsx/latest/APIReference/API_DataRepositoryTask.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |lifecycle|`utf8`| 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 4e22a4a169606b..91c4b1d8fa77dd 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_file_caches.md +++ b/plugins/source/aws/docs/tables/aws_fsx_file_caches.md @@ -4,17 +4,18 @@ This table shows data for Amazon FSx File Caches. https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileCache.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |dns_name|`utf8`| 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 ddf5358c4a28f7..dbae70009fbf5f 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_file_systems.md +++ b/plugins/source/aws/docs/tables/aws_fsx_file_systems.md @@ -4,17 +4,18 @@ This table shows data for Amazon FSx File Systems. https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileSystem.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |administrative_actions|`json`| |creation_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_fsx_snapshots.md b/plugins/source/aws/docs/tables/aws_fsx_snapshots.md index 374cf6a95d0f03..3f0b5e03c5bf55 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_fsx_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Snapshots. https://docs.aws.amazon.com/fsx/latest/APIReference/API_Snapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |administrative_actions|`json`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| 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 bac8354f2598bc..ddf13a9056c1df 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 @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Storage Virtual Machines. https://docs.aws.amazon.com/fsx/latest/APIReference/API_StorageVirtualMachine.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |active_directory_configuration|`json`| |creation_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_fsx_volumes.md b/plugins/source/aws/docs/tables/aws_fsx_volumes.md index ad882376922e24..cf8bc012718830 100644 --- a/plugins/source/aws/docs/tables/aws_fsx_volumes.md +++ b/plugins/source/aws/docs/tables/aws_fsx_volumes.md @@ -4,17 +4,18 @@ This table shows data for Amazon FSx Volumes. https://docs.aws.amazon.com/fsx/latest/APIReference/API_Volume.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |administrative_actions|`json`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_glacier_data_retrieval_policies.md b/plugins/source/aws/docs/tables/aws_glacier_data_retrieval_policies.md index 823bfd386a10f9..9055ade70f5a0f 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_data_retrieval_policies.md +++ b/plugins/source/aws/docs/tables/aws_glacier_data_retrieval_policies.md @@ -4,14 +4,15 @@ This table shows data for Glacier Data Retrieval Policies. https://docs.aws.amazon.com/amazonglacier/latest/dev/api-GetDataRetrievalPolicy.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |rules|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glacier_vault_access_policies.md b/plugins/source/aws/docs/tables/aws_glacier_vault_access_policies.md index 0458d11f9a08a0..8ccb74e3ae33f6 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_vault_access_policies.md +++ b/plugins/source/aws/docs/tables/aws_glacier_vault_access_policies.md @@ -4,8 +4,8 @@ This table shows data for Glacier Vault Access Policies. https://docs.aws.amazon.com/amazonglacier/latest/dev/api-GetVaultAccessPolicy.html -The primary key for this table is **vault_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **vault_arn**. ## Relations This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). @@ -14,9 +14,9 @@ This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|vault_arn (PK)|`utf8`| +|vault_arn|`utf8`| |policy|`json`| \ 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 3742b49791228d..924f14c1e4f575 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 @@ -4,8 +4,8 @@ This table shows data for Glacier Vault Lock Policies. https://docs.aws.amazon.com/amazonglacier/latest/dev/api-GetVaultLock.html -The primary key for this table is **vault_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **vault_arn**. ## Relations This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). @@ -14,11 +14,11 @@ This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|vault_arn (PK)|`utf8`| +|vault_arn|`utf8`| |policy|`json`| |creation_date|`utf8`| |expiration_date|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glacier_vault_notifications.md b/plugins/source/aws/docs/tables/aws_glacier_vault_notifications.md index ff33fa344033e1..7c5dc17aff598a 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_vault_notifications.md +++ b/plugins/source/aws/docs/tables/aws_glacier_vault_notifications.md @@ -4,8 +4,8 @@ This table shows data for Glacier Vault Notifications. https://docs.aws.amazon.com/amazonglacier/latest/dev/api-vault-notifications-get.html -The primary key for this table is **vault_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **vault_arn**. ## Relations This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). @@ -14,10 +14,10 @@ This table depends on [aws_glacier_vaults](aws_glacier_vaults.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|vault_arn (PK)|`utf8`| +|vault_arn|`utf8`| |events|`list`| |sns_topic|`utf8`| \ 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 f8422a7f1861fd..2f7acec14b4abb 100644 --- a/plugins/source/aws/docs/tables/aws_glacier_vaults.md +++ b/plugins/source/aws/docs/tables/aws_glacier_vaults.md @@ -4,8 +4,8 @@ This table shows data for Glacier Vaults. https://docs.aws.amazon.com/amazonglacier/latest/dev/api-vaults-get.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_glacier_vaults: @@ -17,12 +17,12 @@ The following tables depend on aws_glacier_vaults: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_date|`utf8`| |last_inventory_date|`utf8`| |number_of_archives|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_glue_classifiers.md b/plugins/source/aws/docs/tables/aws_glue_classifiers.md index 781de5d36075bc..ebccfed70b57ed 100644 --- a/plugins/source/aws/docs/tables/aws_glue_classifiers.md +++ b/plugins/source/aws/docs/tables/aws_glue_classifiers.md @@ -4,17 +4,18 @@ This table shows data for Glue Classifiers. https://docs.aws.amazon.com/glue/latest/webapi/API_Classifier.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|name|`utf8`| |csv_classifier|`json`| |grok_classifier|`json`| |json_classifier|`json`| diff --git a/plugins/source/aws/docs/tables/aws_glue_connections.md b/plugins/source/aws/docs/tables/aws_glue_connections.md index a9380a6f493ffd..d3cb554776fb43 100644 --- a/plugins/source/aws/docs/tables/aws_glue_connections.md +++ b/plugins/source/aws/docs/tables/aws_glue_connections.md @@ -4,17 +4,18 @@ This table shows data for Glue Connections. https://docs.aws.amazon.com/glue/latest/webapi/API_Connection.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |connection_properties|`json`| |connection_type|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_glue_crawlers.md b/plugins/source/aws/docs/tables/aws_glue_crawlers.md index 2ebd6190427053..967e371f7e03cb 100644 --- a/plugins/source/aws/docs/tables/aws_glue_crawlers.md +++ b/plugins/source/aws/docs/tables/aws_glue_crawlers.md @@ -4,17 +4,18 @@ This table shows data for Glue Crawlers. https://docs.aws.amazon.com/glue/latest/webapi/API_Crawler.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |classifiers|`list`| |configuration|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_database_table_indexes.md b/plugins/source/aws/docs/tables/aws_glue_database_table_indexes.md index dd6b6da36b1237..b45f7e2a0bc0e8 100644 --- a/plugins/source/aws/docs/tables/aws_glue_database_table_indexes.md +++ b/plugins/source/aws/docs/tables/aws_glue_database_table_indexes.md @@ -4,8 +4,8 @@ This table shows data for Glue Database Table Indexes. https://docs.aws.amazon.com/glue/latest/webapi/API_PartitionIndexDescriptor.html -The composite primary key for this table is (**database_arn**, **database_table_name**, **index_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**database_arn**, **database_table_name**, **index_name**). ## Relations This table depends on [aws_glue_database_tables](aws_glue_database_tables.md). @@ -14,13 +14,13 @@ This table depends on [aws_glue_database_tables](aws_glue_database_tables.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|database_arn (PK)|`utf8`| -|database_table_name (PK)|`utf8`| -|index_name (PK)|`utf8`| +|database_arn|`utf8`| +|database_table_name|`utf8`| +|index_name|`utf8`| |index_status|`utf8`| |keys|`json`| |backfill_errors|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_database_tables.md b/plugins/source/aws/docs/tables/aws_glue_database_tables.md index 9631d837b8930d..061e7460b73141 100644 --- a/plugins/source/aws/docs/tables/aws_glue_database_tables.md +++ b/plugins/source/aws/docs/tables/aws_glue_database_tables.md @@ -4,8 +4,8 @@ This table shows data for Glue Database Tables. https://docs.aws.amazon.com/glue/latest/webapi/API_Table.html -The composite primary key for this table is (**database_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**database_arn**, **name**). ## Relations This table depends on [aws_glue_databases](aws_glue_databases.md). @@ -17,12 +17,12 @@ The following tables depend on aws_glue_database_tables: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|database_arn (PK)|`utf8`| -|name (PK)|`utf8`| +|database_arn|`utf8`| +|name|`utf8`| |catalog_id|`utf8`| |create_time|`timestamp[us, tz=UTC]`| |created_by|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_databases.md b/plugins/source/aws/docs/tables/aws_glue_databases.md index d050eb785144fe..d5b497345177ae 100644 --- a/plugins/source/aws/docs/tables/aws_glue_databases.md +++ b/plugins/source/aws/docs/tables/aws_glue_databases.md @@ -4,8 +4,8 @@ This table shows data for Glue Databases. https://docs.aws.amazon.com/glue/latest/webapi/API_Database.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_glue_databases: @@ -15,11 +15,11 @@ The following tables depend on aws_glue_databases: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |name|`utf8`| |catalog_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_datacatalog_encryption_settings.md b/plugins/source/aws/docs/tables/aws_glue_datacatalog_encryption_settings.md index 4738e7ca49f5cc..0f77d82cc60e86 100644 --- a/plugins/source/aws/docs/tables/aws_glue_datacatalog_encryption_settings.md +++ b/plugins/source/aws/docs/tables/aws_glue_datacatalog_encryption_settings.md @@ -4,15 +4,16 @@ This table shows data for Glue Datacatalog Encryption Settings. https://docs.aws.amazon.com/glue/latest/webapi/API_GetDataCatalogEncryptionSettings.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |connection_password_encryption|`json`| |encryption_at_rest|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_dev_endpoints.md b/plugins/source/aws/docs/tables/aws_glue_dev_endpoints.md index 3b4aeae5139f92..b9b87ae4dae7a7 100644 --- a/plugins/source/aws/docs/tables/aws_glue_dev_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_glue_dev_endpoints.md @@ -4,17 +4,18 @@ This table shows data for Glue Dev Endpoints. https://docs.aws.amazon.com/glue/latest/webapi/API_DevEndpoint.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |arguments|`json`| |availability_zone|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_job_runs.md b/plugins/source/aws/docs/tables/aws_glue_job_runs.md index c0e888755d1bf8..720eb294145e5d 100644 --- a/plugins/source/aws/docs/tables/aws_glue_job_runs.md +++ b/plugins/source/aws/docs/tables/aws_glue_job_runs.md @@ -4,8 +4,8 @@ This table shows data for Glue Job Runs. https://docs.aws.amazon.com/glue/latest/webapi/API_JobRun.html -The composite primary key for this table is (**job_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**job_arn**, **id**). ## Relations This table depends on [aws_glue_jobs](aws_glue_jobs.md). @@ -14,11 +14,11 @@ This table depends on [aws_glue_jobs](aws_glue_jobs.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|job_arn (PK)|`utf8`| +|job_arn|`utf8`| |allocated_capacity|`int64`| |arguments|`json`| |attempt|`int64`| @@ -28,7 +28,7 @@ This table depends on [aws_glue_jobs](aws_glue_jobs.md). |execution_class|`utf8`| |execution_time|`int64`| |glue_version|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |job_name|`utf8`| |job_run_state|`utf8`| |last_modified_on|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_glue_jobs.md b/plugins/source/aws/docs/tables/aws_glue_jobs.md index ff7a54c352acaf..bd5aef18831619 100644 --- a/plugins/source/aws/docs/tables/aws_glue_jobs.md +++ b/plugins/source/aws/docs/tables/aws_glue_jobs.md @@ -4,8 +4,8 @@ This table shows data for Glue Jobs. https://docs.aws.amazon.com/glue/latest/webapi/API_Job.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_glue_jobs: @@ -15,11 +15,11 @@ The following tables depend on aws_glue_jobs: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |allocated_capacity|`int64`| |code_gen_configuration_nodes|`json`| diff --git a/plugins/source/aws/docs/tables/aws_glue_ml_transform_task_runs.md b/plugins/source/aws/docs/tables/aws_glue_ml_transform_task_runs.md index 1078a848e0779e..c923f57edad9f8 100644 --- a/plugins/source/aws/docs/tables/aws_glue_ml_transform_task_runs.md +++ b/plugins/source/aws/docs/tables/aws_glue_ml_transform_task_runs.md @@ -4,8 +4,8 @@ This table shows data for Glue ML Transform Task Runs. https://docs.aws.amazon.com/glue/latest/webapi/API_TaskRun.html -The composite primary key for this table is (**ml_transform_arn**, **task_run_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**ml_transform_arn**, **task_run_id**). ## Relations This table depends on [aws_glue_ml_transforms](aws_glue_ml_transforms.md). @@ -14,11 +14,11 @@ This table depends on [aws_glue_ml_transforms](aws_glue_ml_transforms.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|ml_transform_arn (PK)|`utf8`| +|ml_transform_arn|`utf8`| |completed_on|`timestamp[us, tz=UTC]`| |error_string|`utf8`| |execution_time|`int64`| @@ -27,5 +27,5 @@ This table depends on [aws_glue_ml_transforms](aws_glue_ml_transforms.md). |properties|`json`| |started_on|`timestamp[us, tz=UTC]`| |status|`utf8`| -|task_run_id (PK)|`utf8`| +|task_run_id|`utf8`| |transform_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_ml_transforms.md b/plugins/source/aws/docs/tables/aws_glue_ml_transforms.md index 132d68d64a4458..51a1a40255d378 100644 --- a/plugins/source/aws/docs/tables/aws_glue_ml_transforms.md +++ b/plugins/source/aws/docs/tables/aws_glue_ml_transforms.md @@ -4,8 +4,8 @@ This table shows data for Glue ML Transforms. https://docs.aws.amazon.com/glue/latest/webapi/API_MLTransform.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_glue_ml_transforms: @@ -15,11 +15,11 @@ The following tables depend on aws_glue_ml_transforms: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |schema|`json`| |tags|`json`| |created_on|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_glue_registries.md b/plugins/source/aws/docs/tables/aws_glue_registries.md index c51ab012574505..440e04e301aff4 100644 --- a/plugins/source/aws/docs/tables/aws_glue_registries.md +++ b/plugins/source/aws/docs/tables/aws_glue_registries.md @@ -4,8 +4,8 @@ This table shows data for Glue Registries. https://docs.aws.amazon.com/glue/latest/webapi/API_RegistryListItem.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_glue_registries: @@ -15,11 +15,11 @@ The following tables depend on aws_glue_registries: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_registry_schema_versions.md b/plugins/source/aws/docs/tables/aws_glue_registry_schema_versions.md index 9a6adb77ab8fdb..29795423a44474 100644 --- a/plugins/source/aws/docs/tables/aws_glue_registry_schema_versions.md +++ b/plugins/source/aws/docs/tables/aws_glue_registry_schema_versions.md @@ -4,8 +4,8 @@ This table shows data for Glue Registry Schema Versions. https://docs.aws.amazon.com/glue/latest/webapi/API_GetSchemaVersion.html -The composite primary key for this table is (**registry_schema_arn**, **schema_version_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**registry_schema_arn**, **schema_version_id**). ## Relations This table depends on [aws_glue_registry_schemas](aws_glue_registry_schemas.md). @@ -14,16 +14,16 @@ This table depends on [aws_glue_registry_schemas](aws_glue_registry_schemas.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|registry_schema_arn (PK)|`utf8`| +|registry_schema_arn|`utf8`| |metadata|`json`| |created_time|`utf8`| |data_format|`utf8`| |schema_arn|`utf8`| |schema_definition|`utf8`| -|schema_version_id (PK)|`utf8`| +|schema_version_id|`utf8`| |status|`utf8`| |version_number|`int64`| \ 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 ee77653e4fb37f..a7dc44923aa34b 100644 --- a/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md +++ b/plugins/source/aws/docs/tables/aws_glue_registry_schemas.md @@ -4,8 +4,8 @@ This table shows data for Glue Registry Schemas. https://docs.aws.amazon.com/glue/latest/webapi/API_GetSchema.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_glue_registries](aws_glue_registries.md). @@ -17,11 +17,11 @@ The following tables depend on aws_glue_registry_schemas: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |compatibility|`utf8`| |created_time|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_security_configurations.md b/plugins/source/aws/docs/tables/aws_glue_security_configurations.md index 104b2518ff8c72..fdeff49cfc85e2 100644 --- a/plugins/source/aws/docs/tables/aws_glue_security_configurations.md +++ b/plugins/source/aws/docs/tables/aws_glue_security_configurations.md @@ -4,16 +4,17 @@ This table shows data for Glue Security Configurations. https://docs.aws.amazon.com/glue/latest/webapi/API_SecurityConfiguration.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |created_time_stamp|`timestamp[us, tz=UTC]`| |encryption_configuration|`json`| -|name (PK)|`utf8`| \ No newline at end of file +|name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_glue_triggers.md b/plugins/source/aws/docs/tables/aws_glue_triggers.md index 99cef23969d3fb..b34a93b89f755f 100644 --- a/plugins/source/aws/docs/tables/aws_glue_triggers.md +++ b/plugins/source/aws/docs/tables/aws_glue_triggers.md @@ -4,17 +4,18 @@ This table shows data for Glue Triggers. https://docs.aws.amazon.com/glue/latest/webapi/API_Trigger.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |actions|`json`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_glue_workflows.md b/plugins/source/aws/docs/tables/aws_glue_workflows.md index 43c785fa5e3967..c5e67888aa54db 100644 --- a/plugins/source/aws/docs/tables/aws_glue_workflows.md +++ b/plugins/source/aws/docs/tables/aws_glue_workflows.md @@ -4,17 +4,18 @@ This table shows data for Glue Workflows. https://docs.aws.amazon.com/glue/latest/webapi/API_Workflow.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |blueprint_details|`json`| |created_on|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_filters.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_filters.md index b23ea9502fa1b6..4b9dc7d610cc75 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_filters.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_filters.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector Filters. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetFilter.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **name**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,14 +14,14 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| |action|`utf8`| |finding_criteria|`json`| -|name (PK)|`utf8`| +|name|`utf8`| |description|`utf8`| |rank|`int64`| |tags|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_findings.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_findings.md index de97265123adee..7c6113b4cfce8f 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_findings.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_findings.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector Findings. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Finding.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **arn**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,13 +14,13 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |id|`utf8`| |region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_intel_sets.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_intel_sets.md index 4b33a5872798be..2660f06029aec5 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_intel_sets.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_intel_sets.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector Intel Sets. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetThreatIntelSet.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **name**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,13 +14,13 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| |format|`utf8`| |location|`utf8`| -|name (PK)|`utf8`| +|name|`utf8`| |status|`utf8`| |tags|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_ip_sets.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_ip_sets.md index 94f060228f2eb5..5e8160bf2bfc48 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_ip_sets.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_ip_sets.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector IP Sets. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetIPSet.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **name**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,13 +14,13 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| |format|`utf8`| |location|`utf8`| -|name (PK)|`utf8`| +|name|`utf8`| |status|`utf8`| |tags|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_members.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_members.md index c343fe59d8fc2b..25a8e59e65f29f 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_members.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_members.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector Members. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Member.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **account_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **account_id**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,12 +14,12 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| -|account_id (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| +|account_id|`utf8`| |email|`utf8`| |master_id|`utf8`| |relationship_status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detector_publishing_destinations.md b/plugins/source/aws/docs/tables/aws_guardduty_detector_publishing_destinations.md index 9acc65a9b3721e..30f150ac5478aa 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detector_publishing_destinations.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detector_publishing_destinations.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detector Publishing Destinations. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DescribePublishingDestination.html -The composite primary key for this table is (**request_account_id**, **request_region**, **detector_arn**, **destination_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **detector_arn**, **destination_id**). ## Relations This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). @@ -14,11 +14,11 @@ This table depends on [aws_guardduty_detectors](aws_guardduty_detectors.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|detector_arn (PK)|`utf8`| -|destination_id (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|detector_arn|`utf8`| +|destination_id|`utf8`| |destination_type|`utf8`| |status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_guardduty_detectors.md b/plugins/source/aws/docs/tables/aws_guardduty_detectors.md index bda7efd2504f9e..199a7c7da8cae8 100644 --- a/plugins/source/aws/docs/tables/aws_guardduty_detectors.md +++ b/plugins/source/aws/docs/tables/aws_guardduty_detectors.md @@ -4,8 +4,8 @@ This table shows data for Amazon GuardDuty Detectors. https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetDetector.html -The composite primary key for this table is (**request_account_id**, **request_region**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **id**). ## Relations The following tables depend on aws_guardduty_detectors: @@ -20,12 +20,12 @@ The following tables depend on aws_guardduty_detectors: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| |arn|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |service_role|`utf8`| |status|`utf8`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_iam_account_authorization_details.md b/plugins/source/aws/docs/tables/aws_iam_account_authorization_details.md index 8aa370d215f2e3..3f32610492f929 100644 --- a/plugins/source/aws/docs/tables/aws_iam_account_authorization_details.md +++ b/plugins/source/aws/docs/tables/aws_iam_account_authorization_details.md @@ -4,15 +4,16 @@ This table shows data for IAM Account Authorization Details. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetAccountAuthorizationDetails.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |group_detail_list|`json`| |policies|`json`| |role_detail_list|`json`| diff --git a/plugins/source/aws/docs/tables/aws_iam_accounts.md b/plugins/source/aws/docs/tables/aws_iam_accounts.md index 8e3583d933ed75..214990d83ba4a7 100644 --- a/plugins/source/aws/docs/tables/aws_iam_accounts.md +++ b/plugins/source/aws/docs/tables/aws_iam_accounts.md @@ -4,15 +4,16 @@ This table shows data for IAM Accounts. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetAccountSummary.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |users|`int64`| |users_quota|`int64`| |groups|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_iam_credential_reports.md b/plugins/source/aws/docs/tables/aws_iam_credential_reports.md index 84356ee1ffef7b..6267e0b83f499a 100644 --- a/plugins/source/aws/docs/tables/aws_iam_credential_reports.md +++ b/plugins/source/aws/docs/tables/aws_iam_credential_reports.md @@ -4,16 +4,17 @@ This table shows data for IAM Credential Reports. https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_getting-report.html#id_credentials_understanding_the_report_format -The composite primary key for this table is (**arn**, **user_creation_time**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **user_creation_time**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|arn (PK)|`utf8`| -|user_creation_time (PK)|`timestamp[us, tz=UTC]`| +|arn|`utf8`| +|user_creation_time|`timestamp[us, tz=UTC]`| |password_last_changed|`timestamp[us, tz=UTC]`| |password_next_rotation|`timestamp[us, tz=UTC]`| |access_key_1_last_rotated|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_iam_group_attached_policies.md b/plugins/source/aws/docs/tables/aws_iam_group_attached_policies.md index 0c9ca2237f76cc..00f5ee01d126ab 100644 --- a/plugins/source/aws/docs/tables/aws_iam_group_attached_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_group_attached_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM Group Attached Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html -The composite primary key for this table is (**account_id**, **group_arn**, **policy_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **group_arn**, **policy_arn**). ## Relations This table depends on [aws_iam_groups](aws_iam_groups.md). @@ -14,9 +14,9 @@ This table depends on [aws_iam_groups](aws_iam_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|group_arn (PK)|`utf8`| -|policy_arn (PK)|`utf8`| +|account_id|`utf8`| +|group_arn|`utf8`| +|policy_arn|`utf8`| |policy_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_group_last_accessed_details.md b/plugins/source/aws/docs/tables/aws_iam_group_last_accessed_details.md index bb88c158061ecd..dea74c0f328c8d 100644 --- a/plugins/source/aws/docs/tables/aws_iam_group_last_accessed_details.md +++ b/plugins/source/aws/docs/tables/aws_iam_group_last_accessed_details.md @@ -4,8 +4,8 @@ This table shows data for IAM Group Last Accessed Details. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html -The composite primary key for this table is (**account_id**, **group_arn**, **service_namespace**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **group_arn**, **service_namespace**). ## Relations This table depends on [aws_iam_groups](aws_iam_groups.md). @@ -14,13 +14,13 @@ This table depends on [aws_iam_groups](aws_iam_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|group_arn (PK)|`utf8`| +|account_id|`utf8`| +|group_arn|`utf8`| |job_id|`utf8`| |service_name|`utf8`| -|service_namespace (PK)|`utf8`| +|service_namespace|`utf8`| |last_authenticated|`timestamp[us, tz=UTC]`| |last_authenticated_entity|`utf8`| |last_authenticated_region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_group_policies.md b/plugins/source/aws/docs/tables/aws_iam_group_policies.md index 200c74fa47b49d..4367bfc60c6799 100644 --- a/plugins/source/aws/docs/tables/aws_iam_group_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_group_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM Group Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetGroupPolicy.html -The composite primary key for this table is (**account_id**, **group_arn**, **policy_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **group_arn**, **policy_name**). ## Relations This table depends on [aws_iam_groups](aws_iam_groups.md). @@ -14,10 +14,10 @@ This table depends on [aws_iam_groups](aws_iam_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|group_arn (PK)|`utf8`| +|account_id|`utf8`| +|group_arn|`utf8`| |policy_document|`json`| |group_name|`utf8`| -|policy_name (PK)|`utf8`| \ No newline at end of file +|policy_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_groups.md b/plugins/source/aws/docs/tables/aws_iam_groups.md index 431b9a025842f9..64fe1a0f5fb35f 100644 --- a/plugins/source/aws/docs/tables/aws_iam_groups.md +++ b/plugins/source/aws/docs/tables/aws_iam_groups.md @@ -4,8 +4,8 @@ This table shows data for IAM Groups. https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_iam_groups: @@ -17,10 +17,10 @@ The following tables depend on aws_iam_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |group_id|`utf8`| |group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_instance_profiles.md b/plugins/source/aws/docs/tables/aws_iam_instance_profiles.md index 8a03d2ca1652a2..bedcdfc2cc7fdf 100644 --- a/plugins/source/aws/docs/tables/aws_iam_instance_profiles.md +++ b/plugins/source/aws/docs/tables/aws_iam_instance_profiles.md @@ -4,16 +4,17 @@ This table shows data for IAM Instance Profiles. https://docs.aws.amazon.com/IAM/latest/APIReference/API_InstanceProfile.html -The composite primary key for this table is (**account_id**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|id|`utf8`| |tags|`json`| |arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_iam_mfa_devices.md b/plugins/source/aws/docs/tables/aws_iam_mfa_devices.md index 73fa5055141a2e..02721da154393a 100644 --- a/plugins/source/aws/docs/tables/aws_iam_mfa_devices.md +++ b/plugins/source/aws/docs/tables/aws_iam_mfa_devices.md @@ -4,8 +4,8 @@ This table shows data for IAM MFA Devices. https://docs.aws.amazon.com/IAM/latest/APIReference/API_MFADevice.html -The primary key for this table is **serial_number**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **serial_number**. ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,9 +14,9 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|serial_number (PK)|`utf8`| +|serial_number|`utf8`| |enable_date|`timestamp[us, tz=UTC]`| |user_name|`utf8`| \ 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 94136c7ec67ea4..0318a19e5f4e5b 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 @@ -4,16 +4,17 @@ This table shows data for IAM Openid Connect Identity Providers. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetOpenIDConnectProvider.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |client_id_list|`list`| |create_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_iam_password_policies.md b/plugins/source/aws/docs/tables/aws_iam_password_policies.md index c3f3fcfe95d59f..3ae683c20efa93 100644 --- a/plugins/source/aws/docs/tables/aws_iam_password_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_password_policies.md @@ -4,15 +4,16 @@ This table shows data for IAM Password Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_PasswordPolicy.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |allow_users_to_change_password|`bool`| |expire_passwords|`bool`| |hard_expiry|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_iam_policies.md b/plugins/source/aws/docs/tables/aws_iam_policies.md index c225f3d43c4c4b..19666e466e60c5 100644 --- a/plugins/source/aws/docs/tables/aws_iam_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ManagedPolicyDetail.html -The composite primary key for this table is (**account_id**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Relations The following tables depend on aws_iam_policies: @@ -16,10 +16,10 @@ The following tables depend on aws_iam_policies: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|id|`utf8`| |tags|`json`| |arn|`utf8`| |attachment_count|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_iam_policy_last_accessed_details.md b/plugins/source/aws/docs/tables/aws_iam_policy_last_accessed_details.md index 51778e3cb1f925..58d2cc29b4f0c9 100644 --- a/plugins/source/aws/docs/tables/aws_iam_policy_last_accessed_details.md +++ b/plugins/source/aws/docs/tables/aws_iam_policy_last_accessed_details.md @@ -4,8 +4,8 @@ This table shows data for IAM Policy Last Accessed Details. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html -The composite primary key for this table is (**account_id**, **arn**, **service_namespace**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**, **service_namespace**). ## Relations This table depends on [aws_iam_policies](aws_iam_policies.md). @@ -14,13 +14,13 @@ This table depends on [aws_iam_policies](aws_iam_policies.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|arn|`utf8`| |job_id|`utf8`| |service_name|`utf8`| -|service_namespace (PK)|`utf8`| +|service_namespace|`utf8`| |last_authenticated|`timestamp[us, tz=UTC]`| |last_authenticated_entity|`utf8`| |last_authenticated_region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_policy_versions.md b/plugins/source/aws/docs/tables/aws_iam_policy_versions.md index 2b59d4643d6433..96d8b0fef3994b 100644 --- a/plugins/source/aws/docs/tables/aws_iam_policy_versions.md +++ b/plugins/source/aws/docs/tables/aws_iam_policy_versions.md @@ -4,8 +4,8 @@ This table shows data for IAM Policy Versions. https://docs.aws.amazon.com/IAM/latest/APIReference/API_PolicyVersion.html -The composite primary key for this table is (**account_id**, **policy_arn**, **version_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **policy_arn**, **version_id**). ## Relations This table depends on [aws_iam_policies](aws_iam_policies.md). @@ -14,12 +14,12 @@ This table depends on [aws_iam_policies](aws_iam_policies.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|policy_arn (PK)|`utf8`| +|account_id|`utf8`| +|policy_arn|`utf8`| |document_json|`json`| |create_date|`timestamp[us, tz=UTC]`| |document|`utf8`| |is_default_version|`bool`| -|version_id (PK)|`utf8`| \ No newline at end of file +|version_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_role_attached_policies.md b/plugins/source/aws/docs/tables/aws_iam_role_attached_policies.md index df2c38d9aa92df..d5d7386755336b 100644 --- a/plugins/source/aws/docs/tables/aws_iam_role_attached_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_role_attached_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM Role Attached Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html -The composite primary key for this table is (**account_id**, **role_arn**, **policy_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **role_arn**, **policy_arn**). ## Relations This table depends on [aws_iam_roles](aws_iam_roles.md). @@ -14,9 +14,9 @@ This table depends on [aws_iam_roles](aws_iam_roles.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|role_arn (PK)|`utf8`| -|policy_arn (PK)|`utf8`| +|account_id|`utf8`| +|role_arn|`utf8`| +|policy_arn|`utf8`| |policy_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_role_last_accessed_details.md b/plugins/source/aws/docs/tables/aws_iam_role_last_accessed_details.md index 2b69b6f57d963f..5045fa0bc6427f 100644 --- a/plugins/source/aws/docs/tables/aws_iam_role_last_accessed_details.md +++ b/plugins/source/aws/docs/tables/aws_iam_role_last_accessed_details.md @@ -4,8 +4,8 @@ This table shows data for IAM Role Last Accessed Details. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html -The composite primary key for this table is (**account_id**, **role_arn**, **service_namespace**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **role_arn**, **service_namespace**). ## Relations This table depends on [aws_iam_roles](aws_iam_roles.md). @@ -14,13 +14,13 @@ This table depends on [aws_iam_roles](aws_iam_roles.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|role_arn (PK)|`utf8`| +|account_id|`utf8`| +|role_arn|`utf8`| |job_id|`utf8`| |service_name|`utf8`| -|service_namespace (PK)|`utf8`| +|service_namespace|`utf8`| |last_authenticated|`timestamp[us, tz=UTC]`| |last_authenticated_entity|`utf8`| |last_authenticated_region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_role_policies.md b/plugins/source/aws/docs/tables/aws_iam_role_policies.md index c0772a82f94256..44f4f06360ed80 100644 --- a/plugins/source/aws/docs/tables/aws_iam_role_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_role_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM Role Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetRolePolicy.html -The composite primary key for this table is (**account_id**, **role_arn**, **policy_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **role_arn**, **policy_name**). ## Relations This table depends on [aws_iam_roles](aws_iam_roles.md). @@ -14,10 +14,10 @@ This table depends on [aws_iam_roles](aws_iam_roles.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|role_arn (PK)|`utf8`| +|account_id|`utf8`| +|role_arn|`utf8`| |policy_document|`json`| -|policy_name (PK)|`utf8`| +|policy_name|`utf8`| |role_name|`utf8`| \ 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 a37d559b9cdceb..021f9cca05cdeb 100644 --- a/plugins/source/aws/docs/tables/aws_iam_roles.md +++ b/plugins/source/aws/docs/tables/aws_iam_roles.md @@ -4,8 +4,8 @@ This table shows data for IAM Roles. https://docs.aws.amazon.com/IAM/latest/APIReference/API_Role.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_iam_roles: @@ -17,12 +17,12 @@ The following tables depend on aws_iam_roles: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |assume_role_policy_document|`json`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |path|`utf8`| |role_id|`utf8`| 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 9a1d15300261fe..486f693de1fd72 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 @@ -4,16 +4,17 @@ This table shows data for IAM Saml Identity Providers. https://docs.aws.amazon.com/IAM/latest/APIReference/API_SAMLProviderListEntry.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |saml_metadata_document|`utf8`| |tags|`json`| 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 cc4a1a931d4c87..f901ddc0e9ddcc 100644 --- a/plugins/source/aws/docs/tables/aws_iam_server_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iam_server_certificates.md @@ -4,16 +4,17 @@ This table shows data for IAM Server Certificates. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServerCertificateMetadata.html -The composite primary key for this table is (**account_id**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|id|`utf8`| |arn|`utf8`| |path|`utf8`| |server_certificate_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_signing_certificates.md b/plugins/source/aws/docs/tables/aws_iam_signing_certificates.md index 85e1d8febe60b3..ba61b76caed338 100644 --- a/plugins/source/aws/docs/tables/aws_iam_signing_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iam_signing_certificates.md @@ -4,8 +4,8 @@ This table shows data for IAM Signing Certificates. https://docs.aws.amazon.com/IAM/latest/APIReference/API_SigningCertificate.html -The composite primary key for this table is (**account_id**, **user_arn**, **certificate_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **certificate_id**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,13 +14,13 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| |user_id|`utf8`| |certificate_body|`utf8`| -|certificate_id (PK)|`utf8`| +|certificate_id|`utf8`| |status|`utf8`| |user_name|`utf8`| |upload_date|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_ssh_public_keys.md b/plugins/source/aws/docs/tables/aws_iam_ssh_public_keys.md index 4b69d0cb8f0dd8..e0e1d2a793b052 100644 --- a/plugins/source/aws/docs/tables/aws_iam_ssh_public_keys.md +++ b/plugins/source/aws/docs/tables/aws_iam_ssh_public_keys.md @@ -4,8 +4,8 @@ This table shows data for IAM SSH Public Keys. https://docs.aws.amazon.com/IAM/latest/APIReference/API_SSHPublicKeyMetadata.html -The composite primary key for this table is (**account_id**, **user_arn**, **ssh_public_key_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **ssh_public_key_id**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,12 +14,12 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| |user_id|`utf8`| -|ssh_public_key_id (PK)|`utf8`| +|ssh_public_key_id|`utf8`| |status|`utf8`| |upload_date|`timestamp[us, tz=UTC]`| |user_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_user_access_keys.md b/plugins/source/aws/docs/tables/aws_iam_user_access_keys.md index 3e6ba221d6726f..dfe59db99b8c3b 100644 --- a/plugins/source/aws/docs/tables/aws_iam_user_access_keys.md +++ b/plugins/source/aws/docs/tables/aws_iam_user_access_keys.md @@ -4,8 +4,8 @@ This table shows data for IAM User Access Keys. https://docs.aws.amazon.com/IAM/latest/APIReference/API_AccessKeyMetadata.html -The composite primary key for this table is (**account_id**, **user_arn**, **access_key_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **access_key_id**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,11 +14,11 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| -|access_key_id (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| +|access_key_id|`utf8`| |user_id|`utf8`| |last_used|`timestamp[us, tz=UTC]`| |last_used_service_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_user_attached_policies.md b/plugins/source/aws/docs/tables/aws_iam_user_attached_policies.md index c5ffb9bb4e00be..87d5eb329163f7 100644 --- a/plugins/source/aws/docs/tables/aws_iam_user_attached_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_user_attached_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM User Attached Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html -The composite primary key for this table is (**account_id**, **user_arn**, **policy_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **policy_name**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,10 +14,10 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| -|policy_name (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| +|policy_name|`utf8`| |user_id|`utf8`| |policy_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iam_user_groups.md b/plugins/source/aws/docs/tables/aws_iam_user_groups.md index eedce06cd82564..455db9764cf280 100644 --- a/plugins/source/aws/docs/tables/aws_iam_user_groups.md +++ b/plugins/source/aws/docs/tables/aws_iam_user_groups.md @@ -4,8 +4,8 @@ This table shows data for IAM User Groups. https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html -The composite primary key for this table is (**account_id**, **user_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **arn**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,12 +14,12 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| |user_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |group_id|`utf8`| |group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_user_last_accessed_details.md b/plugins/source/aws/docs/tables/aws_iam_user_last_accessed_details.md index b7a2fe4ec33d11..5cecfbe0cf0b34 100644 --- a/plugins/source/aws/docs/tables/aws_iam_user_last_accessed_details.md +++ b/plugins/source/aws/docs/tables/aws_iam_user_last_accessed_details.md @@ -4,8 +4,8 @@ This table shows data for IAM User Last Accessed Details. https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html -The composite primary key for this table is (**account_id**, **user_arn**, **service_namespace**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **service_namespace**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,13 +14,13 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| |job_id|`utf8`| |service_name|`utf8`| -|service_namespace (PK)|`utf8`| +|service_namespace|`utf8`| |last_authenticated|`timestamp[us, tz=UTC]`| |last_authenticated_entity|`utf8`| |last_authenticated_region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iam_user_policies.md b/plugins/source/aws/docs/tables/aws_iam_user_policies.md index 66f5f7712a3172..0cd8411683afb6 100644 --- a/plugins/source/aws/docs/tables/aws_iam_user_policies.md +++ b/plugins/source/aws/docs/tables/aws_iam_user_policies.md @@ -4,8 +4,8 @@ This table shows data for IAM User Policies. https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetUserPolicy.html -The composite primary key for this table is (**account_id**, **user_arn**, **policy_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **user_arn**, **policy_name**). ## Relations This table depends on [aws_iam_users](aws_iam_users.md). @@ -14,11 +14,11 @@ This table depends on [aws_iam_users](aws_iam_users.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|user_arn (PK)|`utf8`| +|account_id|`utf8`| +|user_arn|`utf8`| |user_id|`utf8`| |policy_document|`json`| -|policy_name (PK)|`utf8`| +|policy_name|`utf8`| |user_name|`utf8`| \ 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 617c4ebdd52163..7edf4a6488df12 100644 --- a/plugins/source/aws/docs/tables/aws_iam_users.md +++ b/plugins/source/aws/docs/tables/aws_iam_users.md @@ -4,8 +4,8 @@ This table shows data for IAM Users. https://docs.aws.amazon.com/IAM/latest/APIReference/API_User.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_iam_users: @@ -22,10 +22,10 @@ The following tables depend on aws_iam_users: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|arn|`utf8`| |tags|`json`| |create_date|`timestamp[us, tz=UTC]`| |path|`utf8`| 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 71b3afbcf32709..9a0390358b630d 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 @@ -4,16 +4,17 @@ This table shows data for IAM Virtual MFA Devices. https://docs.aws.amazon.com/IAM/latest/APIReference/API_VirtualMFADevice.html -The primary key for this table is **serial_number**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **serial_number**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|serial_number (PK)|`utf8`| +|serial_number|`utf8`| |tags|`json`| |base32_string_seed|`binary`| |enable_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_identitystore_group_memberships.md b/plugins/source/aws/docs/tables/aws_identitystore_group_memberships.md index e7c3b5539b5adf..00990aa57162bf 100644 --- a/plugins/source/aws/docs/tables/aws_identitystore_group_memberships.md +++ b/plugins/source/aws/docs/tables/aws_identitystore_group_memberships.md @@ -4,8 +4,8 @@ This table shows data for Identity Store Group Memberships. https://docs.aws.amazon.com/singlesignon/latest/IdentityStoreAPIReference/API_GroupMembership.html -The composite primary key for this table is (**request_account_id**, **request_region**, **group_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **group_arn**, **arn**). ## Relations This table depends on [aws_identitystore_groups](aws_identitystore_groups.md). @@ -14,12 +14,12 @@ This table depends on [aws_identitystore_groups](aws_identitystore_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|group_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|group_arn|`utf8`| +|arn|`utf8`| |member_id|`utf8`| |identity_store_id|`utf8`| |group_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_identitystore_groups.md b/plugins/source/aws/docs/tables/aws_identitystore_groups.md index 1923577cd77ea4..055b735ce8c1f7 100644 --- a/plugins/source/aws/docs/tables/aws_identitystore_groups.md +++ b/plugins/source/aws/docs/tables/aws_identitystore_groups.md @@ -4,8 +4,8 @@ This table shows data for Identity Store Groups. https://docs.aws.amazon.com/singlesignon/latest/IdentityStoreAPIReference/API_Group.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Relations The following tables depend on aws_identitystore_groups: @@ -15,11 +15,11 @@ The following tables depend on aws_identitystore_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |group_id|`utf8`| |identity_store_id|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_identitystore_users.md b/plugins/source/aws/docs/tables/aws_identitystore_users.md index e7eb098c8b319d..abb0f71362c628 100644 --- a/plugins/source/aws/docs/tables/aws_identitystore_users.md +++ b/plugins/source/aws/docs/tables/aws_identitystore_users.md @@ -4,17 +4,18 @@ This table shows data for Identity Store Users. https://docs.aws.amazon.com/singlesignon/latest/IdentityStoreAPIReference/API_User.html -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |identity_store_id|`utf8`| |user_id|`utf8`| |addresses|`json`| diff --git a/plugins/source/aws/docs/tables/aws_inspector2_covered_resources.md b/plugins/source/aws/docs/tables/aws_inspector2_covered_resources.md index 48864cbc4e743b..9a94fc83ed09d3 100644 --- a/plugins/source/aws/docs/tables/aws_inspector2_covered_resources.md +++ b/plugins/source/aws/docs/tables/aws_inspector2_covered_resources.md @@ -6,18 +6,19 @@ https://docs.aws.amazon.com/inspector/v2/APIReference/API_CoveredResource.html The `request_account_id` and `request_region` columns are added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **request_region**, **account_id**, **resource_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **account_id**, **resource_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|account_id (PK)|`utf8`| -|resource_id (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|account_id|`utf8`| +|resource_id|`utf8`| |resource_type|`utf8`| |scan_type|`utf8`| |last_scanned_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_inspector2_findings.md b/plugins/source/aws/docs/tables/aws_inspector2_findings.md index b03d2b2a9d953d..af7f71f3b2e195 100644 --- a/plugins/source/aws/docs/tables/aws_inspector2_findings.md +++ b/plugins/source/aws/docs/tables/aws_inspector2_findings.md @@ -6,17 +6,18 @@ https://docs.aws.amazon.com/inspector/v2/APIReference/API_Finding.html The `request_account_id` and `request_region` columns are added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **request_region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |aws_account_id|`utf8`| |description|`utf8`| |finding_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_inspector_findings.md b/plugins/source/aws/docs/tables/aws_inspector_findings.md index 8bca7c97a3b8ce..0c2544ca5eb57a 100644 --- a/plugins/source/aws/docs/tables/aws_inspector_findings.md +++ b/plugins/source/aws/docs/tables/aws_inspector_findings.md @@ -4,17 +4,18 @@ This table shows data for Inspector Findings. https://docs.aws.amazon.com/inspector/v1/APIReference/API_Finding.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |attributes|`json`| |user_attributes|`json`| |created_at|`timestamp[us, tz=UTC]`| 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 61e9cfc6d1c4af..c0971043bc484e 100644 --- a/plugins/source/aws/docs/tables/aws_iot_billing_groups.md +++ b/plugins/source/aws/docs/tables/aws_iot_billing_groups.md @@ -4,19 +4,20 @@ This table shows data for AWS IoT Billing Groups. https://docs.aws.amazon.com/iot/latest/apireference/API_DescribeBillingGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |things_in_group|`list`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |billing_group_arn|`utf8`| |billing_group_id|`utf8`| |billing_group_metadata|`json`| 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 d7ae16d9c02906..b9c974631d13f4 100644 --- a/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iot_ca_certificates.md @@ -4,18 +4,19 @@ This table shows data for AWS IoT CA Certificates. https://docs.aws.amazon.com/iot/latest/apireference/API_CACertificateDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |certificates|`list`| -|arn (PK)|`utf8`| +|arn|`utf8`| |auto_registration_status|`utf8`| |certificate_arn|`utf8`| |certificate_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iot_certificates.md b/plugins/source/aws/docs/tables/aws_iot_certificates.md index 39ebd0e7feb7e3..b960fb05035ea9 100644 --- a/plugins/source/aws/docs/tables/aws_iot_certificates.md +++ b/plugins/source/aws/docs/tables/aws_iot_certificates.md @@ -4,18 +4,19 @@ This table shows data for AWS IoT Certificates. https://docs.aws.amazon.com/iot/latest/apireference/API_CertificateDescription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |policies|`list`| -|arn (PK)|`utf8`| +|arn|`utf8`| |ca_certificate_id|`utf8`| |certificate_arn|`utf8`| |certificate_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iot_jobs.md b/plugins/source/aws/docs/tables/aws_iot_jobs.md index 73c4f8abeba6f0..6c6d3c8cf24c69 100644 --- a/plugins/source/aws/docs/tables/aws_iot_jobs.md +++ b/plugins/source/aws/docs/tables/aws_iot_jobs.md @@ -4,18 +4,19 @@ This table shows data for AWS IoT Jobs. https://docs.aws.amazon.com/iot/latest/apireference/API_Job.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |abort_config|`json`| |comment|`utf8`| |completed_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_iot_policies.md b/plugins/source/aws/docs/tables/aws_iot_policies.md index 11eb94de493327..8af31936938f16 100644 --- a/plugins/source/aws/docs/tables/aws_iot_policies.md +++ b/plugins/source/aws/docs/tables/aws_iot_policies.md @@ -4,17 +4,18 @@ This table shows data for AWS IoT Policies. https://docs.aws.amazon.com/iot/latest/apireference/API_Policy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |policy_arn|`utf8`| |policy_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_iot_security_profiles.md b/plugins/source/aws/docs/tables/aws_iot_security_profiles.md index 40bdd2062c8e59..f4875b4392666e 100644 --- a/plugins/source/aws/docs/tables/aws_iot_security_profiles.md +++ b/plugins/source/aws/docs/tables/aws_iot_security_profiles.md @@ -4,19 +4,20 @@ This table shows data for AWS IoT Security Profiles. https://docs.aws.amazon.com/iot/latest/apireference/API_DescribeSecurityProfile.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |targets|`list`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |additional_metrics_to_retain|`list`| |additional_metrics_to_retain_v2|`json`| |alert_targets|`json`| diff --git a/plugins/source/aws/docs/tables/aws_iot_streams.md b/plugins/source/aws/docs/tables/aws_iot_streams.md index b735f5415a83f6..95457fb28da5f2 100644 --- a/plugins/source/aws/docs/tables/aws_iot_streams.md +++ b/plugins/source/aws/docs/tables/aws_iot_streams.md @@ -4,17 +4,18 @@ This table shows data for AWS IoT Streams. https://docs.aws.amazon.com/iot/latest/apireference/API_StreamInfo.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |description|`utf8`| |files|`json`| 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 50a35789e71c0e..ea7589d06c2530 100644 --- a/plugins/source/aws/docs/tables/aws_iot_thing_groups.md +++ b/plugins/source/aws/docs/tables/aws_iot_thing_groups.md @@ -4,20 +4,21 @@ This table shows data for AWS IoT Thing Groups. https://docs.aws.amazon.com/iot/latest/apireference/API_DescribeThingGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |things_in_group|`list`| |policies|`list`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |index_name|`utf8`| |query_string|`utf8`| |query_version|`utf8`| 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 5cbd09a1e6a74f..6a4fe2a39ecdff 100644 --- a/plugins/source/aws/docs/tables/aws_iot_thing_types.md +++ b/plugins/source/aws/docs/tables/aws_iot_thing_types.md @@ -4,18 +4,19 @@ This table shows data for AWS IoT Thing Types. https://docs.aws.amazon.com/iot/latest/apireference/API_ThingTypeDefinition.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |thing_type_arn|`utf8`| |thing_type_metadata|`json`| |thing_type_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_iot_things.md b/plugins/source/aws/docs/tables/aws_iot_things.md index 6e65e2aa8e3d83..f1d1d7ec00105a 100644 --- a/plugins/source/aws/docs/tables/aws_iot_things.md +++ b/plugins/source/aws/docs/tables/aws_iot_things.md @@ -4,18 +4,19 @@ This table shows data for AWS IoT Things. https://docs.aws.amazon.com/iot/latest/apireference/API_ThingAttribute.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |principals|`list`| -|arn (PK)|`utf8`| +|arn|`utf8`| |attributes|`json`| |thing_arn|`utf8`| |thing_name|`utf8`| 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 35ece480f3e30a..ba39c19ae347b3 100644 --- a/plugins/source/aws/docs/tables/aws_iot_topic_rules.md +++ b/plugins/source/aws/docs/tables/aws_iot_topic_rules.md @@ -4,17 +4,18 @@ This table shows data for AWS IoT Topic Rules. https://docs.aws.amazon.com/iot/latest/apireference/API_GetTopicRule.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |rule|`json`| |rule_arn|`utf8`| \ 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 9b9dbb2a6fb54b..060a2a56d837c2 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md +++ b/plugins/source/aws/docs/tables/aws_kafka_cluster_operations.md @@ -4,8 +4,8 @@ This table shows data for Kafka Cluster Operations. https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-operations.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). @@ -14,10 +14,10 @@ This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cluster_arn|`utf8`| |tags|`json`| |client_request_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_kafka_clusters.md b/plugins/source/aws/docs/tables/aws_kafka_clusters.md index 5599d022d0854c..31940a2d46a782 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_clusters.md +++ b/plugins/source/aws/docs/tables/aws_kafka_clusters.md @@ -4,8 +4,8 @@ This table shows data for Kafka Clusters. https://docs.aws.amazon.com/MSK/2.0/APIReference/v2-clusters-clusterarn.html#v2-clusters-clusterarn-properties -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_kafka_clusters: @@ -16,10 +16,10 @@ The following tables depend on aws_kafka_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |active_operation_arn|`utf8`| |cluster_arn|`utf8`| |cluster_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_kafka_configurations.md b/plugins/source/aws/docs/tables/aws_kafka_configurations.md index d17ee3ffbd608d..03564997b950f7 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_configurations.md +++ b/plugins/source/aws/docs/tables/aws_kafka_configurations.md @@ -4,16 +4,17 @@ This table shows data for Kafka Configurations. https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-configuration.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |description|`utf8`| |kafka_versions|`list`| diff --git a/plugins/source/aws/docs/tables/aws_kafka_nodes.md b/plugins/source/aws/docs/tables/aws_kafka_nodes.md index 8100b98811b2f8..e36861cff55e84 100644 --- a/plugins/source/aws/docs/tables/aws_kafka_nodes.md +++ b/plugins/source/aws/docs/tables/aws_kafka_nodes.md @@ -4,8 +4,8 @@ This table shows data for Kafka Nodes. https://docs.aws.amazon.com/msk/1.0/apireference/clusters-clusterarn-nodes.html#ListNodes -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). @@ -14,10 +14,10 @@ This table depends on [aws_kafka_clusters](aws_kafka_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cluster_arn|`utf8`| |added_to_cluster_time|`utf8`| |broker_node_info|`json`| diff --git a/plugins/source/aws/docs/tables/aws_kinesis_streams.md b/plugins/source/aws/docs/tables/aws_kinesis_streams.md index fb1a1c546b3b46..d8bd3efd34d33c 100644 --- a/plugins/source/aws/docs/tables/aws_kinesis_streams.md +++ b/plugins/source/aws/docs/tables/aws_kinesis_streams.md @@ -4,17 +4,18 @@ This table shows data for Kinesis Streams. https://docs.aws.amazon.com/kinesis/latest/APIReference/API_StreamDescriptionSummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |enhanced_monitoring|`json`| |open_shard_count|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_kms_aliases.md b/plugins/source/aws/docs/tables/aws_kms_aliases.md index 6bff21bd5d9fab..1db01a4da95d43 100644 --- a/plugins/source/aws/docs/tables/aws_kms_aliases.md +++ b/plugins/source/aws/docs/tables/aws_kms_aliases.md @@ -4,17 +4,18 @@ This table shows data for AWS Key Management Service (AWS KMS) Aliases. https://docs.aws.amazon.com/kms/latest/APIReference/API_AliasListEntry.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |alias_arn|`utf8`| |alias_name|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_kms_key_grants.md b/plugins/source/aws/docs/tables/aws_kms_key_grants.md index 5613d4ca4cb9d4..7a101755976c39 100644 --- a/plugins/source/aws/docs/tables/aws_kms_key_grants.md +++ b/plugins/source/aws/docs/tables/aws_kms_key_grants.md @@ -4,8 +4,8 @@ This table shows data for AWS Key Management Service (AWS KMS) Key Grants. https://docs.aws.amazon.com/kms/latest/APIReference/API_GrantListEntry.html -The composite primary key for this table is (**key_arn**, **grant_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**key_arn**, **grant_id**). ## Relations This table depends on [aws_kms_keys](aws_kms_keys.md). @@ -14,12 +14,12 @@ This table depends on [aws_kms_keys](aws_kms_keys.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|key_arn (PK)|`utf8`| -|grant_id (PK)|`utf8`| +|key_arn|`utf8`| +|grant_id|`utf8`| |constraints|`json`| |creation_date|`timestamp[us, tz=UTC]`| |grantee_principal|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_kms_key_policies.md b/plugins/source/aws/docs/tables/aws_kms_key_policies.md index 7686e3157b042f..4dda22ed3665d7 100644 --- a/plugins/source/aws/docs/tables/aws_kms_key_policies.md +++ b/plugins/source/aws/docs/tables/aws_kms_key_policies.md @@ -4,8 +4,8 @@ This table shows data for AWS Key Management Service (AWS KMS) Key Policies. https://docs.aws.amazon.com/kms/latest/APIReference/API_GetKeyPolicy.html -The composite primary key for this table is (**key_arn**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**key_arn**, **name**). ## Relations This table depends on [aws_kms_keys](aws_kms_keys.md). @@ -14,10 +14,10 @@ This table depends on [aws_kms_keys](aws_kms_keys.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|key_arn (PK)|`utf8`| -|name (PK)|`utf8`| +|key_arn|`utf8`| +|name|`utf8`| |policy|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_kms_keys.md b/plugins/source/aws/docs/tables/aws_kms_keys.md index c87cb8f82c4af2..2c8435e0e60c91 100644 --- a/plugins/source/aws/docs/tables/aws_kms_keys.md +++ b/plugins/source/aws/docs/tables/aws_kms_keys.md @@ -4,8 +4,8 @@ This table shows data for AWS Key Management Service (AWS KMS) Keys. https://docs.aws.amazon.com/kms/latest/APIReference/API_KeyMetadata.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_kms_keys: @@ -16,13 +16,13 @@ The following tables depend on aws_kms_keys: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |rotation_enabled|`bool`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |replica_keys|`json`| |key_id|`utf8`| |aws_account_id|`utf8`| 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 a28dd2975eafd3..6067d743ba8d2f 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_aliases.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function Aliases. https://docs.aws.amazon.com/lambda/latest/dg/API_AliasConfiguration.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,12 +14,12 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |function_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |alias_arn|`utf8`| |description|`utf8`| |function_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_concurrency_configs.md b/plugins/source/aws/docs/tables/aws_lambda_function_concurrency_configs.md index 2a93ce6192a370..2bbf3a807b1353 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_concurrency_configs.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_concurrency_configs.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function Concurrency Configs. https://docs.aws.amazon.com/lambda/latest/dg/API_ProvisionedConcurrencyConfigListItem.html -The primary key for this table is **function_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **function_arn**. ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,13 +14,13 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |allocated_provisioned_concurrent_executions|`int64`| |available_provisioned_concurrent_executions|`int64`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |last_modified|`utf8`| |requested_provisioned_concurrent_executions|`int64`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_event_invoke_configs.md b/plugins/source/aws/docs/tables/aws_lambda_function_event_invoke_configs.md index d54b58c77a34d2..ebbfeb49693046 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_event_invoke_configs.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_event_invoke_configs.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function Event Invoke Configs. https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionEventInvokeConfig.html -The primary key for this table is **function_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **function_arn**. ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,12 +14,12 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |destination_config|`json`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |last_modified|`timestamp[us, tz=UTC]`| |maximum_event_age_in_seconds|`int64`| |maximum_retry_attempts|`int64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_event_source_mappings.md b/plugins/source/aws/docs/tables/aws_lambda_function_event_source_mappings.md index 28198aeb93a2a0..c42c26c2472d11 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_event_source_mappings.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_event_source_mappings.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function Event Source Mappings. https://docs.aws.amazon.com/lambda/latest/dg/API_EventSourceMappingConfiguration.html -The composite primary key for this table is (**uuid**, **event_source_arn**, **function_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**uuid**, **event_source_arn**, **function_arn**). ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,19 +14,19 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|uuid (PK)|`uuid`| +|uuid|`uuid`| |amazon_managed_kafka_event_source_config|`json`| |batch_size|`int64`| |bisect_batch_on_function_error|`bool`| |destination_config|`json`| |document_db_event_source_config|`json`| -|event_source_arn (PK)|`utf8`| +|event_source_arn|`utf8`| |filter_criteria|`json`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |function_response_types|`list`| |last_modified|`timestamp[us, tz=UTC]`| |last_processing_result|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_url_configs.md b/plugins/source/aws/docs/tables/aws_lambda_function_url_configs.md index 336e08c5106e5c..48248074bcef74 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_url_configs.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_url_configs.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function URL Configs. https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionUrlConfig.html -The primary key for this table is **function_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **function_arn**. ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,13 +14,13 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |auth_type|`utf8`| |creation_time|`utf8`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |function_url|`utf8`| |last_modified_time|`utf8`| |cors|`json`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_function_versions.md b/plugins/source/aws/docs/tables/aws_lambda_function_versions.md index e60522382969d3..34268abb994eaf 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_function_versions.md +++ b/plugins/source/aws/docs/tables/aws_lambda_function_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Function Versions. https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionConfiguration.html -The composite primary key for this table is (**function_arn**, **version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**function_arn**, **version**). ## Relations This table depends on [aws_lambda_functions](aws_lambda_functions.md). @@ -14,11 +14,11 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|function_arn (PK)|`utf8`| +|function_arn|`utf8`| |architectures|`list`| |code_sha256|`utf8`| |code_size|`int64`| @@ -52,5 +52,5 @@ This table depends on [aws_lambda_functions](aws_lambda_functions.md). |state_reason_code|`utf8`| |timeout|`int64`| |tracing_config|`json`| -|version (PK)|`utf8`| +|version|`utf8`| |vpc_config|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lambda_functions.md b/plugins/source/aws/docs/tables/aws_lambda_functions.md index 92c42a23aa27eb..9e987f81a18563 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_functions.md +++ b/plugins/source/aws/docs/tables/aws_lambda_functions.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Functions. https://docs.aws.amazon.com/lambda/latest/dg/API_GetFunction.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lambda_functions: @@ -20,11 +20,11 @@ The following tables depend on aws_lambda_functions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |policy_revision_id|`utf8`| |policy_document|`json`| |code_signing_config|`json`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_layer_version_policies.md b/plugins/source/aws/docs/tables/aws_lambda_layer_version_policies.md index 1b46d529286dd2..d0d12398ed84f6 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_layer_version_policies.md +++ b/plugins/source/aws/docs/tables/aws_lambda_layer_version_policies.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Layer Version Policies. https://docs.aws.amazon.com/lambda/latest/dg/API_GetLayerVersionPolicy.html -The composite primary key for this table is (**layer_version_arn**, **revision_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**layer_version_arn**, **revision_id**). ## Relations This table depends on [aws_lambda_layer_versions](aws_lambda_layer_versions.md). @@ -14,11 +14,11 @@ This table depends on [aws_lambda_layer_versions](aws_lambda_layer_versions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|layer_version_arn (PK)|`utf8`| +|layer_version_arn|`utf8`| |layer_version|`int64`| |policy|`utf8`| -|revision_id (PK)|`utf8`| \ No newline at end of file +|revision_id|`utf8`| \ No newline at end of file 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 1f1e4482bb3782..78413f08a664e0 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md +++ b/plugins/source/aws/docs/tables/aws_lambda_layer_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Layer Versions. https://docs.aws.amazon.com/lambda/latest/dg/API_LayerVersionsListItem.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_lambda_layers](aws_lambda_layers.md). @@ -17,11 +17,11 @@ The following tables depend on aws_lambda_layer_versions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |layer_arn|`utf8`| |compatible_architectures|`list`| |compatible_runtimes|`list`| diff --git a/plugins/source/aws/docs/tables/aws_lambda_layers.md b/plugins/source/aws/docs/tables/aws_lambda_layers.md index 519098e534fe5e..5c1321eda3257a 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_layers.md +++ b/plugins/source/aws/docs/tables/aws_lambda_layers.md @@ -4,8 +4,8 @@ This table shows data for AWS Lambda Layers. https://docs.aws.amazon.com/lambda/latest/dg/API_LayersListItem.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lambda_layers: @@ -15,11 +15,11 @@ The following tables depend on aws_lambda_layers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |latest_matching_version|`json`| |layer_arn|`utf8`| |layer_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lambda_runtimes.md b/plugins/source/aws/docs/tables/aws_lambda_runtimes.md index b61c8bdd4055e8..c7a6140711f8b0 100644 --- a/plugins/source/aws/docs/tables/aws_lambda_runtimes.md +++ b/plugins/source/aws/docs/tables/aws_lambda_runtimes.md @@ -4,12 +4,13 @@ This table shows data for AWS Lambda Runtimes. https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html -The primary key for this table is **name**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **name**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|name (PK)|`utf8`| \ No newline at end of file +|name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_alarms.md b/plugins/source/aws/docs/tables/aws_lightsail_alarms.md index e4b2b053b1d706..ac46518f2038cb 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_alarms.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_alarms.md @@ -4,17 +4,18 @@ This table shows data for Lightsail Alarms. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Alarm.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |comparison_operator|`utf8`| |contact_protocols|`list`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_bucket_access_keys.md b/plugins/source/aws/docs/tables/aws_lightsail_bucket_access_keys.md index b3e1ddd8d03ae7..c1530977a39bc8 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_bucket_access_keys.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_bucket_access_keys.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Bucket Access Keys. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_AccessKey.html -The composite primary key for this table is (**bucket_arn**, **access_key_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**bucket_arn**, **access_key_id**). ## Relations This table depends on [aws_lightsail_buckets](aws_lightsail_buckets.md). @@ -14,12 +14,12 @@ This table depends on [aws_lightsail_buckets](aws_lightsail_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|bucket_arn (PK)|`utf8`| -|access_key_id (PK)|`utf8`| +|bucket_arn|`utf8`| +|access_key_id|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |last_used|`json`| |secret_access_key|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_buckets.md b/plugins/source/aws/docs/tables/aws_lightsail_buckets.md index 9f96f0367ee795..00967511173618 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_buckets.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_buckets.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Buckets. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Bucket.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_buckets: @@ -15,7 +15,7 @@ The following tables depend on aws_lightsail_buckets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| @@ -23,7 +23,7 @@ The following tables depend on aws_lightsail_buckets: |tags|`json`| |access_log_config|`json`| |access_rules|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |bundle_id|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |location|`json`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_certificates.md b/plugins/source/aws/docs/tables/aws_lightsail_certificates.md index 1f1eed63a33c50..3e088e3b4fc8e2 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_certificates.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_certificates.md @@ -4,18 +4,19 @@ This table shows data for Lightsail Certificates. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Certificate.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |domain_name|`utf8`| |domain_validation_records|`json`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_container_service_deployments.md b/plugins/source/aws/docs/tables/aws_lightsail_container_service_deployments.md index 852ccac417bc12..fd1776be8f2b86 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_container_service_deployments.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_container_service_deployments.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Container Service Deployments. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerServiceDeployment.html -The composite primary key for this table is (**container_service_arn**, **version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**container_service_arn**, **version**). ## Relations This table depends on [aws_lightsail_container_services](aws_lightsail_container_services.md). @@ -14,13 +14,13 @@ This table depends on [aws_lightsail_container_services](aws_lightsail_container | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|container_service_arn (PK)|`utf8`| +|container_service_arn|`utf8`| |containers|`json`| |created_at|`timestamp[us, tz=UTC]`| |public_endpoint|`json`| |state|`utf8`| -|version (PK)|`int64`| \ No newline at end of file +|version|`int64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_container_service_images.md b/plugins/source/aws/docs/tables/aws_lightsail_container_service_images.md index 2e928ce593f2f4..5bd3b5c9db45ac 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_container_service_images.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_container_service_images.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Container Service Images. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerImage.html -The composite primary key for this table is (**container_service_arn**, **image**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**container_service_arn**, **image**). ## Relations This table depends on [aws_lightsail_container_services](aws_lightsail_container_services.md). @@ -14,11 +14,11 @@ This table depends on [aws_lightsail_container_services](aws_lightsail_container | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|container_service_arn (PK)|`utf8`| +|container_service_arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |digest|`utf8`| -|image (PK)|`utf8`| \ No newline at end of file +|image|`utf8`| \ 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 62e3c998e7e107..718b837f977183 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_container_services.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_container_services.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Container Services. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerService.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_container_services: @@ -16,11 +16,11 @@ The following tables depend on aws_lightsail_container_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |container_service_name|`utf8`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_database_events.md b/plugins/source/aws/docs/tables/aws_lightsail_database_events.md index 2ce2d65f7d4f26..a6e2b29f43536b 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_database_events.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_database_events.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Database Events. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseEvent.html -The composite primary key for this table is (**database_arn**, **created_at**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**database_arn**, **created_at**). ## Relations This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). @@ -14,12 +14,12 @@ This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|database_arn (PK)|`utf8`| -|created_at (PK)|`timestamp[us, tz=UTC]`| +|database_arn|`utf8`| +|created_at|`timestamp[us, tz=UTC]`| |event_categories|`list`| |message|`utf8`| |resource|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_database_log_events.md b/plugins/source/aws/docs/tables/aws_lightsail_database_log_events.md index 4178aeb6710d31..047418437b0f97 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_database_log_events.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_database_log_events.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Database Log Events. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_GetRelationalDatabaseLogEvents.html -The composite primary key for this table is (**database_arn**, **created_at**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**database_arn**, **created_at**). ## Relations This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). @@ -14,11 +14,11 @@ This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|database_arn (PK)|`utf8`| -|created_at (PK)|`timestamp[us, tz=UTC]`| +|database_arn|`utf8`| +|created_at|`timestamp[us, tz=UTC]`| |message|`utf8`| |log_stream_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_lightsail_database_parameters.md b/plugins/source/aws/docs/tables/aws_lightsail_database_parameters.md index 4fe732cd0d7a64..23920e1bbe898d 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_database_parameters.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_database_parameters.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Database Parameters. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseParameter.html -The composite primary key for this table is (**database_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**database_arn**, **parameter_name**). ## Relations This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). @@ -14,16 +14,16 @@ This table depends on [aws_lightsail_databases](aws_lightsail_databases.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|database_arn (PK)|`utf8`| +|database_arn|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| |data_type|`utf8`| |description|`utf8`| |is_modifiable|`bool`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| \ 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 e3064ff0905f69..ecc14f7684b301 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_database_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Lightsail Database Snapshots. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseSnapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |engine|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_databases.md b/plugins/source/aws/docs/tables/aws_lightsail_databases.md index b465b8e7a5d7a8..2decaab50b5465 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_databases.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_databases.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Databases. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabase.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_databases: @@ -17,12 +17,12 @@ The following tables depend on aws_lightsail_databases: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |backup_retention_enabled|`bool`| |ca_certificate_identifier|`utf8`| |created_at|`timestamp[us, tz=UTC]`| 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 f3c26f47d1d12d..655227472c1c13 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_disk_snapshots.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Disk Snapshots. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_DiskSnapshot.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_lightsail_disks](aws_lightsail_disks.md). @@ -14,13 +14,13 @@ This table depends on [aws_lightsail_disks](aws_lightsail_disks.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |disk_arn|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |from_disk_arn|`utf8`| |from_disk_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_disks.md b/plugins/source/aws/docs/tables/aws_lightsail_disks.md index 4cfe47612cdd84..e94a25c39fd14e 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_disks.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_disks.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Disks. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Disk.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_disks: @@ -15,11 +15,11 @@ The following tables depend on aws_lightsail_disks: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |add_ons|`json`| |attached_to|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_distributions.md b/plugins/source/aws/docs/tables/aws_lightsail_distributions.md index 39c9b2fbfa1c60..a8de6c39c31493 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_distributions.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_distributions.md @@ -4,17 +4,18 @@ This table shows data for Lightsail Distributions. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_GetDistributions.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |able_to_update_bundle|`bool`| |alternative_domain_names|`list`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_instance_port_states.md b/plugins/source/aws/docs/tables/aws_lightsail_instance_port_states.md index 639b3658d1f8f0..c3a7c246dee5d0 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_instance_port_states.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_instance_port_states.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Instance Port States. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstancePortState.html -The composite primary key for this table is (**instance_arn**, **allow_list**, **from_port**, **protocol**, **to_port**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**instance_arn**, **allow_list**, **from_port**, **protocol**, **to_port**). ## Relations This table depends on [aws_lightsail_instances](aws_lightsail_instances.md). @@ -14,16 +14,16 @@ This table depends on [aws_lightsail_instances](aws_lightsail_instances.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|instance_arn (PK)|`utf8`| -|allow_list (PK)|`utf8`| +|instance_arn|`utf8`| +|allow_list|`utf8`| |cidr_list_aliases|`list`| |cidrs|`list`| -|from_port (PK)|`int64`| +|from_port|`int64`| |ipv6_cidrs|`list`| -|protocol (PK)|`utf8`| +|protocol|`utf8`| |state|`utf8`| -|to_port (PK)|`int64`| \ No newline at end of file +|to_port|`int64`| \ 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 3032825dd3d655..8170cc423dd5fb 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_instance_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Lightsail Instance Snapshots. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstanceSnapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |from_attached_disks|`json`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_instances.md b/plugins/source/aws/docs/tables/aws_lightsail_instances.md index 71df93ec8bb5ad..60e964a0a6e696 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_instances.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_instances.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Instances. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Instance.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_instances: @@ -15,12 +15,12 @@ The following tables depend on aws_lightsail_instances: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |access_details|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |add_ons|`json`| |blueprint_id|`utf8`| 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 be54c5d1dc0c42..b2f2199f920daa 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 @@ -4,8 +4,8 @@ This table shows data for Lightsail Load Balancer TLS Certificates. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancerTlsCertificate.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_lightsail_load_balancers](aws_lightsail_load_balancers.md). @@ -14,13 +14,13 @@ This table depends on [aws_lightsail_load_balancers](aws_lightsail_load_balancer | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |load_balancer_arn|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |domain_name|`utf8`| |domain_validation_records|`json`| 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 5035bb6aa00e9a..c32c92042396e0 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_load_balancers.md @@ -4,8 +4,8 @@ This table shows data for Lightsail Load Balancers. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancer.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_lightsail_load_balancers: @@ -15,11 +15,11 @@ The following tables depend on aws_lightsail_load_balancers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |configuration_options|`json`| |created_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_lightsail_static_ips.md b/plugins/source/aws/docs/tables/aws_lightsail_static_ips.md index 60caf815ef5289..d0b74da00c5f91 100644 --- a/plugins/source/aws/docs/tables/aws_lightsail_static_ips.md +++ b/plugins/source/aws/docs/tables/aws_lightsail_static_ips.md @@ -4,17 +4,18 @@ This table shows data for Lightsail Static IPs. https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_StaticIp.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |attached_to|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |ip_address|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_mq_broker_configuration_revisions.md b/plugins/source/aws/docs/tables/aws_mq_broker_configuration_revisions.md index 95323720661795..052b670db6cf32 100644 --- a/plugins/source/aws/docs/tables/aws_mq_broker_configuration_revisions.md +++ b/plugins/source/aws/docs/tables/aws_mq_broker_configuration_revisions.md @@ -4,8 +4,8 @@ This table shows data for Amazon MQ Broker Configuration Revisions. https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id-revisions.html -The composite primary key for this table is (**broker_configuration_arn**, **revision**, **configuration_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**broker_configuration_arn**, **revision**, **configuration_id**). ## Relations This table depends on [aws_mq_broker_configurations](aws_mq_broker_configurations.md). @@ -14,13 +14,13 @@ This table depends on [aws_mq_broker_configurations](aws_mq_broker_configuration | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|broker_configuration_arn (PK)|`utf8`| -|revision (PK)|`int32`| +|broker_configuration_arn|`utf8`| +|revision|`int32`| |data|`json`| -|configuration_id (PK)|`utf8`| +|configuration_id|`utf8`| |created|`timestamp[us, tz=UTC]`| |description|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_mq_broker_configurations.md b/plugins/source/aws/docs/tables/aws_mq_broker_configurations.md index e00408d153fc18..d683e0d4eaf65e 100644 --- a/plugins/source/aws/docs/tables/aws_mq_broker_configurations.md +++ b/plugins/source/aws/docs/tables/aws_mq_broker_configurations.md @@ -4,8 +4,8 @@ This table shows data for Amazon MQ Broker Configurations. https://docs.aws.amazon.com/amazon-mq/latest/api-reference/configurations-configuration-id.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_mq_brokers](aws_mq_brokers.md). @@ -17,12 +17,12 @@ The following tables depend on aws_mq_broker_configurations: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |broker_arn|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |authentication_strategy|`utf8`| |created|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_mq_broker_users.md b/plugins/source/aws/docs/tables/aws_mq_broker_users.md index 3b3ac9b58e7371..263d39427aaeb9 100644 --- a/plugins/source/aws/docs/tables/aws_mq_broker_users.md +++ b/plugins/source/aws/docs/tables/aws_mq_broker_users.md @@ -4,8 +4,8 @@ This table shows data for Amazon MQ Broker Users. https://docs.aws.amazon.com/amazon-mq/latest/api-reference/brokers-broker-id-users-username.html -The composite primary key for this table is (**broker_arn**, **username**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**broker_arn**, **username**). ## Relations This table depends on [aws_mq_brokers](aws_mq_brokers.md). @@ -14,14 +14,14 @@ This table depends on [aws_mq_brokers](aws_mq_brokers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|broker_arn (PK)|`utf8`| +|broker_arn|`utf8`| |broker_id|`utf8`| |console_access|`bool`| |groups|`list`| |pending|`json`| |replication_user|`bool`| -|username (PK)|`utf8`| \ No newline at end of file +|username|`utf8`| \ 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 50ac8163aa98fc..82e7336726cab7 100644 --- a/plugins/source/aws/docs/tables/aws_mq_brokers.md +++ b/plugins/source/aws/docs/tables/aws_mq_brokers.md @@ -4,8 +4,8 @@ This table shows data for Amazon MQ Brokers. https://docs.aws.amazon.com/amazon-mq/latest/api-reference/brokers.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_mq_brokers: @@ -16,11 +16,11 @@ The following tables depend on aws_mq_brokers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |actions_required|`json`| |authentication_strategy|`utf8`| |auto_minor_version_upgrade|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_mwaa_environments.md b/plugins/source/aws/docs/tables/aws_mwaa_environments.md index 831d87efe7f155..ec0698dc5cb901 100644 --- a/plugins/source/aws/docs/tables/aws_mwaa_environments.md +++ b/plugins/source/aws/docs/tables/aws_mwaa_environments.md @@ -4,17 +4,18 @@ This table shows data for Amazon MWAA Environments. https://docs.aws.amazon.com/mwaa/latest/API/API_Environment.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |airflow_configuration_options|`json`| |airflow_version|`utf8`| |celery_executor_queue|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_group_parameters.md b/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_group_parameters.md index 347f6d7b54c8c4..b9096b2f820d84 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_group_parameters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_cluster_parameter_group_parameters.md @@ -4,8 +4,8 @@ This table shows data for Neptune Cluster Parameter Group Parameters. https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameterGroups -The composite primary key for this table is (**cluster_parameter_group_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_parameter_group_arn**, **parameter_name**). ## Relations This table depends on [aws_neptune_cluster_parameter_groups](aws_neptune_cluster_parameter_groups.md). @@ -14,11 +14,11 @@ This table depends on [aws_neptune_cluster_parameter_groups](aws_neptune_cluster | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_parameter_group_arn (PK)|`utf8`| +|cluster_parameter_group_arn|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -26,6 +26,6 @@ This table depends on [aws_neptune_cluster_parameter_groups](aws_neptune_cluster |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| \ No newline at end of file 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 167fe0f9f8b02d..5367f862ea5892 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 @@ -4,8 +4,8 @@ This table shows data for Neptune Cluster Parameter Groups. https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameters -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_neptune_cluster_parameter_groups: @@ -15,11 +15,11 @@ The following tables depend on aws_neptune_cluster_parameter_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_cluster_parameter_group_arn|`utf8`| |db_cluster_parameter_group_name|`utf8`| 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 0f75f4e1ef7af9..8801a6c889fb7a 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_neptune_cluster_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Neptune Cluster Snapshots. https://docs.aws.amazon.com/neptune/latest/userguide/api-snapshots.html#DescribeDBClusterSnapshots -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |attributes|`json`| |tags|`json`| |allocated_storage|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_neptune_clusters.md b/plugins/source/aws/docs/tables/aws_neptune_clusters.md index 1029fc5d5fa05c..332660e5208ad6 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_clusters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_clusters.md @@ -4,17 +4,18 @@ This table shows data for Neptune Clusters. https://docs.aws.amazon.com/neptune/latest/userguide/api-clusters.html#DescribeDBClusters -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |allocated_storage|`int64`| |associated_roles|`json`| diff --git a/plugins/source/aws/docs/tables/aws_neptune_db_parameter_group_db_parameters.md b/plugins/source/aws/docs/tables/aws_neptune_db_parameter_group_db_parameters.md index debb3a9617a420..b0d3032b56af09 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_db_parameter_group_db_parameters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_db_parameter_group_db_parameters.md @@ -4,8 +4,8 @@ This table shows data for Neptune DB Parameter Group DB Parameters. https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameters -The composite primary key for this table is (**db_parameter_group_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**db_parameter_group_arn**, **parameter_name**). ## Relations This table depends on [aws_neptune_db_parameter_groups](aws_neptune_db_parameter_groups.md). @@ -14,11 +14,11 @@ This table depends on [aws_neptune_db_parameter_groups](aws_neptune_db_parameter | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|db_parameter_group_arn (PK)|`utf8`| +|db_parameter_group_arn|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -26,6 +26,6 @@ This table depends on [aws_neptune_db_parameter_groups](aws_neptune_db_parameter |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| \ No newline at end of file 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 ced84e311e72fb..eb95b3522ac854 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 @@ -4,8 +4,8 @@ This table shows data for Neptune DB Parameter Groups. https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameterGroups -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_neptune_db_parameter_groups: @@ -15,11 +15,11 @@ The following tables depend on aws_neptune_db_parameter_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_parameter_group_arn|`utf8`| |db_parameter_group_family|`utf8`| 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 a58eac361c6178..f79fd4a1b80676 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_neptune_event_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Neptune Event Subscriptions. https://docs.aws.amazon.com/neptune/latest/userguide/api-events.html#DescribeEventSubscriptions -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cust_subscription_id|`utf8`| |customer_aws_id|`utf8`| 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 8f1f4dbfa1a0b9..6e7ced64f6eaf8 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md +++ b/plugins/source/aws/docs/tables/aws_neptune_global_clusters.md @@ -4,16 +4,17 @@ This table shows data for Neptune Global Clusters. https://docs.aws.amazon.com/neptune/latest/userguide/api-global-dbs.html#GlobalCluster -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |deletion_protection|`bool`| |engine|`utf8`| |engine_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_neptune_instances.md b/plugins/source/aws/docs/tables/aws_neptune_instances.md index a0d6f969f62f97..f76ab3a4806003 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_instances.md +++ b/plugins/source/aws/docs/tables/aws_neptune_instances.md @@ -4,17 +4,18 @@ This table shows data for Neptune Instances. https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#DescribeDBInstances -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |allocated_storage|`int64`| |auto_minor_version_upgrade|`bool`| 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 82d87cdf84fce3..d42ebb9b94b406 100644 --- a/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_neptune_subnet_groups.md @@ -4,17 +4,18 @@ This table shows data for Neptune Subnet Groups. https://docs.aws.amazon.com/neptune/latest/userguide/api-subnets.html#DescribeDBSubnetGroups -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_subnet_group_description|`utf8`| |db_subnet_group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkfirewall_firewall_policies.md b/plugins/source/aws/docs/tables/aws_networkfirewall_firewall_policies.md index 744776023c6333..e671d90515b970 100644 --- a/plugins/source/aws/docs/tables/aws_networkfirewall_firewall_policies.md +++ b/plugins/source/aws/docs/tables/aws_networkfirewall_firewall_policies.md @@ -4,17 +4,18 @@ This table shows data for Networkfirewall Firewall Policies. https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_FirewallPolicy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |stateless_default_actions|`list`| |stateless_fragment_default_actions|`list`| diff --git a/plugins/source/aws/docs/tables/aws_networkfirewall_firewalls.md b/plugins/source/aws/docs/tables/aws_networkfirewall_firewalls.md index adfc2236da0f58..248215791c7aba 100644 --- a/plugins/source/aws/docs/tables/aws_networkfirewall_firewalls.md +++ b/plugins/source/aws/docs/tables/aws_networkfirewall_firewalls.md @@ -4,17 +4,18 @@ This table shows data for Networkfirewall Firewalls. https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeFirewall.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |configuration_sync_state_summary|`utf8`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkfirewall_rule_groups.md b/plugins/source/aws/docs/tables/aws_networkfirewall_rule_groups.md index 691e4e735b0dcf..d09265ede3d404 100644 --- a/plugins/source/aws/docs/tables/aws_networkfirewall_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_networkfirewall_rule_groups.md @@ -4,17 +4,18 @@ This table shows data for Networkfirewall Rule Groups. https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_RuleGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |rules_source|`json`| |reference_sets|`json`| diff --git a/plugins/source/aws/docs/tables/aws_networkfirewall_tls_inspection_configurations.md b/plugins/source/aws/docs/tables/aws_networkfirewall_tls_inspection_configurations.md index 21fe6c9b11f06a..17ab1776cfcc54 100644 --- a/plugins/source/aws/docs/tables/aws_networkfirewall_tls_inspection_configurations.md +++ b/plugins/source/aws/docs/tables/aws_networkfirewall_tls_inspection_configurations.md @@ -4,17 +4,18 @@ This table shows data for Networkfirewall TLS Inspection Configurations. https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_DescribeTLSInspectionConfiguration.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |server_certificate_configurations|`json`| |tls_inspection_configuration_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkmanager_global_networks.md b/plugins/source/aws/docs/tables/aws_networkmanager_global_networks.md index 7e2c4f37551e43..5cf6f52f27e3be 100644 --- a/plugins/source/aws/docs/tables/aws_networkmanager_global_networks.md +++ b/plugins/source/aws/docs/tables/aws_networkmanager_global_networks.md @@ -5,8 +5,8 @@ This table shows data for Networkmanager Global Networks. https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_GlobalNetwork.html The 'request_region' column is added to show region of where the request was made from. -The composite primary key for this table is (**request_region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_region**, **arn**). ## Relations The following tables depend on aws_networkmanager_global_networks: @@ -18,11 +18,11 @@ The following tables depend on aws_networkmanager_global_networks: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkmanager_links.md b/plugins/source/aws/docs/tables/aws_networkmanager_links.md index 74a6cd58060650..a40816de7d259e 100644 --- a/plugins/source/aws/docs/tables/aws_networkmanager_links.md +++ b/plugins/source/aws/docs/tables/aws_networkmanager_links.md @@ -5,8 +5,8 @@ This table shows data for Networkmanager Links. https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_Link.html The 'request_region' column is added to show region of where the request was made from. -The composite primary key for this table is (**request_region**, **arn**, **global_network_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_region**, **arn**, **global_network_id**). ## Relations This table depends on [aws_networkmanager_global_networks](aws_networkmanager_global_networks.md). @@ -15,16 +15,16 @@ This table depends on [aws_networkmanager_global_networks](aws_networkmanager_gl | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |bandwidth|`json`| |created_at|`timestamp[us, tz=UTC]`| |description|`utf8`| -|global_network_id (PK)|`utf8`| +|global_network_id|`utf8`| |link_arn|`utf8`| |link_id|`utf8`| |provider|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkmanager_sites.md b/plugins/source/aws/docs/tables/aws_networkmanager_sites.md index d55eb6b0642127..c077c5ca6d8106 100644 --- a/plugins/source/aws/docs/tables/aws_networkmanager_sites.md +++ b/plugins/source/aws/docs/tables/aws_networkmanager_sites.md @@ -5,8 +5,8 @@ This table shows data for Networkmanager Sites. https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_Site.html The 'request_region' column is added to show region of where the request was made from. -The composite primary key for this table is (**request_region**, **arn**, **global_network_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_region**, **arn**, **global_network_id**). ## Relations This table depends on [aws_networkmanager_global_networks](aws_networkmanager_global_networks.md). @@ -15,15 +15,15 @@ This table depends on [aws_networkmanager_global_networks](aws_networkmanager_gl | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|request_region (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_region|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |description|`utf8`| -|global_network_id (PK)|`utf8`| +|global_network_id|`utf8`| |location|`json`| |site_arn|`utf8`| |site_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_networkmanager_transit_gateway_registrations.md b/plugins/source/aws/docs/tables/aws_networkmanager_transit_gateway_registrations.md index 1b6f4833a0bdcd..7f5b075057ecdb 100644 --- a/plugins/source/aws/docs/tables/aws_networkmanager_transit_gateway_registrations.md +++ b/plugins/source/aws/docs/tables/aws_networkmanager_transit_gateway_registrations.md @@ -5,8 +5,8 @@ This table shows data for Networkmanager Transit Gateway Registrations. https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_TransitGatewayRegistration.html The 'request_region' column is added to show region of where the request was made from. -The composite primary key for this table is (**request_region**, **global_network_id**, **transit_gateway_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_region**, **global_network_id**, **transit_gateway_arn**). ## Relations This table depends on [aws_networkmanager_global_networks](aws_networkmanager_global_networks.md). @@ -15,10 +15,10 @@ This table depends on [aws_networkmanager_global_networks](aws_networkmanager_gl | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|request_region (PK)|`utf8`| -|global_network_id (PK)|`utf8`| +|request_region|`utf8`| +|global_network_id|`utf8`| |state|`json`| -|transit_gateway_arn (PK)|`utf8`| \ No newline at end of file +|transit_gateway_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organization_resource_policies.md b/plugins/source/aws/docs/tables/aws_organization_resource_policies.md index 384aa277ca5cb7..177410dda0d858 100644 --- a/plugins/source/aws/docs/tables/aws_organization_resource_policies.md +++ b/plugins/source/aws/docs/tables/aws_organization_resource_policies.md @@ -4,14 +4,15 @@ This table shows data for Organization Resource Policies. https://docs.aws.amazon.com/organizations/latest/APIReference/API_DescribeResourcePolicy.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |content|`utf8`| |resource_policy_summary|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organizations.md b/plugins/source/aws/docs/tables/aws_organizations.md index 81bac2fc71c8cc..dd1b97ee6d50f5 100644 --- a/plugins/source/aws/docs/tables/aws_organizations.md +++ b/plugins/source/aws/docs/tables/aws_organizations.md @@ -5,16 +5,17 @@ This table shows data for Organizations. https://docs.aws.amazon.com/organizations/latest/APIReference/API_Organization.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|arn|`utf8`| |feature_set|`utf8`| |id|`utf8`| |master_account_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_organizations_account_parents.md b/plugins/source/aws/docs/tables/aws_organizations_account_parents.md index a9719500336f05..b1588b0263ac45 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_account_parents.md +++ b/plugins/source/aws/docs/tables/aws_organizations_account_parents.md @@ -5,8 +5,8 @@ This table shows data for Organizations Account Parents. https://docs.aws.amazon.com/organizations/latest/APIReference/API_ListParents.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **id**, **parent_id**, **type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **id**, **parent_id**, **type**). ## Relations This table depends on [aws_organizations_accounts](aws_organizations_accounts.md). @@ -15,9 +15,9 @@ This table depends on [aws_organizations_accounts](aws_organizations_accounts.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|id (PK)|`utf8`| -|parent_id (PK)|`utf8`| -|type (PK)|`utf8`| \ No newline at end of file +|request_account_id|`utf8`| +|id|`utf8`| +|parent_id|`utf8`| +|type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organizations_accounts.md b/plugins/source/aws/docs/tables/aws_organizations_accounts.md index 1308d11fc145cc..6e6b49141503a7 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_accounts.md +++ b/plugins/source/aws/docs/tables/aws_organizations_accounts.md @@ -5,8 +5,8 @@ This table shows data for Organizations Accounts. https://docs.aws.amazon.com/organizations/latest/APIReference/API_Account.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Relations The following tables depend on aws_organizations_accounts: @@ -16,11 +16,11 @@ The following tables depend on aws_organizations_accounts: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |email|`utf8`| |id|`utf8`| |joined_method|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_organizations_delegated_administrators.md b/plugins/source/aws/docs/tables/aws_organizations_delegated_administrators.md index 7c2504a8c26bb0..022a88b2191d51 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_delegated_administrators.md +++ b/plugins/source/aws/docs/tables/aws_organizations_delegated_administrators.md @@ -4,8 +4,8 @@ This table shows data for Organizations Delegated Administrators. https://docs.aws.amazon.com/organizations/latest/APIReference/API_DelegatedAdministrator.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations The following tables depend on aws_organizations_delegated_administrators: @@ -15,10 +15,10 @@ The following tables depend on aws_organizations_delegated_administrators: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|arn|`utf8`| |delegation_enabled_date|`timestamp[us, tz=UTC]`| |email|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_organizations_delegated_services.md b/plugins/source/aws/docs/tables/aws_organizations_delegated_services.md index d7b99f69096ba7..6863ed3f3ae4e9 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_delegated_services.md +++ b/plugins/source/aws/docs/tables/aws_organizations_delegated_services.md @@ -4,8 +4,8 @@ This table shows data for Organizations Delegated Services. https://docs.aws.amazon.com/organizations/latest/APIReference/API_DelegatedService.html -The composite primary key for this table is (**account_id**, **service_principal**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **service_principal**). ## Relations This table depends on [aws_organizations_delegated_administrators](aws_organizations_delegated_administrators.md). @@ -14,8 +14,8 @@ This table depends on [aws_organizations_delegated_administrators](aws_organizat | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |delegation_enabled_date|`timestamp[us, tz=UTC]`| -|service_principal (PK)|`utf8`| \ No newline at end of file +|service_principal|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organizations_organizational_unit_parents.md b/plugins/source/aws/docs/tables/aws_organizations_organizational_unit_parents.md index aa61935d501148..8efe9aa26d891f 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_organizational_unit_parents.md +++ b/plugins/source/aws/docs/tables/aws_organizations_organizational_unit_parents.md @@ -5,8 +5,8 @@ This table shows data for Organizations Organizational Unit Parents. https://docs.aws.amazon.com/organizations/latest/APIReference/API_ListParents.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **id**, **parent_id**, **type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **id**, **parent_id**, **type**). ## Relations This table depends on [aws_organizations_organizational_units](aws_organizations_organizational_units.md). @@ -15,9 +15,9 @@ This table depends on [aws_organizations_organizational_units](aws_organizations | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|id (PK)|`utf8`| -|parent_id (PK)|`utf8`| -|type (PK)|`utf8`| \ No newline at end of file +|request_account_id|`utf8`| +|id|`utf8`| +|parent_id|`utf8`| +|type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organizations_organizational_units.md b/plugins/source/aws/docs/tables/aws_organizations_organizational_units.md index 3c8b3c68458ddb..c05fee3aaf789f 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_organizational_units.md +++ b/plugins/source/aws/docs/tables/aws_organizations_organizational_units.md @@ -5,8 +5,8 @@ This table shows data for Organizations Organizational Units. https://docs.aws.amazon.com/organizations/latest/APIReference/API_OrganizationalUnit.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Relations The following tables depend on aws_organizations_organizational_units: @@ -16,9 +16,9 @@ The following tables depend on aws_organizations_organizational_units: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|arn|`utf8`| |id|`utf8`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_organizations_policies.md b/plugins/source/aws/docs/tables/aws_organizations_policies.md index 351dfa04105775..d2f208278c3175 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_policies.md +++ b/plugins/source/aws/docs/tables/aws_organizations_policies.md @@ -4,17 +4,18 @@ This table shows data for Organizations Policies. https://docs.aws.amazon.com/organizations/latest/APIReference/API_Policy.html -The composite primary key for this table is (**account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |content|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |aws_managed|`bool`| |description|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_organizations_roots.md b/plugins/source/aws/docs/tables/aws_organizations_roots.md index 2b3bc295cd69ee..901b735e7b384d 100644 --- a/plugins/source/aws/docs/tables/aws_organizations_roots.md +++ b/plugins/source/aws/docs/tables/aws_organizations_roots.md @@ -5,17 +5,18 @@ This table shows data for Organizations Roots. https://docs.aws.amazon.com/organizations/latest/APIReference/API_Root.html The 'request_account_id' column is added to show from where the request was made. -The composite primary key for this table is (**request_account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| +|request_account_id|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |name|`utf8`| |policy_types|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_kinesis_streams.md b/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_kinesis_streams.md index 301a891b057341..c87010fe4cae44 100644 --- a/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_kinesis_streams.md +++ b/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_kinesis_streams.md @@ -4,8 +4,8 @@ This table shows data for Quantum Ledger Database (QLDB) Ledger Journal Kinesis https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalKinesisStreamDescription.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_qldb_ledgers](aws_qldb_ledgers.md). @@ -14,7 +14,7 @@ This table depends on [aws_qldb_ledgers](aws_qldb_ledgers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| @@ -25,7 +25,7 @@ This table depends on [aws_qldb_ledgers](aws_qldb_ledgers.md). |status|`utf8`| |stream_id|`utf8`| |stream_name|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |error_cause|`utf8`| |exclusive_end_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_s3_exports.md b/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_s3_exports.md index 14a7aa9851e4af..5a852150f8888a 100644 --- a/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_s3_exports.md +++ b/plugins/source/aws/docs/tables/aws_qldb_ledger_journal_s3_exports.md @@ -4,8 +4,8 @@ This table shows data for Quantum Ledger Database (QLDB) Ledger Journal S3 Expor https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalS3ExportDescription.html -The composite primary key for this table is (**ledger_arn**, **export_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**ledger_arn**, **export_id**). ## Relations This table depends on [aws_qldb_ledgers](aws_qldb_ledgers.md). @@ -14,14 +14,14 @@ This table depends on [aws_qldb_ledgers](aws_qldb_ledgers.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|ledger_arn (PK)|`utf8`| +|ledger_arn|`utf8`| |exclusive_end_time|`timestamp[us, tz=UTC]`| |export_creation_time|`timestamp[us, tz=UTC]`| -|export_id (PK)|`utf8`| +|export_id|`utf8`| |inclusive_start_time|`timestamp[us, tz=UTC]`| |ledger_name|`utf8`| |role_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_qldb_ledgers.md b/plugins/source/aws/docs/tables/aws_qldb_ledgers.md index 29a0b7c88de6ef..dbbf935d8fadd0 100644 --- a/plugins/source/aws/docs/tables/aws_qldb_ledgers.md +++ b/plugins/source/aws/docs/tables/aws_qldb_ledgers.md @@ -4,8 +4,8 @@ This table shows data for Quantum Ledger Database (QLDB) Ledgers. https://docs.aws.amazon.com/qldb/latest/developerguide/API_DescribeLedger.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_qldb_ledgers: @@ -16,12 +16,12 @@ The following tables depend on aws_qldb_ledgers: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_date_time|`timestamp[us, tz=UTC]`| |deletion_protection|`bool`| |encryption_description|`json`| diff --git a/plugins/source/aws/docs/tables/aws_quicksight_analyses.md b/plugins/source/aws/docs/tables/aws_quicksight_analyses.md index 89e91a509811cb..6ee6fcf855e6d8 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_analyses.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_analyses.md @@ -4,19 +4,20 @@ This table shows data for QuickSight Analyses. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Analysis.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |analysis_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |data_set_arns|`list`| |errors|`json`| diff --git a/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md b/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md index 8f1fb3316a18c4..4f695f6083971f 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_dashboards.md @@ -4,18 +4,19 @@ This table shows data for QuickSight Dashboards. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DashboardSummary.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |dashboard_id|`utf8`| |last_published_time|`timestamp[us, tz=UTC]`| 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 ef297c08649fce..e9f38c1c18d5ed 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_data_sets.md @@ -4,8 +4,8 @@ This table shows data for QuickSight Data Sets. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSetSummary.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_quicksight_data_sets: @@ -15,12 +15,12 @@ The following tables depend on aws_quicksight_data_sets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |column_level_permission_rules_applied|`bool`| |created_time|`timestamp[us, tz=UTC]`| |data_set_id|`utf8`| 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 47f5c613d107a6..1879b6cf45b404 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_data_sources.md @@ -4,18 +4,19 @@ This table shows data for QuickSight Data Sources. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSource.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |data_source_id|`utf8`| |error_info|`json`| diff --git a/plugins/source/aws/docs/tables/aws_quicksight_folders.md b/plugins/source/aws/docs/tables/aws_quicksight_folders.md index 78812d486989d8..224d90e3d902d0 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_folders.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_folders.md @@ -4,18 +4,19 @@ This table shows data for QuickSight Folders. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Folder.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |folder_id|`utf8`| |folder_path|`list`| 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 4f8d8243df887b..5390e1c2dc16fa 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_group_members.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_group_members.md @@ -4,8 +4,8 @@ This table shows data for QuickSight Group Members. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GroupMember.html -The composite primary key for this table is (**account_id**, **region**, **group_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **group_arn**, **arn**). ## Relations This table depends on [aws_quicksight_groups](aws_quicksight_groups.md). @@ -14,10 +14,10 @@ This table depends on [aws_quicksight_groups](aws_quicksight_groups.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|group_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|group_arn|`utf8`| +|arn|`utf8`| |member_name|`utf8`| \ 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 73b33c20314f0f..61502a5c241641 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_groups.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_groups.md @@ -4,8 +4,8 @@ This table shows data for QuickSight Groups. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Group.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_quicksight_groups: @@ -15,12 +15,12 @@ The following tables depend on aws_quicksight_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |group_name|`utf8`| |principal_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md b/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md index ea0b9bdbdf7136..0b3fbe36027138 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_ingestions.md @@ -4,8 +4,8 @@ This table shows data for QuickSight Ingestions. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Ingestion.html -The composite primary key for this table is (**account_id**, **region**, **data_set_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **data_set_arn**, **arn**). ## Relations This table depends on [aws_quicksight_data_sets](aws_quicksight_data_sets.md). @@ -14,13 +14,13 @@ This table depends on [aws_quicksight_data_sets](aws_quicksight_data_sets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|data_set_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|data_set_arn|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |ingestion_status|`utf8`| |error_info|`json`| diff --git a/plugins/source/aws/docs/tables/aws_quicksight_templates.md b/plugins/source/aws/docs/tables/aws_quicksight_templates.md index 61fcfa641e4519..bafff7d3b19c6d 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_templates.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_templates.md @@ -4,18 +4,19 @@ This table shows data for QuickSight Templates. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_TemplateSummary.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |created_time|`timestamp[us, tz=UTC]`| |last_updated_time|`timestamp[us, tz=UTC]`| |latest_version_number|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_quicksight_users.md b/plugins/source/aws/docs/tables/aws_quicksight_users.md index 8c5aea4bf904a0..14ba22b5cb7c56 100644 --- a/plugins/source/aws/docs/tables/aws_quicksight_users.md +++ b/plugins/source/aws/docs/tables/aws_quicksight_users.md @@ -4,19 +4,20 @@ This table shows data for QuickSight Users. https://docs.aws.amazon.com/quicksight/latest/APIReference/API_User.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |active|`bool`| -|arn (PK)|`utf8`| +|arn|`utf8`| |custom_permissions_name|`utf8`| |email|`utf8`| |external_login_federation_provider_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ram_principals.md b/plugins/source/aws/docs/tables/aws_ram_principals.md index 2c0c061f924316..bf09a8bbd1b706 100644 --- a/plugins/source/aws/docs/tables/aws_ram_principals.md +++ b/plugins/source/aws/docs/tables/aws_ram_principals.md @@ -4,18 +4,19 @@ This table shows data for RAM Principals. https://docs.aws.amazon.com/ram/latest/APIReference/API_Principal.html -The composite primary key for this table is (**account_id**, **region**, **id**, **resource_share_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**, **resource_share_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |external|`bool`| -|id (PK)|`utf8`| +|id|`utf8`| |last_updated_time|`timestamp[us, tz=UTC]`| -|resource_share_arn (PK)|`utf8`| \ No newline at end of file +|resource_share_arn|`utf8`| \ 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 3b876a59c56b34..686d260200b86e 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 @@ -4,22 +4,23 @@ This table shows data for RAM Resource Share Associations. https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShareAssociation.html -The composite primary key for this table is (**associated_entity**, **resource_share_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**associated_entity**, **resource_share_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|associated_entity (PK)|`utf8`| +|associated_entity|`utf8`| |association_type|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |external|`bool`| |last_updated_time|`timestamp[us, tz=UTC]`| -|resource_share_arn (PK)|`utf8`| +|resource_share_arn|`utf8`| |resource_share_name|`utf8`| |status|`utf8`| |status_message|`utf8`| \ 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 3c84e8d3e22e04..f4528a007240ca 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 @@ -4,18 +4,19 @@ This table shows data for RAM Resource Share Invitations. https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShareInvitation.html -The composite primary key for this table is (**account_id**, **region**, **arn**, **receiver_combined**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**, **receiver_combined**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| -|receiver_combined (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|arn|`utf8`| +|receiver_combined|`utf8`| |invitation_timestamp|`timestamp[us, tz=UTC]`| |receiver_account_id|`utf8`| |receiver_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ram_resource_share_permissions.md b/plugins/source/aws/docs/tables/aws_ram_resource_share_permissions.md index 176851fb5882e1..4193a2b7575903 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_share_permissions.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_share_permissions.md @@ -4,8 +4,8 @@ This table shows data for RAM Resource Share Permissions. https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceSharePermissionSummary.html -The composite primary key for this table is (**account_id**, **region**, **resource_share_arn**, **arn**, **version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_share_arn**, **arn**, **version**). ## Relations This table depends on [aws_ram_resource_shares](aws_ram_resource_shares.md). @@ -14,14 +14,14 @@ This table depends on [aws_ram_resource_shares](aws_ram_resource_shares.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|resource_share_arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|resource_share_arn|`utf8`| |permission|`json`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |default_version|`bool`| |feature_set|`utf8`| @@ -31,4 +31,4 @@ This table depends on [aws_ram_resource_shares](aws_ram_resource_shares.md). |permission_type|`utf8`| |resource_type|`utf8`| |status|`utf8`| -|version (PK)|`utf8`| \ No newline at end of file +|version|`utf8`| \ 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 15f558d571e394..18daef4901ecff 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_shares.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_shares.md @@ -4,8 +4,8 @@ This table shows data for RAM Resource Shares. https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShare.html -The composite primary key for this table is (**account_id**, **region**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Relations The following tables depend on aws_ram_resource_shares: @@ -15,11 +15,11 @@ The following tables depend on aws_ram_resource_shares: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|arn|`utf8`| |tags|`json`| |allow_external_principals|`bool`| |creation_time|`timestamp[us, tz=UTC]`| 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 3d7e8be34439c6..f9d65796cea25e 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resource_types.md +++ b/plugins/source/aws/docs/tables/aws_ram_resource_types.md @@ -4,16 +4,17 @@ This table shows data for RAM Resource Types. https://docs.aws.amazon.com/ram/latest/APIReference/API_ServiceNameAndResourceType.html -The composite primary key for this table is (**account_id**, **region**, **resource_type**, **service_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **resource_type**, **service_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |resource_region_scope|`utf8`| -|resource_type (PK)|`utf8`| -|service_name (PK)|`utf8`| \ No newline at end of file +|resource_type|`utf8`| +|service_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ram_resources.md b/plugins/source/aws/docs/tables/aws_ram_resources.md index 7579cb90c73718..2bc4eb8e5e25d0 100644 --- a/plugins/source/aws/docs/tables/aws_ram_resources.md +++ b/plugins/source/aws/docs/tables/aws_ram_resources.md @@ -4,22 +4,23 @@ This table shows data for RAM Resources. https://docs.aws.amazon.com/ram/latest/APIReference/API_Resource.html -The composite primary key for this table is (**account_id**, **region**, **arn**, **resource_share_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**, **resource_share_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |last_updated_time|`timestamp[us, tz=UTC]`| |resource_group_arn|`utf8`| |resource_region_scope|`utf8`| -|resource_share_arn (PK)|`utf8`| +|resource_share_arn|`utf8`| |status|`utf8`| |status_message|`utf8`| |type|`utf8`| \ 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 709a5fb12c44ae..bd3d5a49c04691 100644 --- a/plugins/source/aws/docs/tables/aws_rds_certificates.md +++ b/plugins/source/aws/docs/tables/aws_rds_certificates.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Certificates. https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Certificate.html -The composite primary key for this table is (**account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |certificate_arn|`utf8`| |certificate_identifier|`utf8`| |certificate_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_rds_cluster_backtracks.md b/plugins/source/aws/docs/tables/aws_rds_cluster_backtracks.md index 774203ad202c98..d865aa65413d3c 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_backtracks.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_backtracks.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Cluster Backt https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribeDBClusterBacktracks.html -The composite primary key for this table is (**db_cluster_arn**, **backtrack_identifier**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**db_cluster_arn**, **backtrack_identifier**). ## Relations This table depends on [aws_rds_clusters](aws_rds_clusters.md). @@ -14,12 +14,12 @@ This table depends on [aws_rds_clusters](aws_rds_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|db_cluster_arn (PK)|`utf8`| -|backtrack_identifier (PK)|`utf8`| +|db_cluster_arn|`utf8`| +|backtrack_identifier|`utf8`| |backtrack_request_creation_time|`timestamp[us, tz=UTC]`| |backtrack_to|`timestamp[us, tz=UTC]`| |backtracked_from|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_group_parameters.md b/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_group_parameters.md index 2579fb2b685bc0..611c483a52acec 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_group_parameters.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_parameter_group_parameters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Cluster Param https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html -The composite primary key for this table is (**cluster_parameter_group_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_parameter_group_arn**, **parameter_name**). ## Relations This table depends on [aws_rds_cluster_parameter_groups](aws_rds_cluster_parameter_groups.md). @@ -14,11 +14,11 @@ This table depends on [aws_rds_cluster_parameter_groups](aws_rds_cluster_paramet | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_parameter_group_arn (PK)|`utf8`| +|cluster_parameter_group_arn|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -26,7 +26,7 @@ This table depends on [aws_rds_cluster_parameter_groups](aws_rds_cluster_paramet |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| |supported_engine_modes|`list`| \ No newline at end of file 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 7cdffe85332f03..c230701a6a4300 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Cluster Param https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterParameterGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_rds_cluster_parameter_groups: @@ -15,11 +15,11 @@ The following tables depend on aws_rds_cluster_parameter_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_cluster_parameter_group_arn|`utf8`| |db_cluster_parameter_group_name|`utf8`| 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 d036b9b46b7a1a..66b59729d4f91b 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_parameters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Cluster Param https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html -The composite primary key for this table is (**_engine_version_hash**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**_engine_version_hash**, **parameter_name**). ## Relations This table depends on [aws_rds_engine_versions](aws_rds_engine_versions.md). @@ -14,11 +14,11 @@ This table depends on [aws_rds_engine_versions](aws_rds_engine_versions.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|_engine_version_hash (PK)|`utf8`| +|_engine_version_hash|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -26,7 +26,7 @@ This table depends on [aws_rds_engine_versions](aws_rds_engine_versions.md). |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| |supported_engine_modes|`list`| \ No newline at end of file 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 7f7483adf91b92..689906d9c4c520 100644 --- a/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_rds_cluster_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Cluster Snaps https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBClusterSnapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |attributes|`json`| |allocated_storage|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_rds_clusters.md b/plugins/source/aws/docs/tables/aws_rds_clusters.md index 55a09a99940c39..3a6e12ebf114d5 100644 --- a/plugins/source/aws/docs/tables/aws_rds_clusters.md +++ b/plugins/source/aws/docs/tables/aws_rds_clusters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Clusters. https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBCluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_rds_clusters: @@ -15,11 +15,11 @@ The following tables depend on aws_rds_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |activity_stream_kinesis_stream_name|`utf8`| |activity_stream_kms_key_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_rds_db_parameter_group_db_parameters.md b/plugins/source/aws/docs/tables/aws_rds_db_parameter_group_db_parameters.md index 5ac037b00460fd..780dffc8cb6860 100644 --- a/plugins/source/aws/docs/tables/aws_rds_db_parameter_group_db_parameters.md +++ b/plugins/source/aws/docs/tables/aws_rds_db_parameter_group_db_parameters.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) DB Parameter https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html -The composite primary key for this table is (**db_parameter_group_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**db_parameter_group_arn**, **parameter_name**). ## Relations This table depends on [aws_rds_db_parameter_groups](aws_rds_db_parameter_groups.md). @@ -14,11 +14,11 @@ This table depends on [aws_rds_db_parameter_groups](aws_rds_db_parameter_groups. | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|db_parameter_group_arn (PK)|`utf8`| +|db_parameter_group_arn|`utf8`| |allowed_values|`utf8`| |apply_method|`utf8`| |apply_type|`utf8`| @@ -26,7 +26,7 @@ This table depends on [aws_rds_db_parameter_groups](aws_rds_db_parameter_groups. |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| |supported_engine_modes|`list`| \ No newline at end of file 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 1628d463f18706..99d2b87f0c6340 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) DB Parameter https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBParameterGroup.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_rds_db_parameter_groups: @@ -15,11 +15,11 @@ The following tables depend on aws_rds_db_parameter_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_parameter_group_arn|`utf8`| |db_parameter_group_family|`utf8`| 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 e4b5cfd9721727..fbf11cde40229b 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 @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) DB Security G https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSecurityGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |db_security_group_arn|`utf8`| |db_security_group_description|`utf8`| 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 6c1c4a766f20af..d172cdadb900cf 100644 --- a/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_rds_db_snapshots.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) DB Snapshots. https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSnapshot.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |attributes|`json`| |allocated_storage|`int64`| 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 68e560a21ad3d9..1878311cff855c 100644 --- a/plugins/source/aws/docs/tables/aws_rds_engine_versions.md +++ b/plugins/source/aws/docs/tables/aws_rds_engine_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Relational Database Service (RDS) Engine Versio https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBEngineVersion.html -The composite primary key for this table is (**account_id**, **region**, **_engine_version_hash**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **_engine_version_hash**). ## Relations The following tables depend on aws_rds_engine_versions: @@ -15,11 +15,11 @@ The following tables depend on aws_rds_engine_versions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|_engine_version_hash (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|_engine_version_hash|`utf8`| |tag_list|`json`| |create_time|`timestamp[us, tz=UTC]`| |custom_db_engine_version_manifest|`utf8`| 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 3bcede0b12b610..dae5b62dd1090d 100644 --- a/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_rds_event_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Event Subscri https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_EventSubscription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cust_subscription_id|`utf8`| |customer_aws_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_rds_instances.md b/plugins/source/aws/docs/tables/aws_rds_instances.md index 61e3963dbe2b06..0fed27bb454eb7 100644 --- a/plugins/source/aws/docs/tables/aws_rds_instances.md +++ b/plugins/source/aws/docs/tables/aws_rds_instances.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Instances. https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBInstance.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |processor_features|`json`| |tags|`json`| |activity_stream_engine_native_audit_fields_included|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_rds_option_groups.md b/plugins/source/aws/docs/tables/aws_rds_option_groups.md index 5d330ba85e284d..98d7935aaf08c8 100644 --- a/plugins/source/aws/docs/tables/aws_rds_option_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_option_groups.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Option Groups https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_OptionGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |allows_vpc_and_non_vpc_instance_memberships|`bool`| |copy_timestamp|`timestamp[us, tz=UTC]`| |engine_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_rds_reserved_instances.md b/plugins/source/aws/docs/tables/aws_rds_reserved_instances.md index 76fb742cff1536..d45c9e9e379cc6 100644 --- a/plugins/source/aws/docs/tables/aws_rds_reserved_instances.md +++ b/plugins/source/aws/docs/tables/aws_rds_reserved_instances.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Reserved Inst https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_ReservedDBInstance.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |currency_code|`utf8`| |db_instance_class|`utf8`| 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 85976f6d276d09..59e65afe7387f9 100644 --- a/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_rds_subnet_groups.md @@ -4,17 +4,18 @@ This table shows data for Amazon Relational Database Service (RDS) Subnet Groups https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DBSubnetGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |db_subnet_group_arn|`utf8`| |db_subnet_group_description|`utf8`| |db_subnet_group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_redshift_cluster_parameter_groups.md b/plugins/source/aws/docs/tables/aws_redshift_cluster_parameter_groups.md index 7300e1c40b754d..bcfd6177989af7 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_cluster_parameter_groups.md +++ b/plugins/source/aws/docs/tables/aws_redshift_cluster_parameter_groups.md @@ -4,8 +4,8 @@ This table shows data for Redshift Cluster Parameter Groups. https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterParameterGroupStatus.html -The composite primary key for this table is (**cluster_arn**, **parameter_group_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **parameter_group_name**). ## Relations This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). @@ -17,11 +17,11 @@ The following tables depend on aws_redshift_cluster_parameter_groups: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |cluster_parameter_status_list|`json`| |parameter_apply_status|`utf8`| -|parameter_group_name (PK)|`utf8`| \ No newline at end of file +|parameter_group_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_redshift_cluster_parameters.md b/plugins/source/aws/docs/tables/aws_redshift_cluster_parameters.md index 375bfed27de38d..1bed9f57577575 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_cluster_parameters.md +++ b/plugins/source/aws/docs/tables/aws_redshift_cluster_parameters.md @@ -4,8 +4,8 @@ This table shows data for Redshift Cluster Parameters. https://docs.aws.amazon.com/redshift/latest/APIReference/API_Parameter.html -The composite primary key for this table is (**cluster_arn**, **parameter_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **parameter_name**). ## Relations This table depends on [aws_redshift_cluster_parameter_groups](aws_redshift_cluster_parameter_groups.md). @@ -14,17 +14,17 @@ This table depends on [aws_redshift_cluster_parameter_groups](aws_redshift_clust | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |allowed_values|`utf8`| |apply_type|`utf8`| |data_type|`utf8`| |description|`utf8`| |is_modifiable|`bool`| |minimum_engine_version|`utf8`| -|parameter_name (PK)|`utf8`| +|parameter_name|`utf8`| |parameter_value|`utf8`| |source|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_redshift_clusters.md b/plugins/source/aws/docs/tables/aws_redshift_clusters.md index bb83ab0917835c..a558f925ba4bf9 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_clusters.md +++ b/plugins/source/aws/docs/tables/aws_redshift_clusters.md @@ -4,8 +4,8 @@ This table shows data for Redshift Clusters. https://docs.aws.amazon.com/redshift/latest/APIReference/API_Cluster.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_redshift_clusters: @@ -18,11 +18,11 @@ The following tables depend on aws_redshift_clusters: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |logging_status|`json`| |tags|`json`| |allow_version_upgrade|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_redshift_data_shares.md b/plugins/source/aws/docs/tables/aws_redshift_data_shares.md index e0e2df25ae6638..096c2ba6ee58ca 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_data_shares.md +++ b/plugins/source/aws/docs/tables/aws_redshift_data_shares.md @@ -4,19 +4,20 @@ This table shows data for Redshift Data Shares. https://docs.aws.amazon.com/redshift/latest/APIReference/API_DataShare.html -The composite primary key for this table is (**arn**, **producer_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **producer_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |allow_publicly_accessible_consumers|`bool`| |data_share_arn|`utf8`| |data_share_associations|`json`| |managed_by|`utf8`| -|producer_arn (PK)|`utf8`| \ No newline at end of file +|producer_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_redshift_endpoint_accesses.md b/plugins/source/aws/docs/tables/aws_redshift_endpoint_accesses.md index fc4424bf62e97d..8fbb75bfe26f7b 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_endpoint_accesses.md +++ b/plugins/source/aws/docs/tables/aws_redshift_endpoint_accesses.md @@ -4,8 +4,8 @@ This table shows data for Redshift Endpoint Accesses. https://docs.aws.amazon.com/redshift/latest/APIReference/API_EndpointAccess.html -The composite primary key for this table is (**cluster_arn**, **address**, **cluster_identifier**, **endpoint_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **address**, **cluster_identifier**, **endpoint_name**). ## Relations This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). @@ -14,15 +14,15 @@ This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| -|address (PK)|`utf8`| -|cluster_identifier (PK)|`utf8`| +|cluster_arn|`utf8`| +|address|`utf8`| +|cluster_identifier|`utf8`| |endpoint_create_time|`timestamp[us, tz=UTC]`| -|endpoint_name (PK)|`utf8`| +|endpoint_name|`utf8`| |endpoint_status|`utf8`| |port|`int64`| |resource_owner|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_redshift_endpoint_authorizations.md b/plugins/source/aws/docs/tables/aws_redshift_endpoint_authorizations.md index 9adc32f24fc90b..01d203ca0aff71 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_endpoint_authorizations.md +++ b/plugins/source/aws/docs/tables/aws_redshift_endpoint_authorizations.md @@ -4,8 +4,8 @@ This table shows data for Redshift Endpoint Authorizations. https://docs.aws.amazon.com/redshift/latest/APIReference/API_EndpointAuthorization.html -The composite primary key for this table is (**cluster_arn**, **cluster_identifier**, **grantee**, **grantor**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**cluster_arn**, **cluster_identifier**, **grantee**, **grantor**). ## Relations This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). @@ -14,17 +14,17 @@ This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|cluster_arn (PK)|`utf8`| +|cluster_arn|`utf8`| |allowed_all_vp_cs|`bool`| |allowed_vp_cs|`list`| |authorize_time|`timestamp[us, tz=UTC]`| -|cluster_identifier (PK)|`utf8`| +|cluster_identifier|`utf8`| |cluster_status|`utf8`| |endpoint_count|`int64`| -|grantee (PK)|`utf8`| -|grantor (PK)|`utf8`| +|grantee|`utf8`| +|grantor|`utf8`| |status|`utf8`| \ No newline at end of file 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 0df656057ff48f..6abe59a7aa6444 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_redshift_event_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Redshift Event Subscriptions. https://docs.aws.amazon.com/redshift/latest/APIReference/API_EventSubscription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cust_subscription_id|`utf8`| |customer_aws_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_redshift_events.md b/plugins/source/aws/docs/tables/aws_redshift_events.md index bafd1a29bcfc55..494acb18fa8375 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_events.md +++ b/plugins/source/aws/docs/tables/aws_redshift_events.md @@ -6,19 +6,20 @@ https://docs.aws.amazon.com/redshift/latest/APIReference/API_Event.html. Only events occurred in the last 14 days are returned. -The composite primary key for this table is (**account_id**, **region**, **event_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **event_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |date|`timestamp[us, tz=UTC]`| |event_categories|`list`| -|event_id (PK)|`utf8`| +|event_id|`utf8`| |message|`utf8`| |severity|`utf8`| |source_identifier|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_redshift_snapshots.md b/plugins/source/aws/docs/tables/aws_redshift_snapshots.md index 7a9821563b7b03..1de29339b3c66f 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_snapshots.md +++ b/plugins/source/aws/docs/tables/aws_redshift_snapshots.md @@ -4,8 +4,8 @@ This table shows data for Redshift Snapshots. https://docs.aws.amazon.com/redshift/latest/APIReference/API_Snapshot.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). @@ -14,11 +14,11 @@ This table depends on [aws_redshift_clusters](aws_redshift_clusters.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |accounts_with_restore_access|`json`| |actual_incremental_backup_size_in_mega_bytes|`float64`| 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 d5b4c6db9819cf..bdc5ce35fad843 100644 --- a/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md +++ b/plugins/source/aws/docs/tables/aws_redshift_subnet_groups.md @@ -4,17 +4,18 @@ This table shows data for Redshift Subnet Groups. https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterSubnetGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cluster_subnet_group_name|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_regions.md b/plugins/source/aws/docs/tables/aws_regions.md index 9b4557685e328f..97eb637169e715 100644 --- a/plugins/source/aws/docs/tables/aws_regions.md +++ b/plugins/source/aws/docs/tables/aws_regions.md @@ -4,18 +4,19 @@ This table shows data for Regions. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Region.html -The composite primary key for this table is (**account_id**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |enabled|`bool`| |partition|`utf8`| -|region (PK)|`utf8`| +|region|`utf8`| |endpoint|`utf8`| |opt_in_status|`utf8`| |region_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md index 2589585b9a407d..bf64f27815bded 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_alarm_recommendations.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Alarm Recommendations. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AlarmRecommendation.html -The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **assessment_arn**, **recommendation_id**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,14 +14,14 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| +|app_arn|`utf8`| +|assessment_arn|`utf8`| |name|`utf8`| -|recommendation_id (PK)|`utf8`| +|recommendation_id|`utf8`| |reference_id|`utf8`| |type|`utf8`| |app_component_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md index 9d5e202c4862ed..4b671bc6e9de2f 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_app_assessments.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub App Assessments. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppAssessment.html -The composite primary key for this table is (**app_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **arn**). ## Relations This table depends on [aws_resiliencehub_apps](aws_resiliencehub_apps.md). @@ -22,12 +22,12 @@ The following tables depend on aws_resiliencehub_app_assessments: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|app_arn|`utf8`| +|arn|`utf8`| |assessment_arn|`utf8`| |assessment_status|`utf8`| |invoker|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md index 2b3ab16afd7d3a..faa4b52a993c0b 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_app_component_compliances.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub App Component Compliances. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppComponentCompliance.html -The composite primary key for this table is (**app_arn**, **assessment_arn**, **app_component_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **assessment_arn**, **app_component_name**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,13 +14,13 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| -|app_component_name (PK)|`utf8`| +|app_arn|`utf8`| +|assessment_arn|`utf8`| +|app_component_name|`utf8`| |compliance|`json`| |cost|`json`| |message|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md index 7faa5c1a56ba5e..81743f8b7807b0 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resource_mappings.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub App Version Resource Mappings. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ResourceMapping.html -The composite primary key for this table is (**app_arn**, **app_version**, **physical_resource_identifier**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **app_version**, **physical_resource_identifier**). ## Relations This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_versions.md). @@ -14,13 +14,13 @@ This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_ver | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|app_version (PK)|`utf8`| -|physical_resource_identifier (PK)|`utf8`| +|app_arn|`utf8`| +|app_version|`utf8`| +|physical_resource_identifier|`utf8`| |mapping_type|`utf8`| |physical_resource_id|`json`| |app_registry_app_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md index 84b66b99098455..2cab4acfca4d8e 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_app_version_resources.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub App Version Resources. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_PhysicalResource.html -The composite primary key for this table is (**app_arn**, **app_version**, **physical_resource_identifier**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **app_version**, **physical_resource_identifier**). ## Relations This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_versions.md). @@ -14,13 +14,13 @@ This table depends on [aws_resiliencehub_app_versions](aws_resiliencehub_app_ver | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|app_version (PK)|`utf8`| -|physical_resource_identifier (PK)|`utf8`| +|app_arn|`utf8`| +|app_version|`utf8`| +|physical_resource_identifier|`utf8`| |logical_resource_id|`json`| |physical_resource_id|`json`| |resource_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md b/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md index 6b1f8d75d351cb..09b9e7e1e44abc 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_app_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub App Versions. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppVersionSummary.html -The composite primary key for this table is (**app_arn**, **app_version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **app_version**). ## Relations This table depends on [aws_resiliencehub_apps](aws_resiliencehub_apps.md). @@ -18,12 +18,12 @@ The following tables depend on aws_resiliencehub_app_versions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|app_version (PK)|`utf8`| +|app_arn|`utf8`| +|app_version|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |identifier|`int64`| |version_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_apps.md b/plugins/source/aws/docs/tables/aws_resiliencehub_apps.md index 7af33c8a903fab..ab5c0e2033b3d6 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_apps.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_apps.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Apps. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_App.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_resiliencehub_apps: @@ -16,11 +16,11 @@ The following tables depend on aws_resiliencehub_apps: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |app_arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md index a785714f9c31f0..ab07d383902403 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_component_recommendations.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Component Recommendations. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ComponentRecommendation.html -The composite primary key for this table is (**app_arn**, **assessment_arn**, **app_component_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **assessment_arn**, **app_component_name**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,12 +14,12 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| -|app_component_name (PK)|`utf8`| +|app_arn|`utf8`| +|assessment_arn|`utf8`| +|app_component_name|`utf8`| |config_recommendations|`json`| |recommendation_status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md b/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md index aa091c90a4c245..1690b5a2d4ebb8 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_recommendation_templates.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Recommendation Templates. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_RecommendationTemplate.html -The composite primary key for this table is (**arn**, **assessment_arn**, **app_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **assessment_arn**, **app_arn**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,18 +14,18 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| +|arn|`utf8`| +|assessment_arn|`utf8`| |format|`utf8`| |name|`utf8`| |recommendation_template_arn|`utf8`| |recommendation_types|`list`| |status|`utf8`| -|app_arn (PK)|`utf8`| +|app_arn|`utf8`| |end_time|`timestamp[us, tz=UTC]`| |message|`utf8`| |needs_replacements|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_resiliency_policies.md b/plugins/source/aws/docs/tables/aws_resiliencehub_resiliency_policies.md index eb6b45a443e31c..f7f3e637d6ea35 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_resiliency_policies.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_resiliency_policies.md @@ -4,17 +4,18 @@ This table shows data for AWS Resilience Hub Resiliency Policies. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ResiliencyPolicy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |data_location_constraint|`utf8`| |estimated_cost_tier|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md index 7e25668f09aa4f..377ad45ab91a7f 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_sop_recommendations.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Sop Recommendations. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_SopRecommendation.html -The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **assessment_arn**, **recommendation_id**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,13 +14,13 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| -|recommendation_id (PK)|`utf8`| +|app_arn|`utf8`| +|assessment_arn|`utf8`| +|recommendation_id|`utf8`| |reference_id|`utf8`| |service_type|`utf8`| |app_component_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_suggested_resiliency_policies.md b/plugins/source/aws/docs/tables/aws_resiliencehub_suggested_resiliency_policies.md index 8c18ad9f479dbb..2ca0eaab26a544 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_suggested_resiliency_policies.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_suggested_resiliency_policies.md @@ -4,17 +4,18 @@ This table shows data for AWS Resilience Hub Suggested Resiliency Policies. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ResiliencyPolicy.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |data_location_constraint|`utf8`| |estimated_cost_tier|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md b/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md index 08bddced4751fc..b4c079c1d2c2b4 100644 --- a/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md +++ b/plugins/source/aws/docs/tables/aws_resiliencehub_test_recommendations.md @@ -4,8 +4,8 @@ This table shows data for AWS Resilience Hub Test Recommendations. https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_TestRecommendation.html -The composite primary key for this table is (**app_arn**, **assessment_arn**, **recommendation_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**app_arn**, **assessment_arn**, **recommendation_id**). ## Relations This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_assessments.md). @@ -14,12 +14,12 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|app_arn (PK)|`utf8`| -|assessment_arn (PK)|`utf8`| +|app_arn|`utf8`| +|assessment_arn|`utf8`| |reference_id|`utf8`| |app_component_name|`utf8`| |depends_on_alarms|`list`| @@ -28,7 +28,7 @@ This table depends on [aws_resiliencehub_app_assessments](aws_resiliencehub_app_ |items|`json`| |name|`utf8`| |prerequisite|`utf8`| -|recommendation_id (PK)|`utf8`| +|recommendation_id|`utf8`| |recommendation_status|`utf8`| |risk|`utf8`| |type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_resourcegroups_resource_groups.md b/plugins/source/aws/docs/tables/aws_resourcegroups_resource_groups.md index 7b8ef3e8a90632..531d9d225a169f 100644 --- a/plugins/source/aws/docs/tables/aws_resourcegroups_resource_groups.md +++ b/plugins/source/aws/docs/tables/aws_resourcegroups_resource_groups.md @@ -4,17 +4,18 @@ This table shows data for Resourcegroups Resource Groups. https://docs.aws.amazon.com/ARG/latest/APIReference/API_GetGroupQuery.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |group_arn|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_delegation_sets.md b/plugins/source/aws/docs/tables/aws_route53_delegation_sets.md index 773e2d47701c43..b2bead1db62f74 100644 --- a/plugins/source/aws/docs/tables/aws_route53_delegation_sets.md +++ b/plugins/source/aws/docs/tables/aws_route53_delegation_sets.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Delegation Sets. https://docs.aws.amazon.com/Route53/latest/APIReference/API_DelegationSet.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |name_servers|`list`| |caller_reference|`utf8`| |id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_route53_domains.md b/plugins/source/aws/docs/tables/aws_route53_domains.md index 75c532204ffc56..0ace22d1929dce 100644 --- a/plugins/source/aws/docs/tables/aws_route53_domains.md +++ b/plugins/source/aws/docs/tables/aws_route53_domains.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Domains. https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetDomainDetail.html -The composite primary key for this table is (**account_id**, **domain_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **domain_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|domain_name (PK)|`utf8`| +|account_id|`utf8`| +|domain_name|`utf8`| |tags|`json`| |transfer_lock|`bool`| |abuse_contact_email|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_health_checks.md b/plugins/source/aws/docs/tables/aws_route53_health_checks.md index a21cbead101fce..34088fc7c337d8 100644 --- a/plugins/source/aws/docs/tables/aws_route53_health_checks.md +++ b/plugins/source/aws/docs/tables/aws_route53_health_checks.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Health Checks. https://docs.aws.amazon.com/Route53/latest/APIReference/API_HealthCheck.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |cloud_watch_alarm_configuration_dimensions|`json`| |caller_reference|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_query_logging_configs.md b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_query_logging_configs.md index b39aa3637b319f..41e2bbcaca349a 100644 --- a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_query_logging_configs.md +++ b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_query_logging_configs.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Hosted Zone Query Logging Configs. https://docs.aws.amazon.com/Route53/latest/APIReference/API_QueryLoggingConfig.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). @@ -14,10 +14,10 @@ This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |hosted_zone_arn|`utf8`| |cloud_watch_logs_log_group_arn|`utf8`| |hosted_zone_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_resource_record_sets.md b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_resource_record_sets.md index a45688db0469ae..1e77afbff6e217 100644 --- a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_resource_record_sets.md +++ b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_resource_record_sets.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Hosted Zone Resource Record Sets. https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html -The composite primary key for this table is (**hosted_zone_arn**, **name**, **type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**hosted_zone_arn**, **name**, **type**). ## Relations This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). @@ -14,12 +14,12 @@ This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|hosted_zone_arn (PK)|`utf8`| -|name (PK)|`utf8`| -|type (PK)|`utf8`| +|hosted_zone_arn|`utf8`| +|name|`utf8`| +|type|`utf8`| |alias_target|`json`| |cidr_routing_config|`json`| |failover|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_traffic_policy_instances.md b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_traffic_policy_instances.md index f3ff77a5cbd5fb..c479047b613b0e 100644 --- a/plugins/source/aws/docs/tables/aws_route53_hosted_zone_traffic_policy_instances.md +++ b/plugins/source/aws/docs/tables/aws_route53_hosted_zone_traffic_policy_instances.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Hosted Zone Traffic Policy Instances. https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicyInstance.html -The composite primary key for this table is (**account_id**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **arn**). ## Relations This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). @@ -14,10 +14,10 @@ This table depends on [aws_route53_hosted_zones](aws_route53_hosted_zones.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|arn|`utf8`| |hosted_zone_arn|`utf8`| |hosted_zone_id|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_hosted_zones.md b/plugins/source/aws/docs/tables/aws_route53_hosted_zones.md index e3c8373511a979..040ee027cb9cd5 100644 --- a/plugins/source/aws/docs/tables/aws_route53_hosted_zones.md +++ b/plugins/source/aws/docs/tables/aws_route53_hosted_zones.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Hosted Zones. https://docs.aws.amazon.com/Route53/latest/APIReference/API_HostedZone.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_route53_hosted_zones: @@ -17,10 +17,10 @@ The following tables depend on aws_route53_hosted_zones: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |caller_reference|`utf8`| |id|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_operations.md b/plugins/source/aws/docs/tables/aws_route53_operations.md index b1f60d9bb059c5..1b5d8f9751197c 100644 --- a/plugins/source/aws/docs/tables/aws_route53_operations.md +++ b/plugins/source/aws/docs/tables/aws_route53_operations.md @@ -4,20 +4,21 @@ This table shows data for Amazon Route 53 Operations. https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html -The composite primary key for this table is (**account_id**, **operation_id**, **status**, **submitted_date**, **type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **operation_id**, **status**, **submitted_date**, **type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |domain_name|`utf8`| |last_updated_date|`timestamp[us, tz=UTC]`| |message|`utf8`| -|operation_id (PK)|`utf8`| -|status (PK)|`utf8`| +|operation_id|`utf8`| +|status|`utf8`| |status_flag|`utf8`| -|submitted_date (PK)|`timestamp[us, tz=UTC]`| -|type (PK)|`utf8`| \ No newline at end of file +|submitted_date|`timestamp[us, tz=UTC]`| +|type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_route53_traffic_policies.md b/plugins/source/aws/docs/tables/aws_route53_traffic_policies.md index 13f34e074ba2b1..d3fe261d5b31a4 100644 --- a/plugins/source/aws/docs/tables/aws_route53_traffic_policies.md +++ b/plugins/source/aws/docs/tables/aws_route53_traffic_policies.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Traffic Policies. https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicySummary.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_route53_traffic_policies: @@ -15,10 +15,10 @@ The following tables depend on aws_route53_traffic_policies: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |id|`utf8`| |latest_version|`int64`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53_traffic_policy_versions.md b/plugins/source/aws/docs/tables/aws_route53_traffic_policy_versions.md index 46f2b090bb079a..0def7ce0b998a3 100644 --- a/plugins/source/aws/docs/tables/aws_route53_traffic_policy_versions.md +++ b/plugins/source/aws/docs/tables/aws_route53_traffic_policy_versions.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Traffic Policy Versions. https://docs.aws.amazon.com/Route53/latest/APIReference/API_TrafficPolicy.html -The composite primary key for this table is (**traffic_policy_arn**, **id**, **version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**traffic_policy_arn**, **id**, **version**). ## Relations This table depends on [aws_route53_traffic_policies](aws_route53_traffic_policies.md). @@ -14,12 +14,12 @@ This table depends on [aws_route53_traffic_policies](aws_route53_traffic_policie | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|traffic_policy_arn (PK)|`utf8`| -|id (PK)|`utf8`| -|version (PK)|`int64`| +|traffic_policy_arn|`utf8`| +|id|`utf8`| +|version|`int64`| |document|`json`| |name|`utf8`| |type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_clusters.md b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_clusters.md index f091392b9aea5a..626f0b706307b8 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_clusters.md +++ b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_clusters.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-cluster/latest/api/cluster.html -The composite primary key for this table is (**request_account_id**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|arn (PK)|`utf8`| +|request_account_id|`utf8`| +|arn|`utf8`| |cluster_arn|`utf8`| |cluster_endpoints|`json`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_control_panels.md b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_control_panels.md index d0e2028ae38aeb..ed4490c9a28cff 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_control_panels.md +++ b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_control_panels.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-cluster/latest/api/controlpanels.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_route53recoverycontrolconfig_control_panels: @@ -16,10 +16,10 @@ The following tables depend on aws_route53recoverycontrolconfig_control_panels: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cluster_arn|`utf8`| |control_panel_arn|`utf8`| |default_control_panel|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_routing_controls.md b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_routing_controls.md index 4196ceb5fa6754..6b44030f6bc2cf 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_routing_controls.md +++ b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_routing_controls.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/routing-control/latest/APIReference/API_ListRoutingControls.html -The composite primary key for this table is (**arn**, **control_panel_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**arn**, **control_panel_arn**). ## Relations This table depends on [aws_route53recoverycontrolconfig_control_panels](aws_route53recoverycontrolconfig_control_panels.md). @@ -14,11 +14,11 @@ This table depends on [aws_route53recoverycontrolconfig_control_panels](aws_rout | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| -|control_panel_arn (PK)|`utf8`| +|arn|`utf8`| +|control_panel_arn|`utf8`| |name|`utf8`| |owner|`utf8`| |routing_control_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_safety_rules.md b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_safety_rules.md index 82529643b81fb8..f46961d4f5f639 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_safety_rules.md +++ b/plugins/source/aws/docs/tables/aws_route53recoverycontrolconfig_safety_rules.md @@ -4,8 +4,8 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-cluster/latest/api/controlpanel-controlpanelarn-safetyrules.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_route53recoverycontrolconfig_control_panels](aws_route53recoverycontrolconfig_control_panels.md). @@ -14,9 +14,9 @@ This table depends on [aws_route53recoverycontrolconfig_control_panels](aws_rout | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |assertion|`json`| |gating|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_cells.md b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_cells.md index c66b802fdce87b..13e7cfe53ded2b 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_cells.md +++ b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_cells.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-readiness/latest/api/cells.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cell_arn|`utf8`| |cell_name|`utf8`| |cells|`list`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_readiness_checks.md b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_readiness_checks.md index 3ffe79a576d632..97a2d8ef03930f 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_readiness_checks.md +++ b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_readiness_checks.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-readiness/latest/api/readinesschecks.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |readiness_check_arn|`utf8`| |resource_set|`utf8`| |readiness_check_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_recovery_groups.md b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_recovery_groups.md index f34a392eb3cff7..d62b2ac6ce3070 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_recovery_groups.md +++ b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_recovery_groups.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-readiness/latest/api/recoverygroups.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |cells|`list`| |recovery_group_arn|`utf8`| |recovery_group_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_resource_sets.md b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_resource_sets.md index 174e80a2e2ddb2..16fb478a49bafc 100644 --- a/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_resource_sets.md +++ b/plugins/source/aws/docs/tables/aws_route53recoveryreadiness_resource_sets.md @@ -4,16 +4,17 @@ This table shows data for Amazon Route 53 Application Recovery Controller Recove https://docs.aws.amazon.com/recovery-readiness/latest/api/resourcesets.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |resource_set_arn|`utf8`| |resource_set_name|`utf8`| |resource_set_type|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_configs.md b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_configs.md index 154125ca235f6e..ec2ba2d43139b3 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_configs.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_configs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Firewall Configs. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallConfig.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |firewall_fail_open|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |owner_id|`utf8`| |resource_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_domain_lists.md b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_domain_lists.md index e583bad57b74d0..cd26ce3f8b3050 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_domain_lists.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_domain_lists.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Firewall Domain Lists. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallDomainList.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`utf8`| |creator_request_id|`utf8`| |domain_count|`int64`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_group_associations.md b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_group_associations.md index 48ab4a1ec223e7..1780f156838837 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_group_associations.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_group_associations.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Firewall Rule Group Associati https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallRuleGroupAssociation.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`utf8`| |creator_request_id|`utf8`| |firewall_rule_group_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_groups.md b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_groups.md index 84b6db2cbd8571..b4a0fdffbd32b5 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_firewall_rule_groups.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Firewall Rule Groups. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallRuleGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`utf8`| |creator_request_id|`utf8`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_endpoints.md b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_endpoints.md index 79a32ee41f0c32..7897d09c2b2754 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_endpoints.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_endpoints.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Resolver Endpoints. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverEndpoint.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`utf8`| |creator_request_id|`utf8`| |direction|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_config_associations.md b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_config_associations.md index db7d8631a9c27e..a25eff4d10a568 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_config_associations.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_config_associations.md @@ -4,20 +4,21 @@ This table shows data for Amazon Route 53 Resolver Resolver Query Log Config Ass https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverQueryLogConfigAssociation.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |creation_time|`utf8`| |error|`utf8`| |error_message|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |resolver_query_log_config_id|`utf8`| |resource_id|`utf8`| |status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_configs.md b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_configs.md index 026245788a8a92..93a954fb23f215 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_configs.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_query_log_configs.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Resolver Query Log Configs. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverQueryLogConfig.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |association_count|`int64`| |creation_time|`utf8`| |creator_request_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rule_associations.md b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rule_associations.md index 8f9cd80bdb03b4..69e5ad6db9c528 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rule_associations.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rule_associations.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Resolver Rule Associations. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverRuleAssociation.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |name|`utf8`| |resolver_rule_id|`utf8`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rules.md b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rules.md index e97157de3860e5..d4ef1d02585945 100644 --- a/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rules.md +++ b/plugins/source/aws/docs/tables/aws_route53resolver_resolver_rules.md @@ -4,17 +4,18 @@ This table shows data for Amazon Route 53 Resolver Resolver Rules. https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverRule.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`utf8`| |creator_request_id|`utf8`| |domain_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_s3_access_points.md b/plugins/source/aws/docs/tables/aws_s3_access_points.md index 8ab0299b835072..5595c2bf38b407 100644 --- a/plugins/source/aws/docs/tables/aws_s3_access_points.md +++ b/plugins/source/aws/docs/tables/aws_s3_access_points.md @@ -4,17 +4,18 @@ This table shows data for S3 Access Points. https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_AccessPoint.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |bucket|`utf8`| |name|`utf8`| |network_origin|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_s3_accounts.md b/plugins/source/aws/docs/tables/aws_s3_accounts.md index 0490ace9bc316e..eb4c25562f8b2d 100644 --- a/plugins/source/aws/docs/tables/aws_s3_accounts.md +++ b/plugins/source/aws/docs/tables/aws_s3_accounts.md @@ -4,15 +4,16 @@ This table shows data for S3 Accounts. https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_PublicAccessBlockConfiguration.html -The primary key for this table is **account_id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **account_id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| +|account_id|`utf8`| |block_public_acls|`bool`| |block_public_policy|`bool`| |ignore_public_acls|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_cors_rules.md b/plugins/source/aws/docs/tables/aws_s3_bucket_cors_rules.md index 217ee35ccb79e8..227118bd751ff2 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_cors_rules.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_cors_rules.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Cors Rules. https://docs.aws.amazon.com/AmazonS3/latest/API/API_CORSRule.html -The composite primary key for this table is (**bucket_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**bucket_arn**, **id**). ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,13 +14,13 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |allowed_methods|`list`| |allowed_origins|`list`| |allowed_headers|`list`| |expose_headers|`list`| -|id (PK)|`utf8`| +|id|`utf8`| |max_age_seconds|`int64`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_encryption_rules.md b/plugins/source/aws/docs/tables/aws_s3_bucket_encryption_rules.md index 76058d40081220..a4bdaf2db1c521 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_encryption_rules.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_encryption_rules.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Encryption Rules. https://docs.aws.amazon.com/AmazonS3/latest/API/API_ServerSideEncryptionRule.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,9 +14,9 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |apply_server_side_encryption_by_default|`json`| |bucket_key_enabled|`bool`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_grants.md b/plugins/source/aws/docs/tables/aws_s3_bucket_grants.md index da47737972024f..edcdb211df32bd 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_grants.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_grants.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Grants. https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grant.html -The composite primary key for this table is (**bucket_arn**, **grantee_type**, **grantee_id**, **permission**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**bucket_arn**, **grantee_type**, **grantee_id**, **permission**). ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,11 +14,11 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| -|grantee_type (PK)|`utf8`| -|grantee_id (PK)|`utf8`| -|permission (PK)|`utf8`| +|bucket_arn|`utf8`| +|grantee_type|`utf8`| +|grantee_id|`utf8`| +|permission|`utf8`| |grantee|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_lifecycles.md b/plugins/source/aws/docs/tables/aws_s3_bucket_lifecycles.md index e97f78466f1bf0..8155423272e778 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_lifecycles.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_lifecycles.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Lifecycles. https://docs.aws.amazon.com/AmazonS3/latest/API/API_LifecycleRule.html -The composite primary key for this table is (**bucket_arn**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**bucket_arn**, **id**). ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,14 +14,14 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |status|`utf8`| |abort_incomplete_multipart_upload|`json`| |expiration|`json`| -|id (PK)|`utf8`| +|id|`utf8`| |noncurrent_version_expiration|`json`| |noncurrent_version_transitions|`json`| |prefix|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_loggings.md b/plugins/source/aws/docs/tables/aws_s3_bucket_loggings.md index afefbe83e9cc38..384a7268a5525c 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_loggings.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_loggings.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Loggings. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketLogging.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,8 +14,8 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |logging_enabled|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_notification_configurations.md b/plugins/source/aws/docs/tables/aws_s3_bucket_notification_configurations.md index fb7593fccb299d..54c8627a1ee41b 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_notification_configurations.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_notification_configurations.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Notification Configurations. https://docs.aws.amazon.com/AmazonS3/latest/API/API_NotificationConfiguration.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,10 +14,10 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |event_bridge_configuration|`json`| |lambda_function_configurations|`json`| |queue_configurations|`json`| diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_object_lock_configurations.md b/plugins/source/aws/docs/tables/aws_s3_bucket_object_lock_configurations.md index b92b887f724baa..e2bf85ac04769c 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_object_lock_configurations.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_object_lock_configurations.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Object Lock Configurations. https://docs.aws.amazon.com/AmazonS3/latest/API/API_ObjectLockConfiguration.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,9 +14,9 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |object_lock_enabled|`utf8`| |rule|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_ownership_controls.md b/plugins/source/aws/docs/tables/aws_s3_bucket_ownership_controls.md index b25d41bca4e534..3d52ee22841f32 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_ownership_controls.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_ownership_controls.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Ownership Controls. https://docs.aws.amazon.com/AmazonS3/latest/API/API_OwnershipControlsRule.html -The composite primary key for this table is (**bucket_arn**, **object_ownership**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**bucket_arn**, **object_ownership**). ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,8 +14,8 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| -|object_ownership (PK)|`utf8`| \ No newline at end of file +|bucket_arn|`utf8`| +|object_ownership|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_policies.md b/plugins/source/aws/docs/tables/aws_s3_bucket_policies.md index 9064dd130ec9bc..3435562741f11c 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_policies.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_policies.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Policies. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketPolicy.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,9 +14,9 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |policy_json|`json`| |policy|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_public_access_blocks.md b/plugins/source/aws/docs/tables/aws_s3_bucket_public_access_blocks.md index dd67a7a8987345..349e12e7450d87 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_public_access_blocks.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_public_access_blocks.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Public Access Blocks. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetPublicAccessBlock.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,8 +14,8 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |public_access_block_configuration|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_replications.md b/plugins/source/aws/docs/tables/aws_s3_bucket_replications.md index 9ee4d2703b1b6b..29753d905dece1 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_replications.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_replications.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Replications. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketReplication.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,8 +14,8 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |replication_configuration|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_versionings.md b/plugins/source/aws/docs/tables/aws_s3_bucket_versionings.md index c8b5feeb28db17..93096187bc9e06 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_versionings.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_versionings.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Versionings. https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketVersioning.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,9 +14,9 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |mfa_delete|`utf8`| |status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_s3_bucket_websites.md b/plugins/source/aws/docs/tables/aws_s3_bucket_websites.md index f6d2542cdd4f12..ae6ef7108a8b0f 100644 --- a/plugins/source/aws/docs/tables/aws_s3_bucket_websites.md +++ b/plugins/source/aws/docs/tables/aws_s3_bucket_websites.md @@ -4,8 +4,8 @@ This table shows data for S3 Bucket Websites. https://docs.aws.amazon.com/AmazonS3/latest/API/API_WebsiteConfiguration.html -The primary key for this table is **bucket_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **bucket_arn**. ## Relations This table depends on [aws_s3_buckets](aws_s3_buckets.md). @@ -14,10 +14,10 @@ This table depends on [aws_s3_buckets](aws_s3_buckets.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|bucket_arn (PK)|`utf8`| +|bucket_arn|`utf8`| |error_document|`json`| |index_document|`json`| |redirect_all_requests_to|`json`| diff --git a/plugins/source/aws/docs/tables/aws_s3_buckets.md b/plugins/source/aws/docs/tables/aws_s3_buckets.md index d7f6dd94922bff..136c6403b2fa29 100644 --- a/plugins/source/aws/docs/tables/aws_s3_buckets.md +++ b/plugins/source/aws/docs/tables/aws_s3_buckets.md @@ -4,8 +4,8 @@ This table shows data for S3 Buckets. https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_s3_buckets: @@ -27,10 +27,10 @@ The following tables depend on aws_s3_buckets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| |name|`utf8`| |region|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_s3_multi_region_access_points.md b/plugins/source/aws/docs/tables/aws_s3_multi_region_access_points.md index 802b9f8ab6e626..ac793e6794df3d 100644 --- a/plugins/source/aws/docs/tables/aws_s3_multi_region_access_points.md +++ b/plugins/source/aws/docs/tables/aws_s3_multi_region_access_points.md @@ -4,16 +4,17 @@ This table shows data for S3 Multi Region Access Points. https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_MultiRegionAccessPointReport.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |alias|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_apps.md b/plugins/source/aws/docs/tables/aws_sagemaker_apps.md index 944bb9f1823cc9..17730afd334e82 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_apps.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_apps.md @@ -4,17 +4,18 @@ This table shows data for Amazon SageMaker Apps. https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_DescribeApp.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |app_arn|`utf8`| |app_name|`utf8`| 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 25603a36a52b2a..66cc23fd9f1b04 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_endpoint_configurations.md @@ -4,17 +4,18 @@ This table shows data for Amazon SageMaker Endpoint Configurations. https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_DescribeEndpointConfig.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |endpoint_config_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_sagemaker_models.md b/plugins/source/aws/docs/tables/aws_sagemaker_models.md index 2d4d2587096376..e3cae7e2a010e8 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_models.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_models.md @@ -4,17 +4,18 @@ This table shows data for Amazon SageMaker Models. https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_DescribeModel.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_time|`timestamp[us, tz=UTC]`| |model_arn|`utf8`| 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 e9b251247aa2a1..feb26d398f8beb 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_notebook_instances.md @@ -4,17 +4,18 @@ This table shows data for Amazon SageMaker Notebook Instances. https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_DescribeNotebookInstance.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |accelerator_types|`list`| |additional_code_repositories|`list`| 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 dc8bf3c091d7c3..c039de87aee34c 100644 --- a/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md +++ b/plugins/source/aws/docs/tables/aws_sagemaker_training_jobs.md @@ -4,17 +4,18 @@ This table shows data for Amazon SageMaker Training Jobs. https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_DescribeTrainingJob.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |algorithm_specification|`json`| |creation_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_savingsplans_plans.md b/plugins/source/aws/docs/tables/aws_savingsplans_plans.md index 4d591c3a31a274..3f3e4644d1335b 100644 --- a/plugins/source/aws/docs/tables/aws_savingsplans_plans.md +++ b/plugins/source/aws/docs/tables/aws_savingsplans_plans.md @@ -4,16 +4,17 @@ This table shows data for Savingsplans Plans. https://docs.aws.amazon.com/savingsplans/latest/APIReference/API_SavingsPlan.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |commitment|`utf8`| |currency|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_scheduler_schedule_groups.md b/plugins/source/aws/docs/tables/aws_scheduler_schedule_groups.md index 02774f86146580..975b6d7d9dfcee 100644 --- a/plugins/source/aws/docs/tables/aws_scheduler_schedule_groups.md +++ b/plugins/source/aws/docs/tables/aws_scheduler_schedule_groups.md @@ -4,18 +4,19 @@ This table shows data for Amazon EventBridge Scheduler Schedule Groups. https://docs.aws.amazon.com/scheduler/latest/APIReference/API_ScheduleGroupSummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| |last_modification_date|`timestamp[us, tz=UTC]`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_scheduler_schedules.md b/plugins/source/aws/docs/tables/aws_scheduler_schedules.md index b237dd41589ef5..9cf489bc773a24 100644 --- a/plugins/source/aws/docs/tables/aws_scheduler_schedules.md +++ b/plugins/source/aws/docs/tables/aws_scheduler_schedules.md @@ -4,18 +4,19 @@ This table shows data for Amazon EventBridge Scheduler Schedules. https://docs.aws.amazon.com/scheduler/latest/APIReference/API_GetScheduleOutput.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |action_after_completion|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_secretsmanager_secret_versions.md b/plugins/source/aws/docs/tables/aws_secretsmanager_secret_versions.md index 11ab2600dcc1b7..b8b715765be72b 100644 --- a/plugins/source/aws/docs/tables/aws_secretsmanager_secret_versions.md +++ b/plugins/source/aws/docs/tables/aws_secretsmanager_secret_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS Secrets Manager Secret Versions. https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecretVersionIds.html -The composite primary key for this table is (**secret_arn**, **version_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**secret_arn**, **version_id**). ## Relations This table depends on [aws_secretsmanager_secrets](aws_secretsmanager_secrets.md). @@ -14,13 +14,13 @@ This table depends on [aws_secretsmanager_secrets](aws_secretsmanager_secrets.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|secret_arn (PK)|`utf8`| +|secret_arn|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |kms_key_ids|`list`| |last_accessed_date|`timestamp[us, tz=UTC]`| -|version_id (PK)|`utf8`| +|version_id|`utf8`| |version_stages|`list`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md b/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md index afaed9d9ac7f43..b1204d2a01101a 100644 --- a/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md +++ b/plugins/source/aws/docs/tables/aws_secretsmanager_secrets.md @@ -4,8 +4,8 @@ This table shows data for AWS Secrets Manager Secrets. https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecrets.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_secretsmanager_secrets: @@ -15,11 +15,11 @@ The following tables depend on aws_secretsmanager_secrets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |policy|`json`| |tags|`json`| |created_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_securityhub_enabled_standards.md b/plugins/source/aws/docs/tables/aws_securityhub_enabled_standards.md index 50a77327215f6d..a237752f402720 100644 --- a/plugins/source/aws/docs/tables/aws_securityhub_enabled_standards.md +++ b/plugins/source/aws/docs/tables/aws_securityhub_enabled_standards.md @@ -4,18 +4,19 @@ This table shows data for AWS Security Hub Enabled Standards. https://docs.aws.amazon.com/securityhub/1.0/APIReference/API_GetEnabledStandards.html -The composite primary key for this table is (**account_id**, **region**, **standards_arn**, **standards_subscription_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **standards_arn**, **standards_subscription_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|standards_arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|standards_arn|`utf8`| |standards_input|`json`| |standards_status|`utf8`| -|standards_subscription_arn (PK)|`utf8`| +|standards_subscription_arn|`utf8`| |standards_status_reason|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_securityhub_findings.md b/plugins/source/aws/docs/tables/aws_securityhub_findings.md index 5b564a7aa91acd..07b3cced11e12c 100644 --- a/plugins/source/aws/docs/tables/aws_securityhub_findings.md +++ b/plugins/source/aws/docs/tables/aws_securityhub_findings.md @@ -6,26 +6,27 @@ https://docs.aws.amazon.com/securityhub/1.0/APIReference/API_GetFindings.html The `request_account_id` and `request_region` columns are added to show the account and region of where the request was made from. This is useful when multi region and account aggregation is enabled. -The composite primary key for this table is (**request_account_id**, **request_region**, **aws_account_id**, **created_at**, **description**, **generator_id**, **id**, **product_arn**, **schema_version**, **title**, **updated_at**, **region**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**request_account_id**, **request_region**, **aws_account_id**, **created_at**, **description**, **generator_id**, **id**, **product_arn**, **schema_version**, **title**, **updated_at**, **region**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|request_account_id (PK)|`utf8`| -|request_region (PK)|`utf8`| -|aws_account_id (PK)|`utf8`| -|created_at (PK)|`timestamp[us, tz=UTC]`| -|description (PK)|`utf8`| -|generator_id (PK)|`utf8`| -|id (PK)|`utf8`| -|product_arn (PK)|`utf8`| +|request_account_id|`utf8`| +|request_region|`utf8`| +|aws_account_id|`utf8`| +|created_at|`timestamp[us, tz=UTC]`| +|description|`utf8`| +|generator_id|`utf8`| +|id|`utf8`| +|product_arn|`utf8`| |resources|`json`| -|schema_version (PK)|`utf8`| -|title (PK)|`utf8`| -|updated_at (PK)|`timestamp[us, tz=UTC]`| +|schema_version|`utf8`| +|title|`utf8`| +|updated_at|`timestamp[us, tz=UTC]`| |action|`json`| |aws_account_name|`utf8`| |company_name|`utf8`| @@ -46,7 +47,7 @@ The composite primary key for this table is (**request_account_id**, **request_r |product_fields|`json`| |product_name|`utf8`| |record_state|`utf8`| -|region (PK)|`utf8`| +|region|`utf8`| |related_findings|`json`| |remediation|`json`| |sample|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_securityhub_hubs.md b/plugins/source/aws/docs/tables/aws_securityhub_hubs.md index 473ab16bff4388..854de3b0f76044 100644 --- a/plugins/source/aws/docs/tables/aws_securityhub_hubs.md +++ b/plugins/source/aws/docs/tables/aws_securityhub_hubs.md @@ -4,18 +4,19 @@ This table shows data for AWS Security Hub Hubs. https://docs.aws.amazon.com/securityhub/1.0/APIReference/API_DescribeHub.html -The composite primary key for this table is (**account_id**, **region**, **hub_arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **hub_arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |tags|`json`| |auto_enable_controls|`bool`| |control_finding_generator|`utf8`| -|hub_arn (PK)|`utf8`| +|hub_arn|`utf8`| |subscribed_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_launch_paths.md b/plugins/source/aws/docs/tables/aws_servicecatalog_launch_paths.md index a85bd4224adb4c..2ce603973227e5 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_launch_paths.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_launch_paths.md @@ -4,8 +4,8 @@ This table shows data for AWS Service Catalog Launch Paths. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_LaunchPathSummary.html -The composite primary key for this table is (**account_id**, **region**, **provisioned_product_arn**, **product_id**, **provisioning_artifact_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **provisioned_product_arn**, **product_id**, **provisioning_artifact_id**). ## Relations This table depends on [aws_servicecatalog_provisioned_products](aws_servicecatalog_provisioned_products.md). @@ -17,13 +17,13 @@ The following tables depend on aws_servicecatalog_launch_paths: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|provisioned_product_arn (PK)|`utf8`| -|product_id (PK)|`utf8`| -|provisioning_artifact_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|provisioned_product_arn|`utf8`| +|product_id|`utf8`| +|provisioning_artifact_id|`utf8`| |tags|`json`| |constraint_summaries|`json`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_portfolios.md b/plugins/source/aws/docs/tables/aws_servicecatalog_portfolios.md index 454a011ff65e89..2d0cfc1503f67f 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_portfolios.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_portfolios.md @@ -4,17 +4,18 @@ This table shows data for AWS Service Catalog Portfolios. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_DescribePortfolio.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |budgets|`json`| |portfolio_detail|`json`| diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_products.md b/plugins/source/aws/docs/tables/aws_servicecatalog_products.md index 3f858ff5eee6b0..01c8cd69c1d57f 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_products.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_products.md @@ -4,17 +4,18 @@ This table shows data for AWS Service Catalog Products. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_DescribeProductAsAdmin.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |budgets|`json`| |product_view_detail|`json`| diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioned_products.md b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioned_products.md index 1c169f4d4169ff..6077be20c13e86 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioned_products.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioned_products.md @@ -4,8 +4,8 @@ This table shows data for AWS Service Catalog Provisioned Products. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_ProvisionedProductAttribute.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_servicecatalog_provisioned_products: @@ -16,11 +16,11 @@ The following tables depend on aws_servicecatalog_provisioned_products: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_time|`timestamp[us, tz=UTC]`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_artifacts.md b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_artifacts.md index 30f80d9e1402fc..effa11fe836dae 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_artifacts.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_artifacts.md @@ -4,8 +4,8 @@ This table shows data for AWS Service Catalog Provisioning Artifacts. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_DescribeProvisioningArtifact.html -The composite primary key for this table is (**provisioned_product_arn**, **product_id**, **provisioning_artifact_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**provisioned_product_arn**, **product_id**, **provisioning_artifact_id**). ## Relations This table depends on [aws_servicecatalog_provisioned_products](aws_servicecatalog_provisioned_products.md). @@ -14,13 +14,13 @@ This table depends on [aws_servicecatalog_provisioned_products](aws_servicecatal | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|provisioned_product_arn (PK)|`utf8`| -|product_id (PK)|`utf8`| -|provisioning_artifact_id (PK)|`utf8`| +|provisioned_product_arn|`utf8`| +|product_id|`utf8`| +|provisioning_artifact_id|`utf8`| |info|`json`| |provisioning_artifact_detail|`json`| |provisioning_artifact_parameters|`json`| diff --git a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_parameters.md b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_parameters.md index f43b9d4321258b..300ffa940db88c 100644 --- a/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_parameters.md +++ b/plugins/source/aws/docs/tables/aws_servicecatalog_provisioning_parameters.md @@ -4,8 +4,8 @@ This table shows data for AWS Service Catalog Provisioning Parameters. https://docs.aws.amazon.com/servicecatalog/latest/dg/API_DescribeProvisioningParameters.html -The composite primary key for this table is (**account_id**, **region**, **provisioned_product_arn**, **product_id**, **provisioning_artifact_id**, **path_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **provisioned_product_arn**, **product_id**, **provisioning_artifact_id**, **path_id**). ## Relations This table depends on [aws_servicecatalog_launch_paths](aws_servicecatalog_launch_paths.md). @@ -14,14 +14,14 @@ This table depends on [aws_servicecatalog_launch_paths](aws_servicecatalog_launc | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|provisioned_product_arn (PK)|`utf8`| -|product_id (PK)|`utf8`| -|provisioning_artifact_id (PK)|`utf8`| -|path_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|provisioned_product_arn|`utf8`| +|product_id|`utf8`| +|provisioning_artifact_id|`utf8`| +|path_id|`utf8`| |constraint_summaries|`json`| |provisioning_artifact_output_keys|`json`| |provisioning_artifact_parameters|`json`| diff --git a/plugins/source/aws/docs/tables/aws_servicediscovery_instances.md b/plugins/source/aws/docs/tables/aws_servicediscovery_instances.md index d58c8a23b8b98a..51aacfa477f6b6 100644 --- a/plugins/source/aws/docs/tables/aws_servicediscovery_instances.md +++ b/plugins/source/aws/docs/tables/aws_servicediscovery_instances.md @@ -4,8 +4,8 @@ This table shows data for AWS Cloud Map Instances. https://docs.aws.amazon.com/cloud-map/latest/api/API_Instance.html -The composite primary key for this table is (**account_id**, **region**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Relations This table depends on [aws_servicediscovery_services](aws_servicediscovery_services.md). @@ -14,10 +14,10 @@ This table depends on [aws_servicediscovery_services](aws_servicediscovery_servi | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |attributes|`json`| |creator_request_id|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_servicediscovery_namespaces.md b/plugins/source/aws/docs/tables/aws_servicediscovery_namespaces.md index c4cd31231cc421..2387f3d65bb12b 100644 --- a/plugins/source/aws/docs/tables/aws_servicediscovery_namespaces.md +++ b/plugins/source/aws/docs/tables/aws_servicediscovery_namespaces.md @@ -4,18 +4,19 @@ This table shows data for AWS Cloud Map Namespaces. https://docs.aws.amazon.com/cloud-map/latest/api/API_Namespace.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |creator_request_id|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_servicediscovery_services.md b/plugins/source/aws/docs/tables/aws_servicediscovery_services.md index 60ea9ea986eaf1..6adf0a5f730830 100644 --- a/plugins/source/aws/docs/tables/aws_servicediscovery_services.md +++ b/plugins/source/aws/docs/tables/aws_servicediscovery_services.md @@ -4,8 +4,8 @@ This table shows data for AWS Cloud Map Services. https://docs.aws.amazon.com/cloud-map/latest/api/API_Service.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_servicediscovery_services: @@ -15,12 +15,12 @@ The following tables depend on aws_servicediscovery_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |create_date|`timestamp[us, tz=UTC]`| |creator_request_id|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md b/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md index 7d2def060e5413..c676b52bd28d37 100644 --- a/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md +++ b/plugins/source/aws/docs/tables/aws_servicequotas_quotas.md @@ -4,8 +4,8 @@ This table shows data for Servicequotas Quotas. https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceQuota.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_servicequotas_services](aws_servicequotas_services.md). @@ -14,11 +14,11 @@ This table depends on [aws_servicequotas_services](aws_servicequotas_services.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |adjustable|`bool`| |error_reason|`json`| |global_quota|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_servicequotas_services.md b/plugins/source/aws/docs/tables/aws_servicequotas_services.md index f458fabc0246d6..7297407c56665d 100644 --- a/plugins/source/aws/docs/tables/aws_servicequotas_services.md +++ b/plugins/source/aws/docs/tables/aws_servicequotas_services.md @@ -4,8 +4,8 @@ This table shows data for Servicequotas Services. https://docs.aws.amazon.com/servicequotas/2019-06-24/apireference/API_ServiceInfo.html -The composite primary key for this table is (**account_id**, **region**, **service_code**, **service_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **service_code**, **service_name**). ## Relations The following tables depend on aws_servicequotas_services: @@ -15,9 +15,9 @@ The following tables depend on aws_servicequotas_services: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|service_code (PK)|`utf8`| -|service_name (PK)|`utf8`| \ No newline at end of file +|account_id|`utf8`| +|region|`utf8`| +|service_code|`utf8`| +|service_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ses_active_receipt_rule_sets.md b/plugins/source/aws/docs/tables/aws_ses_active_receipt_rule_sets.md index 571f1a6afd97e2..32b01cb0b176d1 100644 --- a/plugins/source/aws/docs/tables/aws_ses_active_receipt_rule_sets.md +++ b/plugins/source/aws/docs/tables/aws_ses_active_receipt_rule_sets.md @@ -4,16 +4,17 @@ This table shows data for Amazon Simple Email Service (SES) Active Receipt Rule https://docs.aws.amazon.com/ses/latest/APIReference/API_DescribeActiveReceiptRuleSet.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|name|`utf8`| |created_timestamp|`timestamp[us, tz=UTC]`| |rules|`json`| \ No newline at end of file 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 7c19d5e90cbdb2..a722e1304cf5c5 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 @@ -4,8 +4,8 @@ This table shows data for Amazon Simple Email Service (SES) Configuration Set Ev https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_EventDestination.html -The composite primary key for this table is (**account_id**, **region**, **configuration_set_name**, **name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **configuration_set_name**, **name**). ## Relations This table depends on [aws_ses_configuration_sets](aws_ses_configuration_sets.md). @@ -14,12 +14,12 @@ This table depends on [aws_ses_configuration_sets](aws_ses_configuration_sets.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|configuration_set_name (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|configuration_set_name|`utf8`| +|name|`utf8`| |matching_event_types|`list`| |cloud_watch_destination|`json`| |enabled|`bool`| 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 cafc88cd87f7c5..9c3eea7bec2efa 100644 --- a/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md +++ b/plugins/source/aws/docs/tables/aws_ses_configuration_sets.md @@ -4,8 +4,8 @@ This table shows data for Amazon Simple Email Service (SES) Configuration Sets. https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetConfigurationSet.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ses_configuration_sets: @@ -15,11 +15,11 @@ The following tables depend on aws_ses_configuration_sets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |name|`utf8`| |delivery_options|`json`| 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 64e3fdeb3791a1..1a2c18cb5a661d 100644 --- a/plugins/source/aws/docs/tables/aws_ses_contact_lists.md +++ b/plugins/source/aws/docs/tables/aws_ses_contact_lists.md @@ -4,17 +4,18 @@ This table shows data for Amazon Simple Email Service (SES) Contact Lists. https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetContactList.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|name|`utf8`| |tags|`json`| |contact_list_name|`utf8`| |created_timestamp|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_ses_custom_verification_email_templates.md b/plugins/source/aws/docs/tables/aws_ses_custom_verification_email_templates.md index 7265ea9444b0e5..9e32a31fe8213f 100644 --- a/plugins/source/aws/docs/tables/aws_ses_custom_verification_email_templates.md +++ b/plugins/source/aws/docs/tables/aws_ses_custom_verification_email_templates.md @@ -4,17 +4,18 @@ This table shows data for Amazon Simple Email Service (SES) Custom Verification https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetCustomVerificationEmailTemplate.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |failure_redirection_url|`utf8`| |from_email_address|`utf8`| |success_redirection_url|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ses_identities.md b/plugins/source/aws/docs/tables/aws_ses_identities.md index 6275b4ba0df876..533aac8f8896f2 100644 --- a/plugins/source/aws/docs/tables/aws_ses_identities.md +++ b/plugins/source/aws/docs/tables/aws_ses_identities.md @@ -4,17 +4,18 @@ This table shows data for Amazon Simple Email Service (SES) Identities. https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetEmailIdentity.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |identity_name|`utf8`| |sending_enabled|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_ses_templates.md b/plugins/source/aws/docs/tables/aws_ses_templates.md index be60c6d697a6b8..7aa5a67fe288b3 100644 --- a/plugins/source/aws/docs/tables/aws_ses_templates.md +++ b/plugins/source/aws/docs/tables/aws_ses_templates.md @@ -4,17 +4,18 @@ This table shows data for Amazon Simple Email Service (SES) Templates. https://docs.aws.amazon.com/ses/latest/APIReference-V2/API_GetEmailTemplate.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |template_name|`utf8`| |html|`utf8`| |subject|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_shield_attacks.md b/plugins/source/aws/docs/tables/aws_shield_attacks.md index 7c211a292b2374..82dd405aed75d1 100644 --- a/plugins/source/aws/docs/tables/aws_shield_attacks.md +++ b/plugins/source/aws/docs/tables/aws_shield_attacks.md @@ -4,16 +4,17 @@ This table shows data for Shield Attacks. https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_AttackDetail.html -The primary key for this table is **id**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **id**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |attack_counters|`json`| |attack_id|`utf8`| |attack_properties|`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 b03547ad91e386..90f374567876b9 100644 --- a/plugins/source/aws/docs/tables/aws_shield_protection_groups.md +++ b/plugins/source/aws/docs/tables/aws_shield_protection_groups.md @@ -4,16 +4,17 @@ This table shows data for Shield Protection Groups. https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_ProtectionGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |aggregation|`utf8`| |members|`list`| diff --git a/plugins/source/aws/docs/tables/aws_shield_protections.md b/plugins/source/aws/docs/tables/aws_shield_protections.md index 8b4b34af6f41d8..d2b86f9e64a98b 100644 --- a/plugins/source/aws/docs/tables/aws_shield_protections.md +++ b/plugins/source/aws/docs/tables/aws_shield_protections.md @@ -4,16 +4,17 @@ This table shows data for Shield Protections. https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Protection.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |application_layer_automatic_response_configuration|`json`| |health_check_ids|`list`| diff --git a/plugins/source/aws/docs/tables/aws_shield_subscriptions.md b/plugins/source/aws/docs/tables/aws_shield_subscriptions.md index f04289438b9541..e6504b72f76cee 100644 --- a/plugins/source/aws/docs/tables/aws_shield_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_shield_subscriptions.md @@ -4,16 +4,17 @@ This table shows data for Shield Subscriptions. https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_Subscription.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |subscription_limits|`json`| |auto_renew|`utf8`| |end_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_signer_signing_profiles.md b/plugins/source/aws/docs/tables/aws_signer_signing_profiles.md index 8c548d6978f963..34ff14b5d03f5d 100644 --- a/plugins/source/aws/docs/tables/aws_signer_signing_profiles.md +++ b/plugins/source/aws/docs/tables/aws_signer_signing_profiles.md @@ -4,13 +4,14 @@ This table shows data for AWS Signer Signing Profiles. https://docs.aws.amazon.com/signer/latest/api/API_GetSigningProfile.html -The primary key for this table is **profile_version_arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **profile_version_arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| @@ -20,7 +21,7 @@ The primary key for this table is **profile_version_arn**. |platform_id|`utf8`| |profile_name|`utf8`| |profile_version|`utf8`| -|profile_version_arn (PK)|`utf8`| +|profile_version_arn|`utf8`| |revocation_record|`json`| |signature_validity_period|`json`| |signing_material|`json`| diff --git a/plugins/source/aws/docs/tables/aws_sns_subscriptions.md b/plugins/source/aws/docs/tables/aws_sns_subscriptions.md index d674f1383a37d1..b897bb51078a04 100644 --- a/plugins/source/aws/docs/tables/aws_sns_subscriptions.md +++ b/plugins/source/aws/docs/tables/aws_sns_subscriptions.md @@ -4,17 +4,18 @@ This table shows data for Sns Subscriptions. https://docs.aws.amazon.com/sns/latest/api/API_GetSubscriptionAttributes.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |delivery_policy|`json`| |effective_delivery_policy|`json`| |filter_policy|`json`| diff --git a/plugins/source/aws/docs/tables/aws_sns_topics.md b/plugins/source/aws/docs/tables/aws_sns_topics.md index 59ace4ae7199bd..cfe1b2559fde8f 100644 --- a/plugins/source/aws/docs/tables/aws_sns_topics.md +++ b/plugins/source/aws/docs/tables/aws_sns_topics.md @@ -4,17 +4,18 @@ This table shows data for Sns Topics. https://docs.aws.amazon.com/sns/latest/api/API_GetTopicAttributes.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |delivery_policy|`json`| |policy|`json`| diff --git a/plugins/source/aws/docs/tables/aws_sqs_queues.md b/plugins/source/aws/docs/tables/aws_sqs_queues.md index ce34114451af2b..2cd9b53edadaf4 100644 --- a/plugins/source/aws/docs/tables/aws_sqs_queues.md +++ b/plugins/source/aws/docs/tables/aws_sqs_queues.md @@ -4,17 +4,18 @@ This table shows data for Sqs Queues. https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_GetQueueAttributes.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |policy|`json`| |redrive_policy|`json`| |redrive_allow_policy|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_associations.md b/plugins/source/aws/docs/tables/aws_ssm_associations.md index b7fdb989d36fa1..1b787956d00705 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_associations.md +++ b/plugins/source/aws/docs/tables/aws_ssm_associations.md @@ -4,17 +4,18 @@ This table shows data for AWS Systems Manager (SSM) Associations. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_Association.html -The composite primary key for this table is (**account_id**, **region**, **association_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **association_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|association_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|association_id|`utf8`| |association_name|`utf8`| |association_version|`utf8`| |document_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_compliance_summary_items.md b/plugins/source/aws/docs/tables/aws_ssm_compliance_summary_items.md index b3cb5973fcfa36..d7de98edea64ef 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_compliance_summary_items.md +++ b/plugins/source/aws/docs/tables/aws_ssm_compliance_summary_items.md @@ -4,16 +4,17 @@ This table shows data for AWS Systems Manager (SSM) Compliance Summary Items. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceSummaryItem.html -The composite primary key for this table is (**account_id**, **region**, **compliance_type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **compliance_type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|compliance_type (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|compliance_type|`utf8`| |compliant_summary|`json`| |non_compliant_summary|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssm_document_versions.md b/plugins/source/aws/docs/tables/aws_ssm_document_versions.md index e6b3da6e682476..0daa4d33286a0d 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_document_versions.md +++ b/plugins/source/aws/docs/tables/aws_ssm_document_versions.md @@ -4,8 +4,8 @@ This table shows data for AWS Systems Manager (SSM) Document Versions. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DocumentVersionInfo.html -The composite primary key for this table is (**document_arn**, **document_version**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**document_arn**, **document_version**). ## Relations This table depends on [aws_ssm_documents](aws_ssm_documents.md). @@ -14,15 +14,15 @@ This table depends on [aws_ssm_documents](aws_ssm_documents.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|document_arn (PK)|`utf8`| +|document_arn|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |display_name|`utf8`| |document_format|`utf8`| -|document_version (PK)|`utf8`| +|document_version|`utf8`| |is_default_version|`bool`| |name|`utf8`| |review_status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_documents.md b/plugins/source/aws/docs/tables/aws_ssm_documents.md index 4f42b26399d4b7..6dd0907370e185 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_documents.md +++ b/plugins/source/aws/docs/tables/aws_ssm_documents.md @@ -4,8 +4,8 @@ This table shows data for AWS Systems Manager (SSM) Documents. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DocumentDescription.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ssm_documents: @@ -15,11 +15,11 @@ The following tables depend on aws_ssm_documents: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |permissions|`json`| |tags|`json`| |approved_version|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_instance_compliance_items.md b/plugins/source/aws/docs/tables/aws_ssm_instance_compliance_items.md index 36b083ce466f2b..78df7e2e67263a 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_instance_compliance_items.md +++ b/plugins/source/aws/docs/tables/aws_ssm_instance_compliance_items.md @@ -4,8 +4,8 @@ This table shows data for AWS Systems Manager (SSM) Instance Compliance Items. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ComplianceItem.html -The composite primary key for this table is (**id**, **instance_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**id**, **instance_arn**). ## Relations This table depends on [aws_ssm_instances](aws_ssm_instances.md). @@ -14,12 +14,12 @@ This table depends on [aws_ssm_instances](aws_ssm_instances.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|id (PK)|`utf8`| -|instance_arn (PK)|`utf8`| +|id|`utf8`| +|instance_arn|`utf8`| |compliance_type|`utf8`| |details|`json`| |execution_summary|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_instance_patches.md b/plugins/source/aws/docs/tables/aws_ssm_instance_patches.md index 98d7274bdc84ca..5b2cf5c928105a 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_instance_patches.md +++ b/plugins/source/aws/docs/tables/aws_ssm_instance_patches.md @@ -4,8 +4,8 @@ This table shows data for AWS Systems Manager (SSM) Instance Patches. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchComplianceData.html -The composite primary key for this table is (**instance_arn**, **kb_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**instance_arn**, **kb_id**). ## Relations This table depends on [aws_ssm_instances](aws_ssm_instances.md). @@ -14,12 +14,12 @@ This table depends on [aws_ssm_instances](aws_ssm_instances.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|instance_arn (PK)|`utf8`| -|kb_id (PK)|`utf8`| +|instance_arn|`utf8`| +|kb_id|`utf8`| |classification|`utf8`| |installed_time|`timestamp[us, tz=UTC]`| |severity|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_instances.md b/plugins/source/aws/docs/tables/aws_ssm_instances.md index 77f5d52eb5bd97..8c7098cda3ec37 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_instances.md +++ b/plugins/source/aws/docs/tables/aws_ssm_instances.md @@ -4,8 +4,8 @@ This table shows data for AWS Systems Manager (SSM) Instances. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InstanceInformation.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_ssm_instances: @@ -16,11 +16,11 @@ The following tables depend on aws_ssm_instances: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |activation_id|`utf8`| |agent_version|`utf8`| |association_overview|`json`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_inventories.md b/plugins/source/aws/docs/tables/aws_ssm_inventories.md index 0b5684a93e165f..939f4a6ac0ca6f 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_inventories.md +++ b/plugins/source/aws/docs/tables/aws_ssm_inventories.md @@ -4,15 +4,16 @@ This table shows data for AWS Systems Manager (SSM) Inventories. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryResultEntity.html -The composite primary key for this table is (**account_id**, **region**, **id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|id|`utf8`| |data|`json`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssm_inventory_schemas.md b/plugins/source/aws/docs/tables/aws_ssm_inventory_schemas.md index 04ae73ae5c94dd..2e5a531f5bd938 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_inventory_schemas.md +++ b/plugins/source/aws/docs/tables/aws_ssm_inventory_schemas.md @@ -4,17 +4,18 @@ This table shows data for AWS Systems Manager (SSM) Inventory Schemas. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_InventoryItemSchema.html -The composite primary key for this table is (**account_id**, **region**, **type_name**, **version**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **type_name**, **version**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|type_name (PK)|`utf8`| -|version (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|type_name|`utf8`| +|version|`utf8`| |attributes|`json`| |display_name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssm_parameters.md b/plugins/source/aws/docs/tables/aws_ssm_parameters.md index fac2241542e16e..311dacd2b23b1b 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_parameters.md +++ b/plugins/source/aws/docs/tables/aws_ssm_parameters.md @@ -4,17 +4,18 @@ This table shows data for AWS Systems Manager (SSM) Parameters. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_ParameterMetadata.html -The composite primary key for this table is (**account_id**, **region**, **name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|name (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|name|`utf8`| |allowed_pattern|`utf8`| |data_type|`utf8`| |description|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_patch_baselines.md b/plugins/source/aws/docs/tables/aws_ssm_patch_baselines.md index c752073108ba51..43b00ecf90ac71 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_patch_baselines.md +++ b/plugins/source/aws/docs/tables/aws_ssm_patch_baselines.md @@ -4,17 +4,18 @@ This table shows data for AWS Systems Manager (SSM) Patch Baselines. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchBaselineIdentity.html -The composite primary key for this table is (**account_id**, **region**, **baseline_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **baseline_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|baseline_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|baseline_id|`utf8`| |baseline_description|`utf8`| |baseline_name|`utf8`| |default_baseline|`bool`| diff --git a/plugins/source/aws/docs/tables/aws_ssm_sessions.md b/plugins/source/aws/docs/tables/aws_ssm_sessions.md index 21ad5b15d411ac..602ff9b5bec3ab 100644 --- a/plugins/source/aws/docs/tables/aws_ssm_sessions.md +++ b/plugins/source/aws/docs/tables/aws_ssm_sessions.md @@ -5,16 +5,17 @@ This table shows data for AWS Systems Manager (SSM) Sessions. https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_Session.html. Only Active sessions are fetched. -The composite primary key for this table is (**account_id**, **region**, **session_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **session_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |details|`utf8`| |document_name|`utf8`| |end_date|`timestamp[us, tz=UTC]`| @@ -22,7 +23,7 @@ The composite primary key for this table is (**account_id**, **region**, **sessi |output_url|`json`| |owner|`utf8`| |reason|`utf8`| -|session_id (PK)|`utf8`| +|session_id|`utf8`| |start_date|`timestamp[us, tz=UTC]`| |status|`utf8`| |target|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_instances.md b/plugins/source/aws/docs/tables/aws_ssoadmin_instances.md index 4ee0ee19e16d33..e92769cf26306b 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_instances.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_instances.md @@ -4,8 +4,8 @@ This table shows data for Ssoadmin Instances. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_InstanceMetadata.html -The primary key for this table is **instance_arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **instance_arn**. ## Relations The following tables depend on aws_ssoadmin_instances: @@ -15,11 +15,11 @@ The following tables depend on aws_ssoadmin_instances: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |created_date|`timestamp[us, tz=UTC]`| |identity_store_id|`utf8`| -|instance_arn (PK)|`utf8`| +|instance_arn|`utf8`| |name|`utf8`| |owner_account_id|`utf8`| |status|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_account_assignments.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_account_assignments.md index d668762233ef1b..c71e5341b25c1b 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_account_assignments.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_account_assignments.md @@ -5,8 +5,8 @@ This table shows data for Ssoadmin Permission Set Account Assignments. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_AccountAssignment.html The 'request_account_id' and 'request_region' columns are added to show the account_id and region of where the request was made from. -The composite primary key for this table is (**instance_arn**, **account_id**, **permission_set_arn**, **principal_id**, **principal_type**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**instance_arn**, **account_id**, **permission_set_arn**, **principal_id**, **principal_type**). ## Relations This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_sets.md). @@ -15,12 +15,12 @@ This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_set | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |request_account_id|`utf8`| |request_region|`utf8`| -|instance_arn (PK)|`utf8`| -|account_id (PK)|`utf8`| -|permission_set_arn (PK)|`utf8`| -|principal_id (PK)|`utf8`| -|principal_type (PK)|`utf8`| \ No newline at end of file +|instance_arn|`utf8`| +|account_id|`utf8`| +|permission_set_arn|`utf8`| +|principal_id|`utf8`| +|principal_type|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_customer_managed_policies.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_customer_managed_policies.md index f6c6a5284dc5e3..bbfb4695865562 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_customer_managed_policies.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_customer_managed_policies.md @@ -4,8 +4,8 @@ This table shows data for Ssoadmin Permission Set Customer Managed Policies. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListManagedPoliciesInPermissionSet.html -The composite primary key for this table is (**permission_set_arn**, **instance_arn**, **name**, **path**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**permission_set_arn**, **instance_arn**, **name**, **path**). ## Relations This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_sets.md). @@ -14,9 +14,9 @@ This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_set | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|permission_set_arn (PK)|`utf8`| -|instance_arn (PK)|`utf8`| -|name (PK)|`utf8`| -|path (PK)|`utf8`| \ No newline at end of file +|permission_set_arn|`utf8`| +|instance_arn|`utf8`| +|name|`utf8`| +|path|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_inline_policies.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_inline_policies.md index 736668baeccbb8..de933b9dc75e50 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_inline_policies.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_inline_policies.md @@ -4,8 +4,8 @@ This table shows data for Ssoadmin Permission Set Inline Policies. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_GetInlinePolicyForPermissionSet.html -The composite primary key for this table is (**permission_set_arn**, **instance_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**permission_set_arn**, **instance_arn**). ## Relations This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_sets.md). @@ -14,9 +14,9 @@ This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_set | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|permission_set_arn (PK)|`utf8`| -|instance_arn (PK)|`utf8`| +|permission_set_arn|`utf8`| +|instance_arn|`utf8`| |inline_policy_json|`json`| |inline_policy|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_managed_policies.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_managed_policies.md index a67ce86c0da5ea..faba8bdc20455a 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_managed_policies.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_managed_policies.md @@ -4,8 +4,8 @@ This table shows data for Ssoadmin Permission Set Managed Policies. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListManagedPoliciesInPermissionSet.html -The composite primary key for this table is (**permission_set_arn**, **instance_arn**, **arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**permission_set_arn**, **instance_arn**, **arn**). ## Relations This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_sets.md). @@ -14,9 +14,9 @@ This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_set | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|permission_set_arn (PK)|`utf8`| -|instance_arn (PK)|`utf8`| -|arn (PK)|`utf8`| +|permission_set_arn|`utf8`| +|instance_arn|`utf8`| +|arn|`utf8`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_permissions_boundaries.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_permissions_boundaries.md index 8d484243a96a84..eece3cab5aa777 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_permissions_boundaries.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_set_permissions_boundaries.md @@ -4,8 +4,8 @@ This table shows data for Ssoadmin Permission Set Permissions Boundaries. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_GetPermissionsBoundaryForPermissionSet.html -The composite primary key for this table is (**permission_set_arn**, **instance_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**permission_set_arn**, **instance_arn**). ## Relations This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_sets.md). @@ -14,9 +14,9 @@ This table depends on [aws_ssoadmin_permission_sets](aws_ssoadmin_permission_set | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|permission_set_arn (PK)|`utf8`| -|instance_arn (PK)|`utf8`| +|permission_set_arn|`utf8`| +|instance_arn|`utf8`| |customer_managed_policy_reference|`json`| |managed_policy_arn|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_sets.md b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_sets.md index c2b2ceb29a819b..6c57a2c36eb1e1 100644 --- a/plugins/source/aws/docs/tables/aws_ssoadmin_permission_sets.md +++ b/plugins/source/aws/docs/tables/aws_ssoadmin_permission_sets.md @@ -5,8 +5,8 @@ This table shows data for Ssoadmin Permission Sets. https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_PermissionSet.html. The 'request_account_id' and 'request_region' columns are added to show the account_id and region of where the request was made from. -The composite primary key for this table is (**instance_arn**, **permission_set_arn**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**instance_arn**, **permission_set_arn**). ## Relations This table depends on [aws_ssoadmin_instances](aws_ssoadmin_instances.md). @@ -22,14 +22,14 @@ The following tables depend on aws_ssoadmin_permission_sets: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |request_account_id|`utf8`| |request_region|`utf8`| -|instance_arn (PK)|`utf8`| +|instance_arn|`utf8`| |created_date|`timestamp[us, tz=UTC]`| |description|`utf8`| |name|`utf8`| -|permission_set_arn (PK)|`utf8`| +|permission_set_arn|`utf8`| |relay_state|`utf8`| |session_duration|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_stepfunctions_activities.md b/plugins/source/aws/docs/tables/aws_stepfunctions_activities.md index 87337e4fbca048..fe768b5cc357ed 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_activities.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_activities.md @@ -4,17 +4,18 @@ This table shows data for Stepfunctions Activities. https://docs.aws.amazon.com/step-functions/latest/apireference/API_ListActivities.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |activity_arn|`utf8`| |creation_date|`timestamp[us, tz=UTC]`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_stepfunctions_executions.md b/plugins/source/aws/docs/tables/aws_stepfunctions_executions.md index b2fa97cf5e5b30..5f9caa63b47dfd 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_executions.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_executions.md @@ -4,8 +4,8 @@ This table shows data for Stepfunctions Executions. https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeExecution.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_stepfunctions_state_machines](aws_stepfunctions_state_machines.md). @@ -17,11 +17,11 @@ The following tables depend on aws_stepfunctions_executions: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |state_machine_arn|`utf8`| |execution_arn|`utf8`| |start_date|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_stepfunctions_map_run_executions.md b/plugins/source/aws/docs/tables/aws_stepfunctions_map_run_executions.md index 3ba1ae73373388..f3c5599b7565c0 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_map_run_executions.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_map_run_executions.md @@ -4,8 +4,8 @@ This table shows data for Stepfunctions Map Run Executions. https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeExecution.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_stepfunctions_map_runs](aws_stepfunctions_map_runs.md). @@ -14,11 +14,11 @@ This table depends on [aws_stepfunctions_map_runs](aws_stepfunctions_map_runs.md | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |map_run_arn|`utf8`| |state_machine_arn|`utf8`| |execution_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_stepfunctions_map_runs.md b/plugins/source/aws/docs/tables/aws_stepfunctions_map_runs.md index a9255465d53527..785292447a9fd0 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_map_runs.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_map_runs.md @@ -4,8 +4,8 @@ This table shows data for Stepfunctions Map Runs. https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeMapRun.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_stepfunctions_executions](aws_stepfunctions_executions.md). @@ -17,11 +17,11 @@ The following tables depend on aws_stepfunctions_map_runs: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |state_machine_arn|`utf8`| |execution_arn|`utf8`| |execution_counts|`json`| 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 521029b2cd80fd..a5b730bc38ec90 100644 --- a/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md +++ b/plugins/source/aws/docs/tables/aws_stepfunctions_state_machines.md @@ -4,8 +4,8 @@ This table shows data for Stepfunctions State Machines. https://docs.aws.amazon.com/step-functions/latest/apireference/API_DescribeStateMachine.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_stepfunctions_state_machines: @@ -15,11 +15,11 @@ The following tables depend on aws_stepfunctions_state_machines: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |creation_date|`timestamp[us, tz=UTC]`| |definition|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_support_case_communications.md b/plugins/source/aws/docs/tables/aws_support_case_communications.md index e5cd026a8fda79..9ccfdaae040991 100644 --- a/plugins/source/aws/docs/tables/aws_support_case_communications.md +++ b/plugins/source/aws/docs/tables/aws_support_case_communications.md @@ -4,8 +4,8 @@ This table shows data for Support Case Communications. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeCommunications.html -The composite primary key for this table is (**case_id**, **submitted_by**, **time_created**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**case_id**, **submitted_by**, **time_created**). ## Relations This table depends on [aws_support_cases](aws_support_cases.md). @@ -14,11 +14,11 @@ This table depends on [aws_support_cases](aws_support_cases.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |attachment_set|`json`| |body|`utf8`| -|case_id (PK)|`utf8`| -|submitted_by (PK)|`utf8`| -|time_created (PK)|`utf8`| \ No newline at end of file +|case_id|`utf8`| +|submitted_by|`utf8`| +|time_created|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_support_cases.md b/plugins/source/aws/docs/tables/aws_support_cases.md index 720a62b20f37cc..2bd9f8578ac914 100644 --- a/plugins/source/aws/docs/tables/aws_support_cases.md +++ b/plugins/source/aws/docs/tables/aws_support_cases.md @@ -4,8 +4,8 @@ This table shows data for Support Cases. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeCases.html -The composite primary key for this table is (**account_id**, **region**, **case_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **case_id**). ## Relations The following tables depend on aws_support_cases: @@ -15,11 +15,11 @@ The following tables depend on aws_support_cases: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|case_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|case_id|`utf8`| |category_code|`utf8`| |cc_email_addresses|`list`| |display_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_support_services.md b/plugins/source/aws/docs/tables/aws_support_services.md index e483026c643046..14178b98fcd230 100644 --- a/plugins/source/aws/docs/tables/aws_support_services.md +++ b/plugins/source/aws/docs/tables/aws_support_services.md @@ -4,17 +4,18 @@ This table shows data for Support Services. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeServices.html -The composite primary key for this table is (**account_id**, **region**, **language_code**, **code**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **language_code**, **code**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|language_code (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|language_code|`utf8`| |categories|`json`| -|code (PK)|`utf8`| +|code|`utf8`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_support_severity_levels.md b/plugins/source/aws/docs/tables/aws_support_severity_levels.md index bd61077585d0df..0061986609a1fa 100644 --- a/plugins/source/aws/docs/tables/aws_support_severity_levels.md +++ b/plugins/source/aws/docs/tables/aws_support_severity_levels.md @@ -4,16 +4,17 @@ This table shows data for Support Severity Levels. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeSeverityLevels.html -The composite primary key for this table is (**account_id**, **region**, **language_code**, **code**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **language_code**, **code**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|language_code (PK)|`utf8`| -|code (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|language_code|`utf8`| +|code|`utf8`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_results.md b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_results.md index dd236b24799041..4bf2b866df4f31 100644 --- a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_results.md +++ b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_results.md @@ -4,8 +4,8 @@ This table shows data for Support Trusted Advisor Check Results. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorCheckResult.html -The composite primary key for this table is (**account_id**, **region**, **language_code**, **check_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **language_code**, **check_id**). ## Relations This table depends on [aws_support_trusted_advisor_checks](aws_support_trusted_advisor_checks.md). @@ -14,13 +14,13 @@ This table depends on [aws_support_trusted_advisor_checks](aws_support_trusted_a | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|language_code (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|language_code|`utf8`| |category_specific_summary|`json`| -|check_id (PK)|`utf8`| +|check_id|`utf8`| |flagged_resources|`json`| |resources_summary|`json`| |status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_summaries.md b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_summaries.md index 66bef3dc0aff9e..d6a5b5a40c6dad 100644 --- a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_summaries.md +++ b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_check_summaries.md @@ -4,8 +4,8 @@ This table shows data for Support Trusted Advisor Check Summaries. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorCheckSummaries.html -The composite primary key for this table is (**account_id**, **region**, **language_code**, **check_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **language_code**, **check_id**). ## Relations This table depends on [aws_support_trusted_advisor_checks](aws_support_trusted_advisor_checks.md). @@ -14,13 +14,13 @@ This table depends on [aws_support_trusted_advisor_checks](aws_support_trusted_a | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|language_code (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|language_code|`utf8`| |category_specific_summary|`json`| -|check_id (PK)|`utf8`| +|check_id|`utf8`| |resources_summary|`json`| |status|`utf8`| |timestamp|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_checks.md b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_checks.md index 9274fff4eafa15..3086845d272335 100644 --- a/plugins/source/aws/docs/tables/aws_support_trusted_advisor_checks.md +++ b/plugins/source/aws/docs/tables/aws_support_trusted_advisor_checks.md @@ -4,8 +4,8 @@ This table shows data for Support Trusted Advisor Checks. https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorChecks.html -The composite primary key for this table is (**account_id**, **region**, **language_code**, **id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **language_code**, **id**). ## Relations The following tables depend on aws_support_trusted_advisor_checks: @@ -16,13 +16,13 @@ The following tables depend on aws_support_trusted_advisor_checks: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|language_code (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|language_code|`utf8`| |category|`utf8`| |description|`utf8`| -|id (PK)|`utf8`| +|id|`utf8`| |metadata|`list`| |name|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_timestream_databases.md b/plugins/source/aws/docs/tables/aws_timestream_databases.md index f66a88fa41f8cc..dadd0f3be6a627 100644 --- a/plugins/source/aws/docs/tables/aws_timestream_databases.md +++ b/plugins/source/aws/docs/tables/aws_timestream_databases.md @@ -4,8 +4,8 @@ This table shows data for Timestream Databases. https://docs.aws.amazon.com/timestream/latest/developerguide/API_Database.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_timestream_databases: @@ -15,12 +15,12 @@ The following tables depend on aws_timestream_databases: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |database_name|`utf8`| |kms_key_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_timestream_tables.md b/plugins/source/aws/docs/tables/aws_timestream_tables.md index 58a02338b658a6..5772373858ce7d 100644 --- a/plugins/source/aws/docs/tables/aws_timestream_tables.md +++ b/plugins/source/aws/docs/tables/aws_timestream_tables.md @@ -4,8 +4,8 @@ This table shows data for Timestream Tables. https://docs.aws.amazon.com/timestream/latest/developerguide/API_Table.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations This table depends on [aws_timestream_databases](aws_timestream_databases.md). @@ -14,11 +14,11 @@ This table depends on [aws_timestream_databases](aws_timestream_databases.md). | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |creation_time|`timestamp[us, tz=UTC]`| |database_name|`utf8`| |last_updated_time|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/docs/tables/aws_transfer_servers.md b/plugins/source/aws/docs/tables/aws_transfer_servers.md index 84b1828ee26055..51465c6c1b0e35 100644 --- a/plugins/source/aws/docs/tables/aws_transfer_servers.md +++ b/plugins/source/aws/docs/tables/aws_transfer_servers.md @@ -4,17 +4,18 @@ This table shows data for Transfer Servers. https://docs.aws.amazon.com/transfer/latest/userguide/API_DescribedServer.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |certificate|`utf8`| |domain|`utf8`| 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 a78d9d2aa0d4ab..36536dcb83d2cb 100644 --- a/plugins/source/aws/docs/tables/aws_waf_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_waf_rule_groups.md @@ -4,16 +4,17 @@ This table shows data for WAF Rule Groups. https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleGroupSummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |rule_ids|`list`| |rule_group_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_waf_rules.md b/plugins/source/aws/docs/tables/aws_waf_rules.md index 92180480f87d64..7df6abfa005bb5 100644 --- a/plugins/source/aws/docs/tables/aws_waf_rules.md +++ b/plugins/source/aws/docs/tables/aws_waf_rules.md @@ -4,16 +4,17 @@ This table shows data for WAF Rules. https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_RuleSummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |predicates|`json`| |rule_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_waf_subscribed_rule_groups.md b/plugins/source/aws/docs/tables/aws_waf_subscribed_rule_groups.md index cc462bc0ca65e9..69673b33e97227 100644 --- a/plugins/source/aws/docs/tables/aws_waf_subscribed_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_waf_subscribed_rule_groups.md @@ -4,15 +4,16 @@ This table shows data for WAF Subscribed Rule Groups. https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_SubscribedRuleGroupSummary.html -The composite primary key for this table is (**account_id**, **rule_group_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **rule_group_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|rule_group_id (PK)|`utf8`| +|account_id|`utf8`| +|rule_group_id|`utf8`| |metric_name|`utf8`| |name|`utf8`| \ 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 0e8f8bfd256789..5dc555c8aa61c1 100644 --- a/plugins/source/aws/docs/tables/aws_waf_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_waf_web_acls.md @@ -4,16 +4,17 @@ This table shows data for WAF Web ACLs. https://docs.aws.amazon.com/waf/latest/APIReference/API_waf_WebACLSummary.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |default_action|`json`| |rules|`json`| diff --git a/plugins/source/aws/docs/tables/aws_wafregional_rate_based_rules.md b/plugins/source/aws/docs/tables/aws_wafregional_rate_based_rules.md index 2561303564b3f2..bea5c600666046 100644 --- a/plugins/source/aws/docs/tables/aws_wafregional_rate_based_rules.md +++ b/plugins/source/aws/docs/tables/aws_wafregional_rate_based_rules.md @@ -4,17 +4,18 @@ This table shows data for Wafregional Rate Based Rules. https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RateBasedRule.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |match_predicates|`json`| |rate_key|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wafregional_rule_groups.md b/plugins/source/aws/docs/tables/aws_wafregional_rule_groups.md index 4a139f0fbcfdd6..4efdb337d615b0 100644 --- a/plugins/source/aws/docs/tables/aws_wafregional_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_wafregional_rule_groups.md @@ -4,17 +4,18 @@ This table shows data for Wafregional Rule Groups. https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_RuleGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |rule_ids|`list`| |rule_group_id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wafregional_rules.md b/plugins/source/aws/docs/tables/aws_wafregional_rules.md index f5e18fb991ceb8..2350d44c0879fe 100644 --- a/plugins/source/aws/docs/tables/aws_wafregional_rules.md +++ b/plugins/source/aws/docs/tables/aws_wafregional_rules.md @@ -4,17 +4,18 @@ This table shows data for Wafregional Rules. https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_Rule.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |predicates|`json`| |rule_id|`utf8`| 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 2cfba0a27e54af..53b8fc4b5e4028 100644 --- a/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_wafregional_web_acls.md @@ -4,17 +4,18 @@ This table shows data for Wafregional Web ACLs. https://docs.aws.amazon.com/waf/latest/APIReference/API_wafRegional_WebACL.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |resources_for_web_acl|`list`| |default_action|`json`| diff --git a/plugins/source/aws/docs/tables/aws_wafv2_ipsets.md b/plugins/source/aws/docs/tables/aws_wafv2_ipsets.md index 14cad7fcc86fb1..64bddbdd8d6859 100644 --- a/plugins/source/aws/docs/tables/aws_wafv2_ipsets.md +++ b/plugins/source/aws/docs/tables/aws_wafv2_ipsets.md @@ -4,19 +4,20 @@ This table shows data for Wafv2 Ipsets. https://docs.aws.amazon.com/waf/latest/APIReference/API_IPSet.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |addresses|`list`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |ip_address_version|`utf8`| |id|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wafv2_managed_rule_groups.md b/plugins/source/aws/docs/tables/aws_wafv2_managed_rule_groups.md index 9edc4f9d5003fd..1d0394f09fb87c 100644 --- a/plugins/source/aws/docs/tables/aws_wafv2_managed_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_wafv2_managed_rule_groups.md @@ -4,19 +4,20 @@ This table shows data for Wafv2 Managed Rule Groups. https://docs.aws.amazon.com/waf/latest/APIReference/API_ManagedRuleGroupSummary.html -The composite primary key for this table is (**account_id**, **region**, **scope**, **name**, **vendor_name**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **scope**, **name**, **vendor_name**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|scope (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|scope|`utf8`| |properties|`json`| |description|`utf8`| -|name (PK)|`utf8`| -|vendor_name (PK)|`utf8`| +|name|`utf8`| +|vendor_name|`utf8`| |versioning_supported|`bool`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_wafv2_regex_pattern_sets.md b/plugins/source/aws/docs/tables/aws_wafv2_regex_pattern_sets.md index ae62062334f339..be8ff60053e8a9 100644 --- a/plugins/source/aws/docs/tables/aws_wafv2_regex_pattern_sets.md +++ b/plugins/source/aws/docs/tables/aws_wafv2_regex_pattern_sets.md @@ -4,18 +4,19 @@ This table shows data for Wafv2 Regex Pattern Sets. https://docs.aws.amazon.com/waf/latest/APIReference/API_RegexPatternSet.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |description|`utf8`| |id|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wafv2_rule_groups.md b/plugins/source/aws/docs/tables/aws_wafv2_rule_groups.md index 705cba8e0a79c1..62502dfff0d3d1 100644 --- a/plugins/source/aws/docs/tables/aws_wafv2_rule_groups.md +++ b/plugins/source/aws/docs/tables/aws_wafv2_rule_groups.md @@ -4,18 +4,19 @@ This table shows data for Wafv2 Rule Groups. https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleGroup.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| -|arn (PK)|`utf8`| +|arn|`utf8`| |policy|`json`| |capacity|`int64`| |id|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wafv2_web_acls.md b/plugins/source/aws/docs/tables/aws_wafv2_web_acls.md index cfed2443fec2a0..5cd3fe8b68e5cf 100644 --- a/plugins/source/aws/docs/tables/aws_wafv2_web_acls.md +++ b/plugins/source/aws/docs/tables/aws_wafv2_web_acls.md @@ -4,19 +4,20 @@ This table shows data for Wafv2 Web ACLs. https://docs.aws.amazon.com/waf/latest/APIReference/API_WebACL.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| |tags|`json`| |resources_for_web_acl|`list`| -|arn (PK)|`utf8`| +|arn|`utf8`| |default_action|`json`| |id|`utf8`| |name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_lens_review_improvements.md b/plugins/source/aws/docs/tables/aws_wellarchitected_lens_review_improvements.md index 3e979bf45b7815..e3736dca363d29 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_lens_review_improvements.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_lens_review_improvements.md @@ -4,8 +4,8 @@ This table shows data for AWS Well-Architected Lens Review Improvements. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_ImprovementSummary.html -The composite primary key for this table is (**workload_arn**, **milestone_number**, **lens_alias**, **pillar_id**, **question_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**workload_arn**, **milestone_number**, **lens_alias**, **pillar_id**, **question_id**). ## Relations This table depends on [aws_wellarchitected_lens_reviews](aws_wellarchitected_lens_reviews.md). @@ -14,17 +14,17 @@ This table depends on [aws_wellarchitected_lens_reviews](aws_wellarchitected_len | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|workload_arn (PK)|`utf8`| +|workload_arn|`utf8`| |workload_id|`utf8`| -|milestone_number (PK)|`int64`| -|lens_alias (PK)|`utf8`| +|milestone_number|`int64`| +|lens_alias|`utf8`| |improvement_plan_url|`utf8`| |improvement_plans|`json`| -|pillar_id (PK)|`utf8`| -|question_id (PK)|`utf8`| +|pillar_id|`utf8`| +|question_id|`utf8`| |question_title|`utf8`| |risk|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_lens_reviews.md b/plugins/source/aws/docs/tables/aws_wellarchitected_lens_reviews.md index 62785611da8556..d339b3a90583d2 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_lens_reviews.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_lens_reviews.md @@ -4,8 +4,8 @@ This table shows data for AWS Well-Architected Lens Reviews. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_LensReview.html -The composite primary key for this table is (**workload_arn**, **milestone_number**, **lens_alias**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**workload_arn**, **milestone_number**, **lens_alias**). ## Relations This table depends on [aws_wellarchitected_workload_milestones](aws_wellarchitected_workload_milestones.md). @@ -17,14 +17,14 @@ The following tables depend on aws_wellarchitected_lens_reviews: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|workload_arn (PK)|`utf8`| +|workload_arn|`utf8`| |workload_id|`utf8`| -|milestone_number (PK)|`int64`| -|lens_alias (PK)|`utf8`| +|milestone_number|`int64`| +|lens_alias|`utf8`| |lens_arn|`utf8`| |lens_name|`utf8`| |lens_status|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_lenses.md b/plugins/source/aws/docs/tables/aws_wellarchitected_lenses.md index 6eaf222743e3bc..06e8b49d8e3ea9 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_lenses.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_lenses.md @@ -4,17 +4,18 @@ This table shows data for AWS Well-Architected Lenses. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_Lens.html -The composite primary key for this table is (**account_id**, **region**, **arn**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **arn**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|arn (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|arn|`utf8`| |created_at|`timestamp[us, tz=UTC]`| |description|`utf8`| |lens_alias|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_share_invitations.md b/plugins/source/aws/docs/tables/aws_wellarchitected_share_invitations.md index 74a298ae88579e..bc04d6240816c3 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_share_invitations.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_share_invitations.md @@ -4,22 +4,23 @@ This table shows data for AWS Well-Architected Share Invitations. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_ShareInvitation.html -The composite primary key for this table is (**account_id**, **region**, **share_invitation_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **share_invitation_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| |lens_arn|`utf8`| |lens_name|`utf8`| |permission_type|`utf8`| |profile_arn|`utf8`| |profile_name|`utf8`| -|share_invitation_id (PK)|`utf8`| +|share_invitation_id|`utf8`| |share_resource_type|`utf8`| |shared_by|`utf8`| |shared_with|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_workload_milestones.md b/plugins/source/aws/docs/tables/aws_wellarchitected_workload_milestones.md index 87e69167e80820..6d0b1475f9c56d 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_workload_milestones.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_workload_milestones.md @@ -4,8 +4,8 @@ This table shows data for AWS Well-Architected Workload Milestones. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_MilestoneSummary.html -The composite primary key for this table is (**workload_arn**, **milestone_name**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**workload_arn**, **milestone_name**). ## Relations This table depends on [aws_wellarchitected_workloads](aws_wellarchitected_workloads.md). @@ -17,12 +17,12 @@ The following tables depend on aws_wellarchitected_workload_milestones: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|workload_arn (PK)|`utf8`| +|workload_arn|`utf8`| |workload_id|`utf8`| -|milestone_name (PK)|`utf8`| +|milestone_name|`utf8`| |milestone_number|`int64`| |recorded_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_workload_shares.md b/plugins/source/aws/docs/tables/aws_wellarchitected_workload_shares.md index 1b862dae583f3c..ecac9cd30ae9bc 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_workload_shares.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_workload_shares.md @@ -4,8 +4,8 @@ This table shows data for AWS Well-Architected Workload Shares. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_WorkloadShareSummary.html -The composite primary key for this table is (**workload_arn**, **share_id**). - +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**workload_arn**, **share_id**). ## Relations This table depends on [aws_wellarchitected_workloads](aws_wellarchitected_workloads.md). @@ -14,13 +14,13 @@ This table depends on [aws_wellarchitected_workloads](aws_wellarchitected_worklo | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|workload_arn (PK)|`utf8`| +|workload_arn|`utf8`| |permission_type|`utf8`| -|share_id (PK)|`utf8`| +|share_id|`utf8`| |shared_with|`utf8`| |status|`utf8`| |status_message|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_wellarchitected_workloads.md b/plugins/source/aws/docs/tables/aws_wellarchitected_workloads.md index 6d596245f90d6a..f1fe3ce6631f68 100644 --- a/plugins/source/aws/docs/tables/aws_wellarchitected_workloads.md +++ b/plugins/source/aws/docs/tables/aws_wellarchitected_workloads.md @@ -4,8 +4,8 @@ This table shows data for AWS Well-Architected Workloads. https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_Workload.html -The primary key for this table is **arn**. - +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Relations The following tables depend on aws_wellarchitected_workloads: @@ -16,11 +16,11 @@ The following tables depend on aws_wellarchitected_workloads: | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |account_ids|`list`| |applications|`list`| |architectural_design|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_workspaces_directories.md b/plugins/source/aws/docs/tables/aws_workspaces_directories.md index 0cdad6a20a77ca..4a1cb7ff9cf1d9 100644 --- a/plugins/source/aws/docs/tables/aws_workspaces_directories.md +++ b/plugins/source/aws/docs/tables/aws_workspaces_directories.md @@ -4,16 +4,17 @@ This table shows data for Workspaces Directories. https://docs.aws.amazon.com/workspaces/latest/api/API_WorkspaceDirectory.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |alias|`utf8`| |certificate_based_auth_properties|`json`| |customer_user_name|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_workspaces_workspaces.md b/plugins/source/aws/docs/tables/aws_workspaces_workspaces.md index bcc160da296c46..3e67ff47bafd5a 100644 --- a/plugins/source/aws/docs/tables/aws_workspaces_workspaces.md +++ b/plugins/source/aws/docs/tables/aws_workspaces_workspaces.md @@ -4,16 +4,17 @@ This table shows data for Workspaces Workspaces. https://docs.aws.amazon.com/workspaces/latest/api/API_Workspace.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |bundle_id|`utf8`| |computer_name|`utf8`| |data_replication_settings|`json`| diff --git a/plugins/source/aws/docs/tables/aws_xray_encryption_configs.md b/plugins/source/aws/docs/tables/aws_xray_encryption_configs.md index c4e78bf015cd5e..06b233c80c2ee9 100644 --- a/plugins/source/aws/docs/tables/aws_xray_encryption_configs.md +++ b/plugins/source/aws/docs/tables/aws_xray_encryption_configs.md @@ -4,16 +4,17 @@ This table shows data for AWS X-Ray Encryption Configs. https://docs.aws.amazon.com/xray/latest/api/API_EncryptionConfig.html -The composite primary key for this table is (**account_id**, **region**, **key_id**, **type**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **key_id**, **type**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|key_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|key_id|`utf8`| |status|`utf8`| -|type (PK)|`utf8`| \ No newline at end of file +|type|`utf8`| \ 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 48d491e9eb5d3e..fb1aa4d576e199 100644 --- a/plugins/source/aws/docs/tables/aws_xray_groups.md +++ b/plugins/source/aws/docs/tables/aws_xray_groups.md @@ -4,17 +4,18 @@ This table shows data for AWS X-Ray Groups. https://docs.aws.amazon.com/xray/latest/api/API_Group.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |filter_expression|`utf8`| |group_arn|`utf8`| diff --git a/plugins/source/aws/docs/tables/aws_xray_resource_policies.md b/plugins/source/aws/docs/tables/aws_xray_resource_policies.md index 89720f63ea7e5a..851efada658a4d 100644 --- a/plugins/source/aws/docs/tables/aws_xray_resource_policies.md +++ b/plugins/source/aws/docs/tables/aws_xray_resource_policies.md @@ -4,17 +4,18 @@ This table shows data for AWS X-Ray Resource Policies. https://docs.aws.amazon.com/xray/latest/api/API_ResourcePolicy.html -The composite primary key for this table is (**account_id**, **region**, **policy_name**, **policy_revision_id**). +The primary key for this table is **_cq_id**. +The following fields are used to calculate the value of `_cq_id`: (**account_id**, **region**, **policy_name**, **policy_revision_id**). ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| -|account_id (PK)|`utf8`| -|region (PK)|`utf8`| -|policy_name (PK)|`utf8`| -|policy_revision_id (PK)|`utf8`| +|account_id|`utf8`| +|region|`utf8`| +|policy_name|`utf8`| +|policy_revision_id|`utf8`| |last_updated_time|`timestamp[us, tz=UTC]`| |policy_document|`utf8`| \ No newline at end of file diff --git a/plugins/source/aws/docs/tables/aws_xray_sampling_rules.md b/plugins/source/aws/docs/tables/aws_xray_sampling_rules.md index 013e7f8dbf1211..4d78d0045b344d 100644 --- a/plugins/source/aws/docs/tables/aws_xray_sampling_rules.md +++ b/plugins/source/aws/docs/tables/aws_xray_sampling_rules.md @@ -4,17 +4,18 @@ This table shows data for AWS X-Ray Sampling Rules. https://docs.aws.amazon.com/xray/latest/api/API_SamplingRuleRecord.html -The primary key for this table is **arn**. +The primary key for this table is **_cq_id**. +The following field is used to calculate the value of `_cq_id`: **arn**. ## Columns | Name | Type | | ------------- | ------------- | -|_cq_id|`uuid`| +|_cq_id (PK)|`uuid`| |_cq_parent_id|`uuid`| |account_id|`utf8`| |region|`utf8`| -|arn (PK)|`utf8`| +|arn|`utf8`| |tags|`json`| |created_at|`timestamp[us, tz=UTC]`| |modified_at|`timestamp[us, tz=UTC]`| diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 1a36304b3b20a7..97f9d83889c32e 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/aws go 1.21.1 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231219235838-1c48d69844cb + github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/aws/aws-sdk-go-v2 v1.24.0 github.com/aws/aws-sdk-go-v2/config v1.26.1 github.com/aws/aws-sdk-go-v2/credentials v1.16.12 @@ -131,7 +131,7 @@ require ( github.com/aws/smithy-go v1.19.0 github.com/basgys/goxml2json v1.1.0 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.21.3 + github.com/cloudquery/plugin-sdk/v4 v4.29.1-0.20240131174120-f5ecd8e65e00 github.com/gertd/go-pluralize v0.2.1 github.com/ghodss/yaml v1.0.0 github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a @@ -156,6 +156,7 @@ require ( github.com/CloudyKit/jet/v6 v6.2.0 // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect + github.com/adrg/xdg v0.4.0 // indirect github.com/andybalholm/brotli v1.0.6 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect @@ -180,8 +181,8 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.14.6 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect + github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect @@ -199,7 +200,7 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/gomarkdown/markdown v0.0.0-20231115200524-a660076da3fd // indirect + github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/gorilla/css v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect @@ -218,8 +219,8 @@ require ( github.com/kataras/tunnel v0.0.4 // indirect github.com/klauspost/compress v1.17.4 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect - github.com/labstack/echo/v4 v4.11.3 // indirect - github.com/labstack/gommon v0.4.1 // indirect + github.com/labstack/echo/v4 v4.11.4 // indirect + github.com/labstack/gommon v0.4.2 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/mailgun/raymond/v2 v2.0.48 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -258,7 +259,7 @@ require ( go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/arch v0.6.0 // indirect golang.org/x/crypto v0.17.0 // indirect - golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect + golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/sys v0.15.0 // indirect @@ -266,7 +267,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.16.1 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index db5b17f41cfcbc..170d115a456d54 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -21,14 +21,16 @@ github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKd github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP3TjA/dfr4NAY8bghDwnXiU7cTKxQqo0= github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= +github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= +github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/apache/arrow/go/v15 v15.0.0-20231219235838-1c48d69844cb h1:zB0N3L/o1HMGK9cxU8UsjXP09op15NcXI43zvPGZopg= -github.com/apache/arrow/go/v15 v15.0.0-20231219235838-1c48d69844cb/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= +github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk= @@ -333,18 +335,18 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= -github.com/cloudquery/plugin-pb-go v1.14.6 h1:qFJ+611laD1PooMsaSuWfJZdVXG+Ul3/U7MlAjZXrXw= -github.com/cloudquery/plugin-pb-go v1.14.6/go.mod h1:/1KqTM4g8wG0uO0KQBct2t0vJrIxPY8npEZC6tdC2Es= +github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= +github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.21.3 h1:jBvi78udl/p7/TZOfPU5eoH3kUqhPASknus+JpNywxg= -github.com/cloudquery/plugin-sdk/v4 v4.21.3/go.mod h1:RpECcayK/lwDX5MGgISRLnS1RnLFyCsqa5RQOFsCTEA= +github.com/cloudquery/plugin-sdk/v4 v4.29.1-0.20240131174120-f5ecd8e65e00 h1:HSbZvekMWX6vJTCk8rJpWWLgdAunojbuJGNQbgiRbD4= +github.com/cloudquery/plugin-sdk/v4 v4.29.1-0.20240131174120-f5ecd8e65e00/go.mod h1:mJsiMon1audv/9tr4MfW1GTVwHM57PhHcobJpyjDcIU= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -401,8 +403,8 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomarkdown/markdown v0.0.0-20231115200524-a660076da3fd h1:PppHBegd3uPZ3Y/Iax/2mlCFJm1w4Qf/zP1MdW4ju2o= -github.com/gomarkdown/markdown v0.0.0-20231115200524-a660076da3fd/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47 h1:k4Tw0nt6lwro3Uin8eqoET7MDA4JnT8YgbCjc/g5E3k= +github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -466,10 +468,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM= -github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws= -github.com/labstack/gommon v0.4.1 h1:gqEff0p/hTENGMABzezPoPSRtIh1Cvw0ueMOe0/dfOk= -github.com/labstack/gommon v0.4.1/go.mod h1:TyTrpPqxR5KMk8LKVtLmfMjeQ5FEkBYdxLYPw/WfrOM= +github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8= +github.com/labstack/echo/v4 v4.11.4/go.mod h1:noh7EvLwqDsmh/X/HWKPUl1AjzJrhyptRyEbQJfxen8= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw= @@ -605,8 +607,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE= -golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4= +golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= @@ -630,6 +632,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -662,8 +665,8 @@ gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= -google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ= -google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= 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 6c9335675ecb18..3147b2e93f7b29 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go @@ -16,15 +16,15 @@ 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{}, transformers.WithPrimaryKeys("RuleName")), + Transform: transformers.TransformWithStruct(&types.ArchiveRuleSummary{}, transformers.WithPrimaryKeyComponents("RuleName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "analyzer_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "analyzer_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go index f47d42a2854514..ebe88c90f455c1 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go @@ -16,15 +16,15 @@ 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{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.FindingSummary{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "analyzer_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "analyzer_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go index 5093500f7a86c5..d2effff7133322 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go @@ -17,7 +17,7 @@ func Analyzers() *schema.Table { Description: `https://docs.aws.amazon.com/access-analyzer/latest/APIReference/API_AnalyzerSummary.html`, Resolver: fetchAccessanalyzerAnalyzers, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "access-analyzer"), - Transform: transformers.TransformWithStruct(&types.AnalyzerSummary{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.AnalyzerSummary{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/account/alternate_contacts.go b/plugins/source/aws/resources/services/account/alternate_contacts.go index 50c6ffe632f39d..1f5ca37ed7a74f 100644 --- a/plugins/source/aws/resources/services/account/alternate_contacts.go +++ b/plugins/source/aws/resources/services/account/alternate_contacts.go @@ -22,10 +22,10 @@ func AlternateContacts() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "alternate_contact_type", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AlternateContactType"), - PrimaryKey: true, + Name: "alternate_contact_type", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AlternateContactType"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/acm/certificates.go b/plugins/source/aws/resources/services/acm/certificates.go index 5f883bcd55a7f6..1c49f02640fb25 100644 --- a/plugins/source/aws/resources/services/acm/certificates.go +++ b/plugins/source/aws/resources/services/acm/certificates.go @@ -25,10 +25,10 @@ func Certificates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/acmpca/certificate_authorities.go b/plugins/source/aws/resources/services/acmpca/certificate_authorities.go index b0a202bf254ef7..fd9164561de36d 100644 --- a/plugins/source/aws/resources/services/acmpca/certificate_authorities.go +++ b/plugins/source/aws/resources/services/acmpca/certificate_authorities.go @@ -24,10 +24,10 @@ func CertificateAuthorities() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 07094ba3056945..fe13e1bb1a972f 100644 --- a/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go +++ b/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go @@ -28,10 +28,10 @@ func ruleGroupsNamespaces() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/amp/workspaces.go b/plugins/source/aws/resources/services/amp/workspaces.go index a02c43942318b7..ee195b45118acc 100644 --- a/plugins/source/aws/resources/services/amp/workspaces.go +++ b/plugins/source/aws/resources/services/amp/workspaces.go @@ -36,10 +36,10 @@ func Workspaces() *schema.Table { Resolver: describeLoggingConfiguration, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/amplify/apps.go b/plugins/source/aws/resources/services/amplify/apps.go index 7dd4b6b5587854..0debcfb0416122 100644 --- a/plugins/source/aws/resources/services/amplify/apps.go +++ b/plugins/source/aws/resources/services/amplify/apps.go @@ -24,10 +24,10 @@ func Apps() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AppArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AppArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/api_keys.go b/plugins/source/aws/resources/services/apigateway/api_keys.go index f8c1937516a827..d0bf710d0e91bd 100644 --- a/plugins/source/aws/resources/services/apigateway/api_keys.go +++ b/plugins/source/aws/resources/services/apigateway/api_keys.go @@ -26,10 +26,10 @@ func ApiKeys() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayAPIKeyArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayAPIKeyArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/client_certificates.go b/plugins/source/aws/resources/services/apigateway/client_certificates.go index 688fdbb98ce067..0b9be3ecf151d2 100644 --- a/plugins/source/aws/resources/services/apigateway/client_certificates.go +++ b/plugins/source/aws/resources/services/apigateway/client_certificates.go @@ -26,10 +26,10 @@ func ClientCertificates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayClientCertificateArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayClientCertificateArn, + PrimaryKeyComponent: true, }, }, } 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 7fd3cd198d6bf3..00706e2f021607 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 @@ -30,10 +30,10 @@ func domainNameBasePathMappings() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayDomainNameBasePathMappingArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayDomainNameBasePathMappingArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/domain_names.go b/plugins/source/aws/resources/services/apigateway/domain_names.go index e854af61f06b67..63b64f5dd05a9f 100644 --- a/plugins/source/aws/resources/services/apigateway/domain_names.go +++ b/plugins/source/aws/resources/services/apigateway/domain_names.go @@ -26,10 +26,10 @@ func DomainNames() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayDomainNameArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayDomainNameArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ 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 f336240b612594..3b091d36397586 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go @@ -33,10 +33,10 @@ func restApiAuthorizers() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIAuthorizerArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIAuthorizerArn, + PrimaryKeyComponent: true, }, }, } 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 e9d57a26761c0c..8f04f4e3273423 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go @@ -30,10 +30,10 @@ func restApiDeployments() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIDeploymentArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIDeploymentArn, + PrimaryKeyComponent: true, }, }, } 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 7ad0afd315b198..f612d399aef22f 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 @@ -30,10 +30,10 @@ func restApiDocumentationParts() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIDocumentationPartArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIDocumentationPartArn, + PrimaryKeyComponent: true, }, }, } 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 e13b4ac76c34d6..6e8c6dab77fabb 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 @@ -30,10 +30,10 @@ func restApiDocumentationVersions() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIDocumentationVersionArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIDocumentationVersionArn, + PrimaryKeyComponent: true, }, }, } 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 e32da769cb10a1..38323bccacab78 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 @@ -30,10 +30,10 @@ func restApiGatewayResponses() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIGatewayResponseArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIGatewayResponseArn, + PrimaryKeyComponent: true, }, }, } 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 4852f39dd89c59..4fdbcd270ff1a0 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_models.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_models.go @@ -30,10 +30,10 @@ func restApiModels() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIModelArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIModelArn, + PrimaryKeyComponent: true, }, { Name: "model_template", 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 c7725a30d7b77b..3d06bc531146cb 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 @@ -30,10 +30,10 @@ func restApiRequestValidators() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIRequestValidatorArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIRequestValidatorArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go b/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go index 38c375f8c44426..7a034a3d821428 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go @@ -40,10 +40,10 @@ func restApiResourceMethodIntegrations() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIResourceMethodIntegrationArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIResourceMethodIntegrationArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go b/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go index 65dde531dabaf1..52ffa850d675ae 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go @@ -35,10 +35,10 @@ func restApiResourceMethods() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIResourceMethodArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIResourceMethodArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ 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 83f0f0bc875899..3b80ac78b3379f 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resources.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resources.go @@ -30,10 +30,10 @@ func restApiResources() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIResourceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIResourceArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ 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 41475f33018c09..bcd7cf257ce8e5 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_stages.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_stages.go @@ -30,10 +30,10 @@ func restApiStages() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIStageArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIStageArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/rest_apis.go b/plugins/source/aws/resources/services/apigateway/rest_apis.go index a8f77c7ff34d5c..ed8de27d851bb7 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_apis.go +++ b/plugins/source/aws/resources/services/apigateway/rest_apis.go @@ -26,10 +26,10 @@ func RestApis() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayRestAPIArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayRestAPIArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ 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 4ad7b14885c871..bc02e2e91e7e61 100644 --- a/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go +++ b/plugins/source/aws/resources/services/apigateway/usage_plan_keys.go @@ -24,10 +24,10 @@ func usagePlanKeys() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayUsagePlanKeyArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayUsagePlanKeyArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigateway/usage_plans.go b/plugins/source/aws/resources/services/apigateway/usage_plans.go index df33df5acf2fb2..c9172a0bc27f3c 100644 --- a/plugins/source/aws/resources/services/apigateway/usage_plans.go +++ b/plugins/source/aws/resources/services/apigateway/usage_plans.go @@ -26,10 +26,10 @@ func UsagePlans() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayUsagePlanArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayUsagePlanArn, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/apigateway/vpc_links.go b/plugins/source/aws/resources/services/apigateway/vpc_links.go index bf7db369a89504..4b53e1309366db 100644 --- a/plugins/source/aws/resources/services/apigateway/vpc_links.go +++ b/plugins/source/aws/resources/services/apigateway/vpc_links.go @@ -26,10 +26,10 @@ func VpcLinks() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApigatewayVpcLinkArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApigatewayVpcLinkArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go index 7c6be9591ee782..1b69686f42e021 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go @@ -35,10 +35,10 @@ func apiAuthorizers() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiAuthorizerArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiAuthorizerArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go index 1319e38331d5d0..751e9f2d464b37 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go @@ -35,10 +35,10 @@ func apiDeployments() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiDeploymentArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiDeploymentArn, + PrimaryKeyComponent: true, }, }, } 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 5413ea8ee629d0..4d2e0913cf395b 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go @@ -35,10 +35,10 @@ func apiIntegrationResponses() *schema.Table { Resolver: schema.ParentColumnResolver("integration_id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiIntegrationResponseArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiIntegrationResponseArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go index 4ba7b136a7a52b..bb4c6b0eca0c9f 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go @@ -35,10 +35,10 @@ func apiIntegrations() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiIntegrationArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiIntegrationArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_models.go b/plugins/source/aws/resources/services/apigatewayv2/api_models.go index 1a80c6f8c9863e..e13be8851fc32d 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_models.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_models.go @@ -35,10 +35,10 @@ func apiModels() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiModelArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiModelArn, + PrimaryKeyComponent: true, }, { Name: "model_template", 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 ad26fb0a4e60dd..3ad0e7a23257ae 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go @@ -35,10 +35,10 @@ func apiRouteResponses() *schema.Table { Resolver: schema.ParentColumnResolver("route_id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiRouteResponseArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiRouteResponseArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go index b02ddf0824cc7a..2b0b77b670f559 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go @@ -35,10 +35,10 @@ func apiRoutes() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiRouteArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiRouteArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go index b2330966747704..5671e8fce78ead 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go @@ -35,10 +35,10 @@ func apiStages() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiStageArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiStageArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/apis.go b/plugins/source/aws/resources/services/apigatewayv2/apis.go index a1fce361485a49..80c4d09e65851d 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/apis.go +++ b/plugins/source/aws/resources/services/apigatewayv2/apis.go @@ -26,10 +26,10 @@ func Apis() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApiArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApiArn, + PrimaryKeyComponent: true, }, { Name: "id", diff --git a/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go b/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go index b539d599cc5716..c0c0fc15b8827c 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go +++ b/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go @@ -30,10 +30,10 @@ func domainNameRestApiMappings() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDomainNameRestApiMappingArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDomainNameRestApiMappingArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go index 0c0b67d86fb94d..25c4c3c1a64384 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go +++ b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go @@ -26,10 +26,10 @@ func DomainNames() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDomainNameArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDomainNameArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go index 4ab71ff4f379ff..5f9add6c068695 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go +++ b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go @@ -26,10 +26,10 @@ func VpcLinks() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVpcLinkArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVpcLinkArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appconfig/applications.go b/plugins/source/aws/resources/services/appconfig/applications.go index d2759870f6831b..21337c221bf1c3 100644 --- a/plugins/source/aws/resources/services/appconfig/applications.go +++ b/plugins/source/aws/resources/services/appconfig/applications.go @@ -26,10 +26,10 @@ func Applications() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveApplicationArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveApplicationArn, + PrimaryKeyComponent: true, }, }, Relations: schema.Tables{ diff --git a/plugins/source/aws/resources/services/appconfig/configuration_profiles.go b/plugins/source/aws/resources/services/appconfig/configuration_profiles.go index e7c7579ad1c17e..c03fbf6b26d8fa 100644 --- a/plugins/source/aws/resources/services/appconfig/configuration_profiles.go +++ b/plugins/source/aws/resources/services/appconfig/configuration_profiles.go @@ -26,16 +26,16 @@ func configurationProfiles() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "application_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "application_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveConfigProfileARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveConfigProfileARN, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/appconfig/deployment_strategies.go b/plugins/source/aws/resources/services/appconfig/deployment_strategies.go index 547e58afd1b432..0d6a7edab63e26 100644 --- a/plugins/source/aws/resources/services/appconfig/deployment_strategies.go +++ b/plugins/source/aws/resources/services/appconfig/deployment_strategies.go @@ -26,10 +26,10 @@ func DeploymentStrategies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDeploymentStrategiesArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDeploymentStrategiesArn, + PrimaryKeyComponent: true, }, }, Relations: schema.Tables{}, diff --git a/plugins/source/aws/resources/services/appconfig/environments.go b/plugins/source/aws/resources/services/appconfig/environments.go index a990e83b42712c..b589a6d02b4000 100644 --- a/plugins/source/aws/resources/services/appconfig/environments.go +++ b/plugins/source/aws/resources/services/appconfig/environments.go @@ -25,16 +25,16 @@ func environments() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "application_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "application_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEnvironmentArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEnvironmentArn, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{}, diff --git a/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go b/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go index e9e474de6d125b..d34fb99b77b8af 100644 --- a/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go +++ b/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go @@ -26,16 +26,16 @@ func hostedConfigurationVersions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "application_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "application_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveHostedConfigurationVersionARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveHostedConfigurationVersionARN, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{}, diff --git a/plugins/source/aws/resources/services/appflow/flows.go b/plugins/source/aws/resources/services/appflow/flows.go index 819a85b82dd6db..3df58caecf0ad5 100644 --- a/plugins/source/aws/resources/services/appflow/flows.go +++ b/plugins/source/aws/resources/services/appflow/flows.go @@ -24,10 +24,10 @@ func Flows() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FlowArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FlowArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/applicationautoscaling/policies.go b/plugins/source/aws/resources/services/applicationautoscaling/policies.go index c5a9d19c0ab1b6..f3b6f1841eeb01 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/policies.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/policies.go @@ -23,10 +23,10 @@ func Policies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go b/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go index 9bc9ff7b3fc3dd..accc26db5cb5ae 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go @@ -17,7 +17,7 @@ func ScalableTargets() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScalableTarget.html`, Resolver: fetchScalableTargets, Multiplex: client.ServiceAccountRegionNamespaceMultiplexer(tableName, "application-autoscaling"), - Transform: transformers.TransformWithStruct(&types.ScalableTarget{}, transformers.WithPrimaryKeys("ResourceId")), + Transform: transformers.TransformWithStruct(&types.ScalableTarget{}, transformers.WithPrimaryKeyComponents("ResourceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go b/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go index f84306e52fa0eb..8e150a5fed9672 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go @@ -17,7 +17,7 @@ func ScalingActivities() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/application/APIReference/API_ScalingActivity.html`, Resolver: fetchScalingActivities, Multiplex: client.ServiceAccountRegionNamespaceMultiplexer(tableName, "application-autoscaling"), - Transform: transformers.TransformWithStruct(&types.ScalingActivity{}, transformers.WithPrimaryKeys("ResourceId")), + Transform: transformers.TransformWithStruct(&types.ScalingActivity{}, transformers.WithPrimaryKeyComponents("ResourceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go b/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go index 5f972526e31cc8..02023536c3008d 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go @@ -23,10 +23,10 @@ func ScheduledActions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ScheduledActionARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ScheduledActionARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appmesh/meshes.go b/plugins/source/aws/resources/services/appmesh/meshes.go index 9d8365895fdf27..858d719e957b64 100644 --- a/plugins/source/aws/resources/services/appmesh/meshes.go +++ b/plugins/source/aws/resources/services/appmesh/meshes.go @@ -24,22 +24,22 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Transform: transformers.TransformWithStruct(&types.MeshData{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/appmesh/virtual_gateways.go b/plugins/source/aws/resources/services/appmesh/virtual_gateways.go index 5d0f0db83ab1c2..78a5da11adcd9b 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_gateways.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_gateways.go @@ -20,28 +20,28 @@ func virtualGateways() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualGatewayData{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Arn"), + PrimaryKeyComponent: true, }, { - Name: "mesh_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "mesh_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appmesh/virtual_nodes.go b/plugins/source/aws/resources/services/appmesh/virtual_nodes.go index 7b5fbc8ddc8299..62096453397e3f 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_nodes.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_nodes.go @@ -20,28 +20,28 @@ func virtualNodes() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualNodeData{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Arn"), + PrimaryKeyComponent: true, }, { - Name: "mesh_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "mesh_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appmesh/virtual_routers.go b/plugins/source/aws/resources/services/appmesh/virtual_routers.go index fd380ce541ec7d..b52cf672366f8c 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_routers.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_routers.go @@ -20,28 +20,28 @@ func virtualRouters() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualRouterData{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Arn"), + PrimaryKeyComponent: true, }, { - Name: "mesh_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "mesh_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appmesh/virtual_services.go b/plugins/source/aws/resources/services/appmesh/virtual_services.go index 49dfe6a5fa34d6..4e5a2d927b71d6 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_services.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_services.go @@ -20,28 +20,28 @@ func virtualServices() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualServiceData{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Arn"), + PrimaryKeyComponent: true, }, { - Name: "mesh_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "mesh_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 62459316d59ee3..8e4c8517f7eeac 100644 --- a/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go @@ -25,10 +25,10 @@ func AutoScalingConfigurations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AutoScalingConfigurationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AutoScalingConfigurationArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/apprunner/connections.go b/plugins/source/aws/resources/services/apprunner/connections.go index 158450d6001753..ce13a4c81dcb0f 100644 --- a/plugins/source/aws/resources/services/apprunner/connections.go +++ b/plugins/source/aws/resources/services/apprunner/connections.go @@ -24,10 +24,10 @@ func Connections() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConnectionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConnectionArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/apprunner/custom_domains.go b/plugins/source/aws/resources/services/apprunner/custom_domains.go index 277c3ddd9103a3..20e6d6b04675fe 100644 --- a/plugins/source/aws/resources/services/apprunner/custom_domains.go +++ b/plugins/source/aws/resources/services/apprunner/custom_domains.go @@ -16,15 +16,15 @@ 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{}, transformers.WithPrimaryKeys("DomainName")), + Transform: transformers.TransformWithStruct(&types.CustomDomain{}, transformers.WithPrimaryKeyComponents("DomainName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "service_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "service_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "enable_www_subdomain", diff --git a/plugins/source/aws/resources/services/apprunner/observability_configurations.go b/plugins/source/aws/resources/services/apprunner/observability_configurations.go index bf0b14fe075adc..8b8db80beb12fd 100644 --- a/plugins/source/aws/resources/services/apprunner/observability_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/observability_configurations.go @@ -25,10 +25,10 @@ func ObservabilityConfigurations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ObservabilityConfigurationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ObservabilityConfigurationArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/apprunner/operations.go b/plugins/source/aws/resources/services/apprunner/operations.go index 58467fe5fa8ff1..f7ee07d81ad583 100644 --- a/plugins/source/aws/resources/services/apprunner/operations.go +++ b/plugins/source/aws/resources/services/apprunner/operations.go @@ -16,15 +16,15 @@ 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{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.OperationSummary{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "service_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "service_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/apprunner/services.go b/plugins/source/aws/resources/services/apprunner/services.go index 50fe211c3f7d08..f9795fc0289672 100644 --- a/plugins/source/aws/resources/services/apprunner/services.go +++ b/plugins/source/aws/resources/services/apprunner/services.go @@ -25,10 +25,10 @@ func Services() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ServiceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ServiceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go index 3679a4be15dc33..7b7fca6a36c39f 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go @@ -24,10 +24,10 @@ func VpcConnectors() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("VpcConnectorArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("VpcConnectorArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 929518e331730f..5c6a7c8f0324ee 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go @@ -28,10 +28,10 @@ Notes: client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("VpcIngressConnectionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("VpcIngressConnectionArn"), + PrimaryKeyComponent: true, }, { Name: "source_account_id", diff --git a/plugins/source/aws/resources/services/appstream/app_blocks.go b/plugins/source/aws/resources/services/appstream/app_blocks.go index e0a6c65db76276..eca904cce7b9ab 100644 --- a/plugins/source/aws/resources/services/appstream/app_blocks.go +++ b/plugins/source/aws/resources/services/appstream/app_blocks.go @@ -24,10 +24,10 @@ func AppBlocks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } 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 e8d956ef362c0c..f94e718661cc49 100644 --- a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go +++ b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go @@ -23,16 +23,16 @@ func applicationFleetAssociations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "application_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ApplicationArn"), - PrimaryKey: true, + Name: "application_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ApplicationArn"), + PrimaryKeyComponent: true, }, { - Name: "fleet_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FleetName"), - PrimaryKey: true, + Name: "fleet_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FleetName"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/applications.go b/plugins/source/aws/resources/services/appstream/applications.go index 626229ecfd799e..c34758ade0c0fc 100644 --- a/plugins/source/aws/resources/services/appstream/applications.go +++ b/plugins/source/aws/resources/services/appstream/applications.go @@ -24,10 +24,10 @@ func Applications() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/appstream/directory_configs.go b/plugins/source/aws/resources/services/appstream/directory_configs.go index 1615c282ef6116..f6bb3ca97cb243 100644 --- a/plugins/source/aws/resources/services/appstream/directory_configs.go +++ b/plugins/source/aws/resources/services/appstream/directory_configs.go @@ -24,10 +24,10 @@ func DirectoryConfigs() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "directory_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DirectoryName"), - PrimaryKey: true, + Name: "directory_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DirectoryName"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/fleets.go b/plugins/source/aws/resources/services/appstream/fleets.go index 89cb9823d7c92d..828b75c8474357 100644 --- a/plugins/source/aws/resources/services/appstream/fleets.go +++ b/plugins/source/aws/resources/services/appstream/fleets.go @@ -24,10 +24,10 @@ func Fleets() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/image_builders.go b/plugins/source/aws/resources/services/appstream/image_builders.go index bf8a132f48fe55..14b114bdd88e5e 100644 --- a/plugins/source/aws/resources/services/appstream/image_builders.go +++ b/plugins/source/aws/resources/services/appstream/image_builders.go @@ -24,10 +24,10 @@ func ImageBuilders() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/images.go b/plugins/source/aws/resources/services/appstream/images.go index f5449d37d953e6..5e42a2cbf1b5df 100644 --- a/plugins/source/aws/resources/services/appstream/images.go +++ b/plugins/source/aws/resources/services/appstream/images.go @@ -18,7 +18,7 @@ func Images() *schema.Table { Description: `https://docs.aws.amazon.com/appstream2/latest/APIReference/API_Image.html`, Resolver: fetchAppstreamImages, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "appstream2"), - Transform: transformers.TransformWithStruct(&types.Image{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Image{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true)}, } } diff --git a/plugins/source/aws/resources/services/appstream/stack_entitlements.go b/plugins/source/aws/resources/services/appstream/stack_entitlements.go index fce36937e2409a..1f1e9b54ddcbc0 100644 --- a/plugins/source/aws/resources/services/appstream/stack_entitlements.go +++ b/plugins/source/aws/resources/services/appstream/stack_entitlements.go @@ -23,16 +23,16 @@ func stackEntitlements() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "stack_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StackName"), - PrimaryKey: true, + Name: "stack_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StackName"), + PrimaryKeyComponent: true, }, { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Name"), + PrimaryKeyComponent: true, }, }, } 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 54db877cb287a9..ae79620735df4e 100644 --- a/plugins/source/aws/resources/services/appstream/stack_user_associations.go +++ b/plugins/source/aws/resources/services/appstream/stack_user_associations.go @@ -23,22 +23,22 @@ func stackUserAssociations() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "stack_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StackName"), - PrimaryKey: true, + Name: "stack_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StackName"), + PrimaryKeyComponent: true, }, { - Name: "user_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("UserName"), - PrimaryKey: true, + Name: "user_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("UserName"), + PrimaryKeyComponent: true, }, { - Name: "authentication_type", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AuthenticationType"), - PrimaryKey: true, + Name: "authentication_type", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AuthenticationType"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/stacks.go b/plugins/source/aws/resources/services/appstream/stacks.go index 7a88126db23508..eb90a3cb4679e7 100644 --- a/plugins/source/aws/resources/services/appstream/stacks.go +++ b/plugins/source/aws/resources/services/appstream/stacks.go @@ -24,10 +24,10 @@ func Stacks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, 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 797f0c3dfd1f90..2c6ca85ed453a2 100644 --- a/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go +++ b/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go @@ -24,10 +24,10 @@ func UsageReportSubscriptions() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "s3_bucket_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("S3BucketName"), - PrimaryKey: true, + Name: "s3_bucket_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("S3BucketName"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appstream/users.go b/plugins/source/aws/resources/services/appstream/users.go index 4ba96e9a5c6757..ab8c96610d3120 100644 --- a/plugins/source/aws/resources/services/appstream/users.go +++ b/plugins/source/aws/resources/services/appstream/users.go @@ -24,10 +24,10 @@ func Users() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/appsync/graphql_apis.go b/plugins/source/aws/resources/services/appsync/graphql_apis.go index f0fcba5ca696f9..6636181bd0a9f9 100644 --- a/plugins/source/aws/resources/services/appsync/graphql_apis.go +++ b/plugins/source/aws/resources/services/appsync/graphql_apis.go @@ -24,10 +24,10 @@ func GraphqlApis() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } 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 2e48a050f22e4c..7e2570dfdebc12 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 @@ -22,22 +22,22 @@ func dataCatalogDatabaseTables() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "data_catalog_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("data_catalog_arn"), - PrimaryKey: true, + Name: "data_catalog_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("data_catalog_arn"), + PrimaryKeyComponent: true, }, { - Name: "data_catalog_database_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("name"), - PrimaryKey: true, + Name: "data_catalog_database_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("name"), + PrimaryKeyComponent: true, }, { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Name"), + PrimaryKeyComponent: true, }, }, } 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 f2a9f291f2c24a..a48642dfcaf3ad 100644 --- a/plugins/source/aws/resources/services/athena/data_catalog_databases.go +++ b/plugins/source/aws/resources/services/athena/data_catalog_databases.go @@ -22,16 +22,16 @@ func dataCatalogDatabases() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "data_catalog_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "data_catalog_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Name"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/athena/data_catalogs.go b/plugins/source/aws/resources/services/athena/data_catalogs.go index f812fc1b56e51b..8a71e3274d02a9 100644 --- a/plugins/source/aws/resources/services/athena/data_catalogs.go +++ b/plugins/source/aws/resources/services/athena/data_catalogs.go @@ -27,10 +27,10 @@ func DataCatalogs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveAthenaDataCatalogArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveAthenaDataCatalogArn, + PrimaryKeyComponent: true, }, { Name: "tags", 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 08c1983287926d..5392a2879d64e0 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 @@ -19,15 +19,15 @@ func workGroupNamedQueries() *schema.Table { Description: `https://docs.aws.amazon.com/athena/latest/APIReference/API_NamedQuery.html`, Resolver: fetchAthenaWorkGroupNamedQueries, PreResourceResolver: getWorkGroupNamedQuery, - Transform: transformers.TransformWithStruct(&types.NamedQuery{}, transformers.WithPrimaryKeys("NamedQueryId")), + Transform: transformers.TransformWithStruct(&types.NamedQuery{}, transformers.WithPrimaryKeyComponents("NamedQueryId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "work_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "work_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 d2720db8ef7758..a50f66380ac1f7 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 @@ -18,15 +18,15 @@ func workGroupPreparedStatements() *schema.Table { Description: `https://docs.aws.amazon.com/athena/latest/APIReference/API_PreparedStatement.html`, Resolver: fetchAthenaWorkGroupPreparedStatements, PreResourceResolver: getWorkGroupPreparedStatement, - Transform: transformers.TransformWithStruct(&types.PreparedStatement{}, transformers.WithPrimaryKeys("StatementName")), + Transform: transformers.TransformWithStruct(&types.PreparedStatement{}, transformers.WithPrimaryKeyComponents("StatementName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "work_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "work_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 65cba483315aa5..9d49c7aa05ef87 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 @@ -19,15 +19,15 @@ func workGroupQueryExecutions() *schema.Table { Description: `https://docs.aws.amazon.com/athena/latest/APIReference/API_QueryExecution.html`, Resolver: fetchAthenaWorkGroupQueryExecutions, PreResourceResolver: getWorkGroupQueryExecution, - Transform: transformers.TransformWithStruct(&types.QueryExecution{}, transformers.WithPrimaryKeys("QueryExecutionId")), + Transform: transformers.TransformWithStruct(&types.QueryExecution{}, transformers.WithPrimaryKeyComponents("QueryExecutionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "work_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "work_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/athena/work_groups.go b/plugins/source/aws/resources/services/athena/work_groups.go index b70bb7f6c71833..8af342fe433732 100644 --- a/plugins/source/aws/resources/services/athena/work_groups.go +++ b/plugins/source/aws/resources/services/athena/work_groups.go @@ -27,10 +27,10 @@ func WorkGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveAthenaWorkGroupArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveAthenaWorkGroupArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/auditmanager/assesments.go b/plugins/source/aws/resources/services/auditmanager/assesments.go index 6fb24aa25ad3d6..a28949f2ac1244 100644 --- a/plugins/source/aws/resources/services/auditmanager/assesments.go +++ b/plugins/source/aws/resources/services/auditmanager/assesments.go @@ -18,7 +18,7 @@ func Assessments() *schema.Table { Resolver: fetchAssessments, PreResourceResolver: getAssessment, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "auditmanager"), - Transform: transformers.TransformWithStruct(&types.Assessment{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Assessment{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), 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 e8a185d0e3014f..bc673aa4413710 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go +++ b/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go @@ -18,15 +18,15 @@ func groupLifecycleHooks() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_LifecycleHook.html`, Resolver: fetchAutoscalingGroupLifecycleHooks, - Transform: transformers.TransformWithStruct(&types.LifecycleHook{}, transformers.WithPrimaryKeys("LifecycleHookName")), + Transform: transformers.TransformWithStruct(&types.LifecycleHook{}, transformers.WithPrimaryKeyComponents("LifecycleHookName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 95ecb10719074d..03f8aea2f375a8 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go +++ b/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go @@ -28,10 +28,10 @@ func groupScalingPolicies() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/autoscaling/groups.go b/plugins/source/aws/resources/services/autoscaling/groups.go index 8cc8f848443b6e..c4a7ac23ed12bd 100644 --- a/plugins/source/aws/resources/services/autoscaling/groups.go +++ b/plugins/source/aws/resources/services/autoscaling/groups.go @@ -39,10 +39,10 @@ func Groups() *schema.Table { Resolver: resolveAutoscalingGroupLoadBalancerTargetGroups, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AutoScalingGroupARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AutoScalingGroupARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go index a16a80c3b4917b..f7585421c1e97f 100644 --- a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go +++ b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go @@ -23,10 +23,10 @@ func LaunchConfigurations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LaunchConfigurationARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LaunchConfigurationARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go index bbd776f5bbcc60..a05304db1c6a47 100644 --- a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go +++ b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go @@ -24,10 +24,10 @@ func ScheduledActions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ScheduledActionARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ScheduledActionARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go b/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go index 9a2c02e661671b..17aff5bca2cb12 100644 --- a/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go +++ b/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go @@ -17,7 +17,7 @@ func planResources() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPlanResource.html`, Resolver: fetchPlanResources, - Transform: transformers.TransformWithStruct(&types.ScalingPlanResource{}, transformers.WithPrimaryKeys("ScalingPlanName", "ResourceId")), + Transform: transformers.TransformWithStruct(&types.ScalingPlanResource{}, transformers.WithPrimaryKeyComponents("ScalingPlanName", "ResourceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/autoscalingplans/plans.go b/plugins/source/aws/resources/services/autoscalingplans/plans.go index b510708a2c0416..7ea11c80dadca8 100644 --- a/plugins/source/aws/resources/services/autoscalingplans/plans.go +++ b/plugins/source/aws/resources/services/autoscalingplans/plans.go @@ -18,7 +18,7 @@ func Plans() *schema.Table { Description: `https://docs.aws.amazon.com/autoscaling/plans/APIReference/API_ScalingPlan.html`, Resolver: fetchPlans, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "autoscaling-plans"), - Transform: transformers.TransformWithStruct(&types.ScalingPlan{}, transformers.WithPrimaryKeys("ScalingPlanName")), + Transform: transformers.TransformWithStruct(&types.ScalingPlan{}, transformers.WithPrimaryKeyComponents("ScalingPlanName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/backup/jobs.go b/plugins/source/aws/resources/services/backup/jobs.go index f82d2dd0c263dc..2db9bbfb9235ef 100644 --- a/plugins/source/aws/resources/services/backup/jobs.go +++ b/plugins/source/aws/resources/services/backup/jobs.go @@ -18,7 +18,7 @@ func Jobs() *schema.Table { Description: `https://docs.aws.amazon.com/aws-backup/latest/devguide/API_BackupJob.html`, Resolver: fetchBackupJobs, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "backup"), - Transform: transformers.TransformWithStruct(&types.BackupJob{}, transformers.WithPrimaryKeys("BackupJobId")), + Transform: transformers.TransformWithStruct(&types.BackupJob{}, transformers.WithPrimaryKeyComponents("BackupJobId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/backup/plan_selections.go b/plugins/source/aws/resources/services/backup/plan_selections.go index 399de24f091b70..6e982951ee4780 100644 --- a/plugins/source/aws/resources/services/backup/plan_selections.go +++ b/plugins/source/aws/resources/services/backup/plan_selections.go @@ -22,16 +22,16 @@ func planSelections() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "plan_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "plan_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "plan_version_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("version_id"), - PrimaryKey: true, + Name: "plan_version_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("version_id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/backup/plans.go b/plugins/source/aws/resources/services/backup/plans.go index 1497bb010708b9..b76f1d53efeac4 100644 --- a/plugins/source/aws/resources/services/backup/plans.go +++ b/plugins/source/aws/resources/services/backup/plans.go @@ -21,15 +21,15 @@ func Plans() *schema.Table { Resolver: fetchBackupPlans, PreResourceResolver: getPlan, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "backup"), - Transform: transformers.TransformWithStruct(&backup.GetBackupPlanOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("VersionId")), + Transform: transformers.TransformWithStruct(&backup.GetBackupPlanOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("VersionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BackupPlanArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BackupPlanArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/backup/protected_resources.go b/plugins/source/aws/resources/services/backup/protected_resources.go index edc97631f28895..fd041d757ad93f 100644 --- a/plugins/source/aws/resources/services/backup/protected_resources.go +++ b/plugins/source/aws/resources/services/backup/protected_resources.go @@ -24,10 +24,10 @@ func ProtectedResources() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/backup/report_plans.go b/plugins/source/aws/resources/services/backup/report_plans.go index 3b57b224701770..fa0ceff9c2d039 100644 --- a/plugins/source/aws/resources/services/backup/report_plans.go +++ b/plugins/source/aws/resources/services/backup/report_plans.go @@ -24,10 +24,10 @@ func ReportPlans() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReportPlanArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReportPlanArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 de1009432e0163..c0c6b9df37c48c 100644 --- a/plugins/source/aws/resources/services/backup/vault_recovery_points.go +++ b/plugins/source/aws/resources/services/backup/vault_recovery_points.go @@ -31,10 +31,10 @@ func vaultRecoveryPoints() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RecoveryPointArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RecoveryPointArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/backup/vaults.go b/plugins/source/aws/resources/services/backup/vaults.go index 2a2af26310d683..666d79f68535a8 100644 --- a/plugins/source/aws/resources/services/backup/vaults.go +++ b/plugins/source/aws/resources/services/backup/vaults.go @@ -27,10 +27,10 @@ func Vaults() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BackupVaultArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BackupVaultArn"), + PrimaryKeyComponent: true, }, { Name: "access_policy", diff --git a/plugins/source/aws/resources/services/batch/compute_environments.go b/plugins/source/aws/resources/services/batch/compute_environments.go index 0bd7f74eef1399..cdbf9f92feffc1 100644 --- a/plugins/source/aws/resources/services/batch/compute_environments.go +++ b/plugins/source/aws/resources/services/batch/compute_environments.go @@ -30,10 +30,10 @@ func ComputeEnvironments() *schema.Table { Resolver: resolveBatchComputeEnvironmentTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ComputeEnvironmentArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ComputeEnvironmentArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/batch/job_definitions.go b/plugins/source/aws/resources/services/batch/job_definitions.go index dc373e5b597dc7..058a9ffa11afca 100644 --- a/plugins/source/aws/resources/services/batch/job_definitions.go +++ b/plugins/source/aws/resources/services/batch/job_definitions.go @@ -30,10 +30,10 @@ func JobDefinitions() *schema.Table { Resolver: resolveBatchJobDefinitionTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("JobDefinitionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("JobDefinitionArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/batch/job_queues.go b/plugins/source/aws/resources/services/batch/job_queues.go index 822c113295b608..6f3b01ec0b1e5d 100644 --- a/plugins/source/aws/resources/services/batch/job_queues.go +++ b/plugins/source/aws/resources/services/batch/job_queues.go @@ -30,10 +30,10 @@ func JobQueues() *schema.Table { Resolver: resolveBatchJobQueueTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("JobQueueArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("JobQueueArn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/batch/jobs.go b/plugins/source/aws/resources/services/batch/jobs.go index be3b57fa1bb35c..7267e04fad8b63 100644 --- a/plugins/source/aws/resources/services/batch/jobs.go +++ b/plugins/source/aws/resources/services/batch/jobs.go @@ -39,10 +39,10 @@ func jobs() *schema.Table { Resolver: resolveBatchJobTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("JobArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("JobArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go b/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go index f000f58bb1f971..a5ae8cfd53e960 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go @@ -20,7 +20,7 @@ func stackInstanceResourceDrifts() *schema.Table { Description: `https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackInstanceResourceDriftsSummary.html. The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from.`, Resolver: fetchStackInstanceResourceDrifts, - Transform: transformers.TransformWithStruct(&types.StackInstanceResourceDriftsSummary{}, transformers.WithPrimaryKeys("StackId", "LogicalResourceId", "PhysicalResourceId")), + Transform: transformers.TransformWithStruct(&types.StackInstanceResourceDriftsSummary{}, transformers.WithPrimaryKeyComponents("StackId", "LogicalResourceId", "PhysicalResourceId")), Columns: []schema.Column{ { Name: "request_account_id", @@ -33,16 +33,16 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: client.ResolveAWSRegion, }, { - Name: "stack_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("stack_set_arn"), - PrimaryKey: true, + Name: "stack_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("stack_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "operation_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("last_operation_id"), - PrimaryKey: true, + Name: "operation_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("last_operation_id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudformation/stack_instances.go b/plugins/source/aws/resources/services/cloudformation/stack_instances.go index 4aaf9cdb59dc83..01314617c28870 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_instances.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_instances.go @@ -23,7 +23,7 @@ func stackInstanceSummaries() *schema.Table { Transform: transformers.TransformWithStruct(&models.ExpandedStackInstanceSummary{}, transformers.WithUnwrapStructFields("StackInstanceSummary"), transformers.WithSkipFields("CallAs"), - transformers.WithPrimaryKeys("StackSetId", "StackId"), + transformers.WithPrimaryKeyComponents("StackSetId", "StackId"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), @@ -34,10 +34,10 @@ func stackInstanceSummaries() *schema.Table { Resolver: schema.PathResolver("StackId"), }, { - Name: "stack_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("stack_set_arn"), - PrimaryKey: true, + Name: "stack_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("stack_set_arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/cloudformation/stack_resources.go b/plugins/source/aws/resources/services/cloudformation/stack_resources.go index d9db291f6f0c8c..5e689dcf82dabf 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_resources.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_resources.go @@ -17,15 +17,15 @@ func stackResources() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_StackResourceSummary.html`, Resolver: fetchCloudformationStackResources, - Transform: transformers.TransformWithStruct(&types.StackResourceSummary{}, transformers.WithPrimaryKeys("LogicalResourceId")), + Transform: transformers.TransformWithStruct(&types.StackResourceSummary{}, transformers.WithPrimaryKeyComponents("LogicalResourceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "stack_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("id"), - PrimaryKey: true, + Name: "stack_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudformation/stack_templates.go b/plugins/source/aws/resources/services/cloudformation/stack_templates.go index f4549a7c4fd2fa..bb770bad0ecce6 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_templates.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_templates.go @@ -27,10 +27,10 @@ func stackTemplates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "stack_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "stack_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { // Might be deprecated in a future release. diff --git a/plugins/source/aws/resources/services/cloudformation/stacks.go b/plugins/source/aws/resources/services/cloudformation/stacks.go index e851f97b56bf35..83d8b459ed5b1e 100644 --- a/plugins/source/aws/resources/services/cloudformation/stacks.go +++ b/plugins/source/aws/resources/services/cloudformation/stacks.go @@ -32,10 +32,10 @@ func Stacks() *schema.Table { Resolver: schema.PathResolver("StackId"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StackId"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StackId"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go b/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go index 6ac0ef1b2cabe6..3613b932ac3ba3 100644 --- a/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go +++ b/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go @@ -20,31 +20,31 @@ func stackSetOperationResults() *schema.Table { The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from.`, Resolver: fetchCloudformationStackSetOperationResults, - Transform: transformers.TransformWithStruct(&types.StackSetOperationResultSummary{}, transformers.WithPrimaryKeys("Account", "Region")), + Transform: transformers.TransformWithStruct(&types.StackSetOperationResultSummary{}, transformers.WithPrimaryKeyComponents("Account", "Region")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "stack_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("stack_set_arn"), - PrimaryKey: true, + Name: "stack_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("stack_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "operation_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("operation_id"), - PrimaryKey: true, + Name: "operation_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("operation_id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudformation/stackset_operations.go b/plugins/source/aws/resources/services/cloudformation/stackset_operations.go index 8f2318954cb30c..512ea4760dc0eb 100644 --- a/plugins/source/aws/resources/services/cloudformation/stackset_operations.go +++ b/plugins/source/aws/resources/services/cloudformation/stackset_operations.go @@ -21,7 +21,7 @@ func stackSetOperations() *schema.Table { Transform: transformers.TransformWithStruct(&models.ExpandedStackSetOperation{}, transformers.WithUnwrapStructFields("StackSetOperation"), transformers.WithSkipFields("CallAs"), - transformers.WithPrimaryKeys("OperationId", "CreationTimestamp")), + transformers.WithPrimaryKeyComponents("OperationId", "CreationTimestamp")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), @@ -31,10 +31,10 @@ func stackSetOperations() *schema.Table { Resolver: schema.PathResolver("OperationId"), }, { - Name: "stack_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("stack_set_arn"), - PrimaryKey: true, + Name: "stack_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("stack_set_arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/cloudformation/stacksets.go b/plugins/source/aws/resources/services/cloudformation/stacksets.go index d3129bf822e9e6..9c64dfc65d0006 100644 --- a/plugins/source/aws/resources/services/cloudformation/stacksets.go +++ b/plugins/source/aws/resources/services/cloudformation/stacksets.go @@ -31,10 +31,10 @@ func StackSets() *schema.Table { Resolver: schema.PathResolver("StackSetId"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StackSetARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StackSetARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cloudformation/template_summaries.go b/plugins/source/aws/resources/services/cloudformation/template_summaries.go index f61374adf05f29..e6a8b2f9f6eb72 100644 --- a/plugins/source/aws/resources/services/cloudformation/template_summaries.go +++ b/plugins/source/aws/resources/services/cloudformation/template_summaries.go @@ -31,10 +31,10 @@ func templateSummaries() *schema.Table { Resolver: schema.ParentColumnResolver("id"), }, { - Name: "stack_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "stack_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "metadata", diff --git a/plugins/source/aws/resources/services/cloudfront/cache_policies.go b/plugins/source/aws/resources/services/cloudfront/cache_policies.go index b5ea592abb26e2..eb46b97539547b 100644 --- a/plugins/source/aws/resources/services/cloudfront/cache_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/cache_policies.go @@ -28,10 +28,10 @@ func CachePolicies() *schema.Table { Resolver: schema.PathResolver("CachePolicy.Id"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveCachePolicyARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveCachePolicyARN(), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudfront/distributions.go b/plugins/source/aws/resources/services/cloudfront/distributions.go index 8e4f1478586d34..7c90cfab5c1955 100644 --- a/plugins/source/aws/resources/services/cloudfront/distributions.go +++ b/plugins/source/aws/resources/services/cloudfront/distributions.go @@ -29,10 +29,10 @@ func Distributions() *schema.Table { Resolver: resolveCloudfrontDistributionTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudfront/functions.go b/plugins/source/aws/resources/services/cloudfront/functions.go index d08cd2099d72b0..63935e139935de 100644 --- a/plugins/source/aws/resources/services/cloudfront/functions.go +++ b/plugins/source/aws/resources/services/cloudfront/functions.go @@ -24,16 +24,16 @@ func Functions() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "stage", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FunctionSummary.FunctionMetadata.Stage"), - PrimaryKey: true, + Name: "stage", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FunctionSummary.FunctionMetadata.Stage"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FunctionSummary.FunctionMetadata.FunctionARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FunctionSummary.FunctionMetadata.FunctionARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go b/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go index 64f0a3d04de0d6..4d1dcb95d9049a 100644 --- a/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go +++ b/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go @@ -17,7 +17,7 @@ func OriginAccessIdentities() *schema.Table { Description: `https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ListCloudFrontOriginAccessIdentities.html`, Resolver: fetchCloudfrontOriginAccessIdentities, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "cloudfront"), - Transform: transformers.TransformWithStruct(&types.CloudFrontOriginAccessIdentitySummary{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.CloudFrontOriginAccessIdentitySummary{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), }, diff --git a/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go b/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go index 095b4c9eaac5c5..ff3587104bb39b 100644 --- a/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go @@ -23,10 +23,10 @@ func OriginRequestPolicies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("OriginRequestPolicy.Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("OriginRequestPolicy.Id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go b/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go index 486de69b295783..5d3b9f317b071f 100644 --- a/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go @@ -23,10 +23,10 @@ func ResponseHeaderPolicies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResponseHeadersPolicy.Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResponseHeadersPolicy.Id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudhsmv2/backups.go b/plugins/source/aws/resources/services/cloudhsmv2/backups.go index a1cd3e2d17f0da..e7cdf38a8224ef 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/backups.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/backups.go @@ -26,10 +26,10 @@ func Backups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveBackupArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveBackupArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go index 275a84386603ba..e4a2a099c17fdb 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go @@ -26,10 +26,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveClusterArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveClusterArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cloudtrail/channels.go b/plugins/source/aws/resources/services/cloudtrail/channels.go index ddd85f3d795275..bd5e20320e3f85 100644 --- a/plugins/source/aws/resources/services/cloudtrail/channels.go +++ b/plugins/source/aws/resources/services/cloudtrail/channels.go @@ -25,10 +25,10 @@ func Channels() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ChannelArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ChannelArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudtrail/events.go b/plugins/source/aws/resources/services/cloudtrail/events.go index 0f2558c595f65f..a8c58fe8ba5a6e 100644 --- a/plugins/source/aws/resources/services/cloudtrail/events.go +++ b/plugins/source/aws/resources/services/cloudtrail/events.go @@ -22,7 +22,7 @@ func Events() *schema.Table { Description: `https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_Event.html`, Resolver: fetchCloudtrailEvents, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "cloudtrail"), - Transform: transformers.TransformWithStruct(&types.Event{}, transformers.WithPrimaryKeys("EventId")), + Transform: transformers.TransformWithStruct(&types.Event{}, transformers.WithPrimaryKeyComponents("EventId")), IsIncremental: true, Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/cloudtrail/imports.go b/plugins/source/aws/resources/services/cloudtrail/imports.go index 7f8b99dd113029..93a7bc9e1d778d 100644 --- a/plugins/source/aws/resources/services/cloudtrail/imports.go +++ b/plugins/source/aws/resources/services/cloudtrail/imports.go @@ -27,10 +27,10 @@ func Imports() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ImportId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ImportId"), + PrimaryKeyComponent: true, }, }, } 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 72bfb9b79fc8b6..5a564c88c903e7 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go +++ b/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go @@ -17,7 +17,7 @@ func trailEventSelectors() *schema.Table { Description: `https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_GetEventSelectors.html`, Resolver: fetchCloudtrailTrailEventSelectors, Transform: transformers.TransformWithStruct(&cloudtrail.GetEventSelectorsOutput{}, - transformers.WithPrimaryKeys("TrailARN"), + transformers.WithPrimaryKeyComponents("TrailARN"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false)}, } diff --git a/plugins/source/aws/resources/services/cloudtrail/trails.go b/plugins/source/aws/resources/services/cloudtrail/trails.go index ad93a143b4e7f9..b03705df5f9700 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trails.go +++ b/plugins/source/aws/resources/services/cloudtrail/trails.go @@ -34,10 +34,10 @@ func Trails() *schema.Table { Resolver: resolveCloudtrailTrailCloudwatchLogsLogGroupName, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TrailARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TrailARN"), + PrimaryKeyComponent: true, }, { Name: "status", diff --git a/plugins/source/aws/resources/services/cloudwatch/alarms.go b/plugins/source/aws/resources/services/cloudwatch/alarms.go index 6cd885712c87cb..61696d44f067b6 100644 --- a/plugins/source/aws/resources/services/cloudwatch/alarms.go +++ b/plugins/source/aws/resources/services/cloudwatch/alarms.go @@ -29,10 +29,10 @@ func Alarms() *schema.Table { Resolver: resolveCloudwatchAlarmTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AlarmArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AlarmArn"), + PrimaryKeyComponent: true, }, { Name: "dimensions", diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go b/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go index 2f4ffe620f4761..b1508f8f2e95b8 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go @@ -22,11 +22,11 @@ func dataProtectionPolicy() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "log_group_arn", - Description: "The Amazon Resource Name (ARN) of the log group.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "log_group_arn", + Description: "The Amazon Resource Name (ARN) of the log group.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go index c6ecdad8a43226..cfff44c871d4bb 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go @@ -24,10 +24,10 @@ func LogGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go index dc2c411a0e2902..4da7e126df6ddc 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go @@ -20,15 +20,15 @@ func MetricFilters() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_MetricFilter.html`, Resolver: fetchCloudwatchlogsMetricFilters, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "logs"), - Transform: transformers.TransformWithStruct(&types.MetricFilter{}, transformers.WithPrimaryKeys("FilterName")), + Transform: transformers.TransformWithStruct(&types.MetricFilter{}, transformers.WithPrimaryKeyComponents("FilterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "log_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveMetricFilterLogGroupArn, - PrimaryKey: true, + Name: "log_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveMetricFilterLogGroupArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go index feedeb434574f0..74f52bf227df5a 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go @@ -25,10 +25,10 @@ func ResourcePolicies() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "policy_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyName"), - PrimaryKey: true, + Name: "policy_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyName"), + PrimaryKeyComponent: true, }, { Name: "policy_document", diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go b/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go index 998fc03001e5f3..8f26ab52fab13a 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go @@ -17,16 +17,16 @@ func subscriptionFilters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_SubscriptionFilter.html`, Resolver: fetchCloudwatchlogsSubscriptionFilters, - Transform: transformers.TransformWithStruct(&types.SubscriptionFilter{}, transformers.WithPrimaryKeys("FilterName", "CreationTime")), + Transform: transformers.TransformWithStruct(&types.SubscriptionFilter{}, transformers.WithPrimaryKeyComponents("FilterName", "CreationTime")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "log_group_arn", - Description: "The Amazon Resource Name (ARN) of the log group.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "log_group_arn", + Description: "The Amazon Resource Name (ARN) of the log group.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/codeartifact/domains.go b/plugins/source/aws/resources/services/codeartifact/domains.go index c0a9581983b8f4..1ec4027d270c5b 100644 --- a/plugins/source/aws/resources/services/codeartifact/domains.go +++ b/plugins/source/aws/resources/services/codeartifact/domains.go @@ -21,19 +21,19 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: fetchDomains, PreResourceResolver: getDomain, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "codeartifact"), - Transform: transformers.TransformWithStruct(&types.DomainDescription{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.DomainDescription{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/codeartifact/repositories.go b/plugins/source/aws/resources/services/codeartifact/repositories.go index 3669c0a8061a18..eb93a0a7fc0659 100644 --- a/plugins/source/aws/resources/services/codeartifact/repositories.go +++ b/plugins/source/aws/resources/services/codeartifact/repositories.go @@ -21,19 +21,19 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: fetchRepositories, PreResourceResolver: getRepository, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "codeartifact"), - Transform: transformers.TransformWithStruct(&types.RepositoryDescription{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.RepositoryDescription{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/codebuild/builds.go b/plugins/source/aws/resources/services/codebuild/builds.go index 9b174c20518bb5..667f5b32e6543d 100644 --- a/plugins/source/aws/resources/services/codebuild/builds.go +++ b/plugins/source/aws/resources/services/codebuild/builds.go @@ -15,7 +15,7 @@ func builds() *schema.Table { Name: "aws_codebuild_builds", Description: `https://docs.aws.amazon.com/codebuild/latest/APIReference/API_Build.html`, Resolver: fetchBuildsForProject, - Transform: transformers.TransformWithStruct(&types.Build{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Build{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/codebuild/projects.go b/plugins/source/aws/resources/services/codebuild/projects.go index 67bb8b23c17361..3ba747b2bfa364 100644 --- a/plugins/source/aws/resources/services/codebuild/projects.go +++ b/plugins/source/aws/resources/services/codebuild/projects.go @@ -24,10 +24,10 @@ func Projects() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/codebuild/source_credentials.go b/plugins/source/aws/resources/services/codebuild/source_credentials.go index 335fdd817fd13f..6c753ae54e0a99 100644 --- a/plugins/source/aws/resources/services/codebuild/source_credentials.go +++ b/plugins/source/aws/resources/services/codebuild/source_credentials.go @@ -17,7 +17,7 @@ func SourceCredentials() *schema.Table { Description: `https://docs.aws.amazon.com/codebuild/latest/APIReference/API_SourceCredentialsInfo.html`, Resolver: fetchSourceCredentials, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "codebuild"), - Transform: transformers.TransformWithStruct(&types.SourceCredentialsInfo{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.SourceCredentialsInfo{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/codecommit/repositories.go b/plugins/source/aws/resources/services/codecommit/repositories.go index a51bdf8158e4e9..5c4832efbea0ef 100644 --- a/plugins/source/aws/resources/services/codecommit/repositories.go +++ b/plugins/source/aws/resources/services/codecommit/repositories.go @@ -19,7 +19,7 @@ func Repositories() *schema.Table { Description: `https://docs.aws.amazon.com/codecommit/latest/APIReference/API_RepositoryMetadata.html`, Resolver: fetchRepositories, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "codecommit"), - Transform: transformers.TransformWithStruct(&types.RepositoryMetadata{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.RepositoryMetadata{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/codepipeline/pipelines.go b/plugins/source/aws/resources/services/codepipeline/pipelines.go index 6c30687b43acf4..2e761dbbb41695 100644 --- a/plugins/source/aws/resources/services/codepipeline/pipelines.go +++ b/plugins/source/aws/resources/services/codepipeline/pipelines.go @@ -26,10 +26,10 @@ func Pipelines() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolvePipelineArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolvePipelineArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/codepipeline/webhooks.go b/plugins/source/aws/resources/services/codepipeline/webhooks.go index 9429da79a6d1bb..977b5425c0e60c 100644 --- a/plugins/source/aws/resources/services/codepipeline/webhooks.go +++ b/plugins/source/aws/resources/services/codepipeline/webhooks.go @@ -24,10 +24,10 @@ func Webhooks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/cognito/identity_pools.go b/plugins/source/aws/resources/services/cognito/identity_pools.go index 9593d26617e507..29640f95122140 100644 --- a/plugins/source/aws/resources/services/cognito/identity_pools.go +++ b/plugins/source/aws/resources/services/cognito/identity_pools.go @@ -33,10 +33,10 @@ func IdentityPools() *schema.Table { Resolver: resolveIdentityPoolARN(), }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("IdentityPoolId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("IdentityPoolId"), + PrimaryKeyComponent: true, }, { Name: "saml_provider_arns", 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 e57bfc2cda4891..fbe15b4bdc33d5 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 @@ -18,15 +18,15 @@ func userPoolIdentityProviders() *schema.Table { Description: `https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_IdentityProviderType.html`, Resolver: fetchCognitoUserPoolIdentityProviders, PreResourceResolver: getUserPoolIdentityProvider, - Transform: transformers.TransformWithStruct(&types.IdentityProviderType{}, transformers.WithPrimaryKeys("ProviderName")), + Transform: transformers.TransformWithStruct(&types.IdentityProviderType{}, transformers.WithPrimaryKeyComponents("ProviderName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "user_pool_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_pool_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/cognito/user_pools.go b/plugins/source/aws/resources/services/cognito/user_pools.go index b1d5397609abcc..8a8dcc348f0c86 100644 --- a/plugins/source/aws/resources/services/cognito/user_pools.go +++ b/plugins/source/aws/resources/services/cognito/user_pools.go @@ -25,10 +25,10 @@ func UserPools() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go index ac00cdb5c636ac..596ad8f75278ab 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go @@ -18,7 +18,7 @@ func AutoscalingGroupsRecommendations() *schema.Table { Description: `https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_AutoScalingGroupRecommendation.html`, Resolver: fetchAutoscalingGroupsRecommendations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "compute-optimizer"), - Transform: transformers.TransformWithStruct(&types.AutoScalingGroupRecommendation{}, transformers.WithPrimaryKeys("AutoScalingGroupArn")), + Transform: transformers.TransformWithStruct(&types.AutoScalingGroupRecommendation{}, transformers.WithPrimaryKeyComponents("AutoScalingGroupArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), }, diff --git a/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go index f51794b008a5b8..1c0a3f5e46ba7a 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go @@ -19,7 +19,7 @@ func EbsVolumeRecommendations() *schema.Table { Description: `https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_VolumeRecommendation.html`, Resolver: fetchEbsVolumeRecommendations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "compute-optimizer"), - Transform: transformers.TransformWithStruct(&types.VolumeRecommendation{}, transformers.WithPrimaryKeys("VolumeArn")), + Transform: transformers.TransformWithStruct(&types.VolumeRecommendation{}, transformers.WithPrimaryKeyComponents("VolumeArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { diff --git a/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go index ad0672e4337f0f..b1703e963c7a14 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go @@ -19,7 +19,7 @@ func Ec2InstanceRecommendations() *schema.Table { Description: `https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_InstanceRecommendation.html`, Resolver: fetchEc2InstanceRecommendations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "compute-optimizer"), - Transform: transformers.TransformWithStruct(&types.InstanceRecommendation{}, transformers.WithPrimaryKeys("InstanceArn")), + Transform: transformers.TransformWithStruct(&types.InstanceRecommendation{}, transformers.WithPrimaryKeyComponents("InstanceArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { diff --git a/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go index 6d45dc0f3cc292..48bf540b2f85bf 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go @@ -19,7 +19,7 @@ func EcsServiceRecommendations() *schema.Table { Description: `https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_ECSServiceRecommendation.html`, Resolver: fetchEcsServiceRecommendations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "compute-optimizer"), - Transform: transformers.TransformWithStruct(&types.ECSServiceRecommendation{}, transformers.WithPrimaryKeys("ServiceArn")), + Transform: transformers.TransformWithStruct(&types.ECSServiceRecommendation{}, transformers.WithPrimaryKeyComponents("ServiceArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { diff --git a/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go index bb2232c9135367..08c9e83192baad 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go @@ -19,7 +19,7 @@ func LambdaFunctionsRecommendations() *schema.Table { Description: `https://docs.aws.amazon.com/compute-optimizer/latest/APIReference/API_LambdaFunctionRecommendation.html`, Resolver: fetchLambdaFunctionsRecommendations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "compute-optimizer"), - Transform: transformers.TransformWithStruct(&types.LambdaFunctionRecommendation{}, transformers.WithPrimaryKeys("FunctionArn")), + Transform: transformers.TransformWithStruct(&types.LambdaFunctionRecommendation{}, transformers.WithPrimaryKeyComponents("FunctionArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { diff --git a/plugins/source/aws/resources/services/config/config_rule_compliance_details.go b/plugins/source/aws/resources/services/config/config_rule_compliance_details.go index 2223a521150a84..a558d6be01b528 100644 --- a/plugins/source/aws/resources/services/config/config_rule_compliance_details.go +++ b/plugins/source/aws/resources/services/config/config_rule_compliance_details.go @@ -26,16 +26,16 @@ func configRuleComplianceDetails() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "config_rule_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "config_rule_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "resource_evaluation_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EvaluationResultIdentifier.ResourceEvaluationId"), - PrimaryKey: true, + Name: "resource_evaluation_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EvaluationResultIdentifier.ResourceEvaluationId"), + PrimaryKeyComponent: true, }, { Name: "config_rule_name", 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 a922c637075cee..b3e88aca642351 100644 --- a/plugins/source/aws/resources/services/config/config_rule_compliances.go +++ b/plugins/source/aws/resources/services/config/config_rule_compliances.go @@ -23,10 +23,10 @@ func configRuleCompliances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "config_rule_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "config_rule_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/config/config_rules.go b/plugins/source/aws/resources/services/config/config_rules.go index a7c3df67c155e9..0e1590238e6040 100644 --- a/plugins/source/aws/resources/services/config/config_rules.go +++ b/plugins/source/aws/resources/services/config/config_rules.go @@ -23,10 +23,10 @@ func ConfigRules() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConfigRuleArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConfigRuleArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/config/configuration_aggregators.go b/plugins/source/aws/resources/services/config/configuration_aggregators.go index 71ab2a1f0071da..a21d5f4b32c876 100644 --- a/plugins/source/aws/resources/services/config/configuration_aggregators.go +++ b/plugins/source/aws/resources/services/config/configuration_aggregators.go @@ -23,10 +23,10 @@ func ConfigurationAggregators() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConfigurationAggregatorArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConfigurationAggregatorArn"), + PrimaryKeyComponent: true, }, }, 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 64a3453c53da32..ddec5325d30084 100644 --- a/plugins/source/aws/resources/services/config/configuration_recorders.go +++ b/plugins/source/aws/resources/services/config/configuration_recorders.go @@ -27,10 +27,10 @@ func ConfigurationRecorders() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: generateConfigRecorderArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: generateConfigRecorderArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/config/conformance_packs.go b/plugins/source/aws/resources/services/config/conformance_packs.go index fab1f37714305d..e5effb6ce65648 100644 --- a/plugins/source/aws/resources/services/config/conformance_packs.go +++ b/plugins/source/aws/resources/services/config/conformance_packs.go @@ -25,10 +25,10 @@ func ConformancePacks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConformancePackArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConformancePackArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/config/deliver_channel_statuses.go b/plugins/source/aws/resources/services/config/deliver_channel_statuses.go index 0448f7317eae58..92314502fcf076 100644 --- a/plugins/source/aws/resources/services/config/deliver_channel_statuses.go +++ b/plugins/source/aws/resources/services/config/deliver_channel_statuses.go @@ -17,7 +17,7 @@ func deliveryChannelStatuses() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/config/latest/APIReference/API_DescribeDeliveryChannelStatus.html`, Resolver: fetchDeliveryChannelStatuses, - Transform: transformers.TransformWithStruct(&types.DeliveryChannelStatus{}, transformers.WithPrimaryKeys("Name")), + Transform: transformers.TransformWithStruct(&types.DeliveryChannelStatus{}, transformers.WithPrimaryKeyComponents("Name")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/config/delivery_channels.go b/plugins/source/aws/resources/services/config/delivery_channels.go index 70b408deaaecfc..daeab17e048517 100644 --- a/plugins/source/aws/resources/services/config/delivery_channels.go +++ b/plugins/source/aws/resources/services/config/delivery_channels.go @@ -17,7 +17,7 @@ func DeliveryChannels() *schema.Table { Description: `https://docs.aws.amazon.com/config/latest/APIReference/API_DeliveryChannel.html`, Resolver: fetchDeliveryChannels, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "config"), - Transform: transformers.TransformWithStruct(&types.DeliveryChannel{}, transformers.WithPrimaryKeys("Name")), + Transform: transformers.TransformWithStruct(&types.DeliveryChannel{}, transformers.WithPrimaryKeyComponents("Name")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/config/remediation_configurations.go b/plugins/source/aws/resources/services/config/remediation_configurations.go index d0c50c874e41be..85fc4b770af2d4 100644 --- a/plugins/source/aws/resources/services/config/remediation_configurations.go +++ b/plugins/source/aws/resources/services/config/remediation_configurations.go @@ -17,7 +17,7 @@ func remediationConfigurations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/config/latest/APIReference/API_RemediationConfiguration.html`, Resolver: fetchRemediationConfigurations, - Transform: transformers.TransformWithStruct(&types.RemediationConfiguration{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.RemediationConfiguration{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/config/retention_configurations.go b/plugins/source/aws/resources/services/config/retention_configurations.go index 68046527345da6..ce9099b516fe86 100644 --- a/plugins/source/aws/resources/services/config/retention_configurations.go +++ b/plugins/source/aws/resources/services/config/retention_configurations.go @@ -18,7 +18,7 @@ func RetentionConfigurations() *schema.Table { Resolver: fetchRetentionConfigurations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "config"), Transform: transformers.TransformWithStruct(&types.RetentionConfiguration{}, - transformers.WithPrimaryKeys("Name")), + transformers.WithPrimaryKeyComponents("Name")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go b/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go index 61e10af710a4ca..729e29f57cfb55 100644 --- a/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go +++ b/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go @@ -26,18 +26,18 @@ To sync this table you must set the 'use_paid_apis' option to 'true' in the AWS Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "start_date", - Description: `The start date covered by the forecast.`, - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TimePeriod.Start"), - PrimaryKey: true, + Name: "start_date", + Description: `The start date covered by the forecast.`, + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TimePeriod.Start"), + PrimaryKeyComponent: true, }, { - Name: "end_date", - Description: `The end date covered by the forecast.`, - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TimePeriod.End"), - PrimaryKey: true, + Name: "end_date", + Description: `The end date covered by the forecast.`, + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TimePeriod.End"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go b/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go index d8a8964bc45e05..66fdb7b4069466 100644 --- a/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go +++ b/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go @@ -26,18 +26,18 @@ To sync this table you must set the 'use_paid_apis' option to 'true' in the AWS Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "start_date", - Description: `The start date covered by the forecast.`, - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TimePeriod.Start"), - PrimaryKey: true, + Name: "start_date", + Description: `The start date covered by the forecast.`, + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TimePeriod.Start"), + PrimaryKeyComponent: true, }, { - Name: "end_date", - Description: `The end date covered by the forecast.`, - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TimePeriod.End"), - PrimaryKey: true, + Name: "end_date", + Description: `The end date covered by the forecast.`, + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TimePeriod.End"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/dax/clusters.go b/plugins/source/aws/resources/services/dax/clusters.go index 5abe3bf7820229..0dbd8b7bb59119 100644 --- a/plugins/source/aws/resources/services/dax/clusters.go +++ b/plugins/source/aws/resources/services/dax/clusters.go @@ -25,10 +25,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/detective/graphs.go b/plugins/source/aws/resources/services/detective/graphs.go index 1f71115e4fd742..fad81a90273be3 100644 --- a/plugins/source/aws/resources/services/detective/graphs.go +++ b/plugins/source/aws/resources/services/detective/graphs.go @@ -18,7 +18,7 @@ func Graphs() *schema.Table { Description: `https://docs.aws.amazon.com/detective/latest/APIReference/API_ListGraphs.html`, Resolver: fetchGraphs, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "api.detective"), - Transform: transformers.TransformWithStruct(&types.Graph{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Graph{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/detective/members.go b/plugins/source/aws/resources/services/detective/members.go index 6f07a48da3f316..a274d071792228 100644 --- a/plugins/source/aws/resources/services/detective/members.go +++ b/plugins/source/aws/resources/services/detective/members.go @@ -20,7 +20,7 @@ func members() *schema.Table { Description: `https://docs.aws.amazon.com/detective/latest/APIReference/API_GetMembers.html The 'request_account_id' and 'request_region' columns are added to show the account and region of where the request was made from.`, Resolver: fetchMembers, - Transform: transformers.TransformWithStruct(&types.MemberDetail{}, transformers.WithPrimaryKeys("AccountId", "GraphArn")), + Transform: transformers.TransformWithStruct(&types.MemberDetail{}, transformers.WithPrimaryKeyComponents("AccountId", "GraphArn")), Columns: []schema.Column{ { Name: "request_account_id", @@ -28,10 +28,10 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: client.ResolveAWSAccount, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/directconnect/connections.go b/plugins/source/aws/resources/services/directconnect/connections.go index c0980125f7ad71..73c3cba3f3a2f7 100644 --- a/plugins/source/aws/resources/services/directconnect/connections.go +++ b/plugins/source/aws/resources/services/directconnect/connections.go @@ -22,10 +22,10 @@ func Connections() *schema.Table { Transform: transformers.TransformWithStruct(&types.Connection{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "request_region", @@ -33,16 +33,16 @@ func Connections() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveConnectionARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveConnectionARN(), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConnectionId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConnectionId"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/directconnect/gateway_associations.go b/plugins/source/aws/resources/services/directconnect/gateway_associations.go index 5e624c62456210..5fc84870273398 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_associations.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_associations.go @@ -18,13 +18,13 @@ func gatewayAssociations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAssociation.html`, Resolver: fetchDirectconnectGatewayAssociations, - Transform: transformers.TransformWithStruct(&types.DirectConnectGatewayAssociation{}, transformers.WithPrimaryKeys("AssociationId")), + Transform: transformers.TransformWithStruct(&types.DirectConnectGatewayAssociation{}, transformers.WithPrimaryKeyComponents("AssociationId")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "request_region", @@ -32,10 +32,10 @@ func gatewayAssociations() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "gateway_id", diff --git a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go index efe91c2ed852ea..8055f3cf7a56e9 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go @@ -19,14 +19,14 @@ func gatewayAttachments() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DirectConnectGatewayAttachment.html`, Resolver: fetchDirectconnectGatewayAttachments, Transform: transformers.TransformWithStruct(&types.DirectConnectGatewayAttachment{}, - transformers.WithPrimaryKeys("VirtualInterfaceOwnerAccount", "VirtualInterfaceRegion", "VirtualInterfaceId"), + transformers.WithPrimaryKeyComponents("VirtualInterfaceOwnerAccount", "VirtualInterfaceRegion", "VirtualInterfaceId"), ), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "request_region", @@ -34,10 +34,10 @@ func gatewayAttachments() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "gateway_id", diff --git a/plugins/source/aws/resources/services/directconnect/gateways.go b/plugins/source/aws/resources/services/directconnect/gateways.go index 78ca40e37ced9c..8d3f015fd1a093 100644 --- a/plugins/source/aws/resources/services/directconnect/gateways.go +++ b/plugins/source/aws/resources/services/directconnect/gateways.go @@ -24,10 +24,10 @@ func Gateways() *schema.Table { Transform: transformers.TransformWithStruct(&types.DirectConnectGateway{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "request_region", @@ -35,10 +35,10 @@ func Gateways() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGatewayARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGatewayARN, + PrimaryKeyComponent: true, }, { Name: "id", diff --git a/plugins/source/aws/resources/services/directconnect/lags.go b/plugins/source/aws/resources/services/directconnect/lags.go index 182f9667de7547..fb5881083b0a6a 100644 --- a/plugins/source/aws/resources/services/directconnect/lags.go +++ b/plugins/source/aws/resources/services/directconnect/lags.go @@ -22,10 +22,10 @@ func Lags() *schema.Table { Transform: transformers.TransformWithStruct(&types.Lag{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "request_region", @@ -33,10 +33,10 @@ func Lags() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveLagARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveLagARN(), + PrimaryKeyComponent: true, }, { Name: "id", diff --git a/plugins/source/aws/resources/services/directconnect/locations.go b/plugins/source/aws/resources/services/directconnect/locations.go index a4d9d98e70878a..aedf54ff19e9fe 100644 --- a/plugins/source/aws/resources/services/directconnect/locations.go +++ b/plugins/source/aws/resources/services/directconnect/locations.go @@ -18,19 +18,19 @@ func Locations() *schema.Table { Description: `https://docs.aws.amazon.com/directconnect/latest/APIReference/API_Location.html`, Resolver: fetchDirectConnectLocations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "directconnect"), - Transform: transformers.TransformWithStruct(&types.Location{}, transformers.WithPrimaryKeys("LocationCode")), + Transform: transformers.TransformWithStruct(&types.Location{}, transformers.WithPrimaryKeyComponents("LocationCode")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go index 72959797ecb94f..ef2e5ba7b96b52 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go @@ -21,22 +21,22 @@ func VirtualGateways() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualGateway{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("VirtualGatewayId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("VirtualGatewayId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go index ffc4d01a0a2a5d..4f43f2312d9d46 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go @@ -22,22 +22,22 @@ func VirtualInterfaces() *schema.Table { Transform: transformers.TransformWithStruct(&types.VirtualInterface{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVirtualInterfaceARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVirtualInterfaceARN(), + PrimaryKeyComponent: true, }, { Name: "id", diff --git a/plugins/source/aws/resources/services/dms/replication_instances.go b/plugins/source/aws/resources/services/dms/replication_instances.go index 00329ebc788d74..4e7610555e1a34 100644 --- a/plugins/source/aws/resources/services/dms/replication_instances.go +++ b/plugins/source/aws/resources/services/dms/replication_instances.go @@ -23,10 +23,10 @@ func ReplicationInstances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReplicationInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReplicationInstanceArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/docdb/certificates.go b/plugins/source/aws/resources/services/docdb/certificates.go index b5ecc4817b6401..8b2a5dcfd558e1 100644 --- a/plugins/source/aws/resources/services/docdb/certificates.go +++ b/plugins/source/aws/resources/services/docdb/certificates.go @@ -23,10 +23,10 @@ func Certificates() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, }, } 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 e2a1769f9185d7..2bd61ee15ff061 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go @@ -29,10 +29,10 @@ func ClusterParameterGroups() *schema.Table { Resolver: resolveDBClusterParameterGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterParameterGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterParameterGroupArn"), + PrimaryKeyComponent: true, }, { Name: "parameters", diff --git a/plugins/source/aws/resources/services/docdb/cluster_parameters.go b/plugins/source/aws/resources/services/docdb/cluster_parameters.go index 2100906b78431b..81e3f506c47411 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameters.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameters.go @@ -17,21 +17,21 @@ func clusterParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_Parameter.html`, Resolver: fetchDocdbClusterParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "engine", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("engine"), - PrimaryKey: true, + Name: "engine", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("engine"), + PrimaryKeyComponent: true, }, { - Name: "engine_version", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("engine_version"), - PrimaryKey: true, + Name: "engine_version", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("engine_version"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go index 9689023eb59df7..262a28feb0d979 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go @@ -28,10 +28,10 @@ func clusterSnapshots() *schema.Table { Resolver: resolveDBClusterSnapshotTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterSnapshotArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterSnapshotArn"), + PrimaryKeyComponent: true, }, { Name: "attributes", diff --git a/plugins/source/aws/resources/services/docdb/clusters.go b/plugins/source/aws/resources/services/docdb/clusters.go index 7573767d65d799..6e06df644f050d 100644 --- a/plugins/source/aws/resources/services/docdb/clusters.go +++ b/plugins/source/aws/resources/services/docdb/clusters.go @@ -30,10 +30,10 @@ func Clusters() *schema.Table { Resolver: resolveDBClusterTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/docdb/engine_versions.go b/plugins/source/aws/resources/services/docdb/engine_versions.go index a78abe30d001b3..e397d4acc5e716 100644 --- a/plugins/source/aws/resources/services/docdb/engine_versions.go +++ b/plugins/source/aws/resources/services/docdb/engine_versions.go @@ -19,7 +19,7 @@ func EngineVersions() *schema.Table { Resolver: fetchDocdbEngineVersions, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "docdb"), Transform: transformers.TransformWithStruct(&types.DBEngineVersion{}, - transformers.WithPrimaryKeys("Engine", "EngineVersion")), + transformers.WithPrimaryKeyComponents("Engine", "EngineVersion")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/docdb/event_categories.go b/plugins/source/aws/resources/services/docdb/event_categories.go index 3e8b6634ff307e..864b7b1b500778 100644 --- a/plugins/source/aws/resources/services/docdb/event_categories.go +++ b/plugins/source/aws/resources/services/docdb/event_categories.go @@ -18,7 +18,7 @@ func EventCategories() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_EventCategoriesMap.html`, Resolver: fetchDocdbEventCategories, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "docdb"), - Transform: transformers.TransformWithStruct(&types.EventCategoriesMap{}, transformers.WithPrimaryKeys("SourceType")), + Transform: transformers.TransformWithStruct(&types.EventCategoriesMap{}, transformers.WithPrimaryKeyComponents("SourceType")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/docdb/event_subscriptions.go b/plugins/source/aws/resources/services/docdb/event_subscriptions.go index b49ea1b108cdef..e29271c42245e4 100644 --- a/plugins/source/aws/resources/services/docdb/event_subscriptions.go +++ b/plugins/source/aws/resources/services/docdb/event_subscriptions.go @@ -24,10 +24,10 @@ func EventSubscriptions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EventSubscriptionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EventSubscriptionArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/docdb/events.go b/plugins/source/aws/resources/services/docdb/events.go index dc737f40d7b092..bc4e9450b73b0c 100644 --- a/plugins/source/aws/resources/services/docdb/events.go +++ b/plugins/source/aws/resources/services/docdb/events.go @@ -20,7 +20,7 @@ func Events() *schema.Table { Resolver: fetchDocdbEvents, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "docdb"), Transform: transformers.TransformWithStruct(&types.Event{}, - transformers.WithPrimaryKeys("SourceArn", "SourceIdentifier", "Date"), + transformers.WithPrimaryKeyComponents("SourceArn", "SourceIdentifier", "Date"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), @@ -31,7 +31,7 @@ func Events() *schema.Table { Resolver: func(_ context.Context, _ schema.ClientMeta, r *schema.Resource, c schema.Column) error { return r.Set(c.Name, strings.Join(r.Item.(types.Event).EventCategories, ",")) }, - PrimaryKey: true, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/docdb/global_clusters.go b/plugins/source/aws/resources/services/docdb/global_clusters.go index 2bdb1f425c1b42..4c3a0ef20f556b 100644 --- a/plugins/source/aws/resources/services/docdb/global_clusters.go +++ b/plugins/source/aws/resources/services/docdb/global_clusters.go @@ -23,10 +23,10 @@ func GlobalClusters() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GlobalClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GlobalClusterArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/docdb/instances.go b/plugins/source/aws/resources/services/docdb/instances.go index 38e17ae8ca6aea..4d593a6ef98268 100644 --- a/plugins/source/aws/resources/services/docdb/instances.go +++ b/plugins/source/aws/resources/services/docdb/instances.go @@ -29,10 +29,10 @@ func instances() *schema.Table { Resolver: resolveDBInstanceTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBInstanceArn"), + PrimaryKeyComponent: true, }, }, } 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 6569e2c7270a60..8e91959bf50846 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 @@ -17,7 +17,7 @@ func orderableDbInstanceOptions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_OrderableDBInstanceOption.html`, Resolver: fetchDocdbOrderableDbInstanceOptions, Transform: transformers.TransformWithStruct(&types.OrderableDBInstanceOption{}, - transformers.WithPrimaryKeys("DBInstanceClass", "Engine", "EngineVersion"), + transformers.WithPrimaryKeyComponents("DBInstanceClass", "Engine", "EngineVersion"), ), Columns: schema.ColumnList{ client.DefaultAccountIDColumn(true), 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 bb05b7d6c3c425..ab4e877ce7b80e 100644 --- a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go +++ b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go @@ -18,7 +18,7 @@ func PendingMaintenanceActions() *schema.Table { Description: `https://docs.aws.amazon.com/documentdb/latest/developerguide/API_PendingMaintenanceAction.html`, Resolver: fetchDocdbPendingMaintenanceActions, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "docdb"), - Transform: transformers.TransformWithStruct(&types.ResourcePendingMaintenanceActions{}, transformers.WithPrimaryKeys("ResourceIdentifier")), + Transform: transformers.TransformWithStruct(&types.ResourcePendingMaintenanceActions{}, transformers.WithPrimaryKeyComponents("ResourceIdentifier")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/docdb/subnet_groups.go b/plugins/source/aws/resources/services/docdb/subnet_groups.go index e9d401c3b35bcf..3a51b103993127 100644 --- a/plugins/source/aws/resources/services/docdb/subnet_groups.go +++ b/plugins/source/aws/resources/services/docdb/subnet_groups.go @@ -29,10 +29,10 @@ func SubnetGroups() *schema.Table { Resolver: resolveDBSubnetGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBSubnetGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBSubnetGroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/dynamodb/backups.go b/plugins/source/aws/resources/services/dynamodb/backups.go index f2b06701b97568..5a8eeb697e7539 100644 --- a/plugins/source/aws/resources/services/dynamodb/backups.go +++ b/plugins/source/aws/resources/services/dynamodb/backups.go @@ -25,10 +25,10 @@ func Backups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BackupDetails.BackupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BackupDetails.BackupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/dynamodb/exports.go b/plugins/source/aws/resources/services/dynamodb/exports.go index 377655dac643a2..3c28d5b30b5f3f 100644 --- a/plugins/source/aws/resources/services/dynamodb/exports.go +++ b/plugins/source/aws/resources/services/dynamodb/exports.go @@ -24,10 +24,10 @@ func Exports() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ExportArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ExportArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/dynamodb/global_tables.go b/plugins/source/aws/resources/services/dynamodb/global_tables.go index e768294fd4a231..3f98a6db583194 100644 --- a/plugins/source/aws/resources/services/dynamodb/global_tables.go +++ b/plugins/source/aws/resources/services/dynamodb/global_tables.go @@ -28,10 +28,10 @@ This table only contains version 2017.11.29 (Legacy) Global Tables. See aws_dyna client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GlobalTableArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GlobalTableArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 4b4440c3dc4274..4b6d7f8b1e8366 100644 --- a/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go +++ b/plugins/source/aws/resources/services/dynamodb/table_continuous_backups.go @@ -22,10 +22,10 @@ func tableContinuousBackups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "table_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "table_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 221cdfdd5f95a2..693f01c277c6e7 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 @@ -18,15 +18,15 @@ func tableReplicaAutoScalings() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ReplicaAutoScalingDescription.html`, Resolver: fetchDynamodbTableReplicaAutoScalings, - Transform: transformers.TransformWithStruct(&types.ReplicaAutoScalingDescription{}, transformers.WithPrimaryKeys("RegionName")), + Transform: transformers.TransformWithStruct(&types.ReplicaAutoScalingDescription{}, transformers.WithPrimaryKeyComponents("RegionName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "table_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "table_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/dynamodb/tables.go b/plugins/source/aws/resources/services/dynamodb/tables.go index cd9fe494c999d7..612113dc825a40 100644 --- a/plugins/source/aws/resources/services/dynamodb/tables.go +++ b/plugins/source/aws/resources/services/dynamodb/tables.go @@ -31,10 +31,10 @@ func Tables() *schema.Table { Resolver: resolveDynamodbTableTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TableArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TableArn"), + PrimaryKeyComponent: true, }, { Name: "archival_summary", diff --git a/plugins/source/aws/resources/services/dynamodbstreams/streams.go b/plugins/source/aws/resources/services/dynamodbstreams/streams.go index ae152fb3fbd09b..e8d84c6a9c512a 100644 --- a/plugins/source/aws/resources/services/dynamodbstreams/streams.go +++ b/plugins/source/aws/resources/services/dynamodbstreams/streams.go @@ -25,10 +25,10 @@ func Streams() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Resolver: schema.PathResolver("StreamArn"), - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Resolver: schema.PathResolver("StreamArn"), + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/account_attributes.go b/plugins/source/aws/resources/services/ec2/account_attributes.go index 30fc701af2ed08..9ba5d0adc46802 100644 --- a/plugins/source/aws/resources/services/ec2/account_attributes.go +++ b/plugins/source/aws/resources/services/ec2/account_attributes.go @@ -18,7 +18,7 @@ func AccountAttributes() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AccountAttribute.html`, Resolver: fetchAccountAttributes, Multiplex: client.AccountMultiplex(tableName), - Transform: transformers.TransformWithStruct(&types.AccountAttribute{}, transformers.WithPrimaryKeys("AttributeName")), + Transform: transformers.TransformWithStruct(&types.AccountAttribute{}, transformers.WithPrimaryKeyComponents("AttributeName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { diff --git a/plugins/source/aws/resources/services/ec2/azs.go b/plugins/source/aws/resources/services/ec2/azs.go index 16f6b5bc118d6f..9a62aefa86c0c8 100644 --- a/plugins/source/aws/resources/services/ec2/azs.go +++ b/plugins/source/aws/resources/services/ec2/azs.go @@ -19,7 +19,7 @@ func AvailabilityZones() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AvailabilityZone.html`, Resolver: fetchAvailabilityZones, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.AvailabilityZone{}, transformers.WithPrimaryKeys("RegionName", "ZoneId")), + Transform: transformers.TransformWithStruct(&types.AvailabilityZone{}, transformers.WithPrimaryKeyComponents("RegionName", "ZoneId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { diff --git a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go index dee7e6710cf78b..01c565ccbf3fc8 100644 --- a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go +++ b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go @@ -24,9 +24,9 @@ func ByoipCidrs() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "cidr", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "cidr", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/capacity_reservations.go b/plugins/source/aws/resources/services/ec2/capacity_reservations.go index 4c4caa36ef330a..658c703ad3aeac 100644 --- a/plugins/source/aws/resources/services/ec2/capacity_reservations.go +++ b/plugins/source/aws/resources/services/ec2/capacity_reservations.go @@ -24,10 +24,10 @@ func CapacityReservations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CapacityReservationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CapacityReservationArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/customer_gateways.go b/plugins/source/aws/resources/services/ec2/customer_gateways.go index a84e4f5e188a17..1bd588d5b1f299 100644 --- a/plugins/source/aws/resources/services/ec2/customer_gateways.go +++ b/plugins/source/aws/resources/services/ec2/customer_gateways.go @@ -26,10 +26,10 @@ func CustomerGateways() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveCustomerGatewayArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveCustomerGatewayArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/dhcp_options.go b/plugins/source/aws/resources/services/ec2/dhcp_options.go index 7ae6c4b46edd82..9d9cf1897d4a61 100644 --- a/plugins/source/aws/resources/services/ec2/dhcp_options.go +++ b/plugins/source/aws/resources/services/ec2/dhcp_options.go @@ -18,7 +18,7 @@ func DHCPOptions() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DhcpOptions.html`, Resolver: fetchEC2DHCPOptions, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.DhcpOptions{}, transformers.WithPrimaryKeys("DhcpOptionsId")), + Transform: transformers.TransformWithStruct(&types.DhcpOptions{}, transformers.WithPrimaryKeyComponents("DhcpOptionsId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go b/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go index c75f0ee0fe1916..479f597f06f74f 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go +++ b/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go @@ -23,10 +23,10 @@ func ebsSnapshotAttributes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "snapshot_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "snapshot_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go index ac2fbb0c94ee1d..ece7f51b0603f2 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go +++ b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go @@ -26,10 +26,10 @@ func EbsSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEbsSnapshotArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEbsSnapshotArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go b/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go index 42b17a8276edb3..9f7baf9d8a06d2 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go +++ b/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go @@ -24,10 +24,10 @@ func EbsVolumesStatuses() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "volume_arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEbsVolumeStatusArn, - PrimaryKey: true, + Name: "volume_arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEbsVolumeStatusArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/ebs_volumes.go b/plugins/source/aws/resources/services/ec2/ebs_volumes.go index 42b1e04d7de73e..66c24bedd992c1 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_volumes.go +++ b/plugins/source/aws/resources/services/ec2/ebs_volumes.go @@ -26,10 +26,10 @@ func EbsVolumes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEbsVolumeArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEbsVolumeArn, + PrimaryKeyComponent: true, }, { Name: "tags", 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 9a487f082e5de9..933fb8fddf22e8 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 @@ -26,10 +26,10 @@ func EgressOnlyInternetGateways() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEgressOnlyInternetGatewaysArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEgressOnlyInternetGatewaysArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/eips.go b/plugins/source/aws/resources/services/ec2/eips.go index 07a0ff63f1bda6..28f4eacb0fe4d2 100644 --- a/plugins/source/aws/resources/services/ec2/eips.go +++ b/plugins/source/aws/resources/services/ec2/eips.go @@ -19,7 +19,7 @@ func Eips() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Address.html`, Resolver: fetchEc2Eips, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.Address{}, transformers.WithPrimaryKeys("AllocationId")), + Transform: transformers.TransformWithStruct(&types.Address{}, transformers.WithPrimaryKeyComponents("AllocationId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/flow_logs.go b/plugins/source/aws/resources/services/ec2/flow_logs.go index 6326bb67db0ef7..beddac6d6a8da5 100644 --- a/plugins/source/aws/resources/services/ec2/flow_logs.go +++ b/plugins/source/aws/resources/services/ec2/flow_logs.go @@ -26,10 +26,10 @@ func FlowLogs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveFlowLogArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveFlowLogArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/hosts.go b/plugins/source/aws/resources/services/ec2/hosts.go index 70615bf699ef25..211fe01049479c 100644 --- a/plugins/source/aws/resources/services/ec2/hosts.go +++ b/plugins/source/aws/resources/services/ec2/hosts.go @@ -26,10 +26,10 @@ func Hosts() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveHostArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveHostArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/image_attributes.go b/plugins/source/aws/resources/services/ec2/image_attributes.go index b7230dfafabbd7..4357adedaebf8f 100644 --- a/plugins/source/aws/resources/services/ec2/image_attributes.go +++ b/plugins/source/aws/resources/services/ec2/image_attributes.go @@ -20,10 +20,10 @@ func imageAttributesLaunchPermissions() *schema.Table { Transform: transformers.TransformWithStruct(&types.LaunchPermission{}), Columns: []schema.Column{ { - Name: "image_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "image_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/image_last_launched.go b/plugins/source/aws/resources/services/ec2/image_last_launched.go index dc4b5c79fbad3d..344a19fe8a29c0 100644 --- a/plugins/source/aws/resources/services/ec2/image_last_launched.go +++ b/plugins/source/aws/resources/services/ec2/image_last_launched.go @@ -19,10 +19,10 @@ The date and time, in ISO 8601 date-time format, when the AMI was last used to l Resolver: fetchEc2ImageAttributeLastLaunchTime, Columns: []schema.Column{ { - Name: "image_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "image_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "last_launched_time", diff --git a/plugins/source/aws/resources/services/ec2/images.go b/plugins/source/aws/resources/services/ec2/images.go index 162f05d5c49616..ba50a9c4a30807 100644 --- a/plugins/source/aws/resources/services/ec2/images.go +++ b/plugins/source/aws/resources/services/ec2/images.go @@ -39,10 +39,10 @@ func Images() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveImageArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveImageArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/instance_connect.go b/plugins/source/aws/resources/services/ec2/instance_connect.go index fb2478ff01028d..6adb732bc91c25 100644 --- a/plugins/source/aws/resources/services/ec2/instance_connect.go +++ b/plugins/source/aws/resources/services/ec2/instance_connect.go @@ -23,22 +23,22 @@ The 'request_account_id' and 'request_region' columns are added to show from whe Transform: transformers.TransformWithStruct(&types.Ec2InstanceConnectEndpoint{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("InstanceConnectEndpointArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("InstanceConnectEndpointArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/instance_statuses.go b/plugins/source/aws/resources/services/ec2/instance_statuses.go index 05ab26dee0aee9..89e21871e051ad 100644 --- a/plugins/source/aws/resources/services/ec2/instance_statuses.go +++ b/plugins/source/aws/resources/services/ec2/instance_statuses.go @@ -17,7 +17,7 @@ func InstanceStatuses() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceStatus.html`, Resolver: fetchEc2InstanceStatuses, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.InstanceStatus{}, transformers.WithPrimaryKeys("InstanceId")), + Transform: transformers.TransformWithStruct(&types.InstanceStatus{}, transformers.WithPrimaryKeyComponents("InstanceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/instance_types.go b/plugins/source/aws/resources/services/ec2/instance_types.go index 25dc42fe093116..70f3c63aa1b56f 100644 --- a/plugins/source/aws/resources/services/ec2/instance_types.go +++ b/plugins/source/aws/resources/services/ec2/instance_types.go @@ -17,7 +17,7 @@ func InstanceTypes() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceTypeInfo.html`, Resolver: fetchEc2InstanceTypes, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.InstanceTypeInfo{}, transformers.WithPrimaryKeys("InstanceType")), + Transform: transformers.TransformWithStruct(&types.InstanceTypeInfo{}, transformers.WithPrimaryKeyComponents("InstanceType")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/instances.go b/plugins/source/aws/resources/services/ec2/instances.go index 8bc7a4f4e61f8a..2b6ec060871eb2 100644 --- a/plugins/source/aws/resources/services/ec2/instances.go +++ b/plugins/source/aws/resources/services/ec2/instances.go @@ -28,10 +28,10 @@ func Instances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveInstanceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveInstanceArn, + PrimaryKeyComponent: true, }, { Name: "state_transition_reason_time", diff --git a/plugins/source/aws/resources/services/ec2/internet_gateways.go b/plugins/source/aws/resources/services/ec2/internet_gateways.go index a1be7abe9d5ea5..e301e71c92d2e8 100644 --- a/plugins/source/aws/resources/services/ec2/internet_gateways.go +++ b/plugins/source/aws/resources/services/ec2/internet_gateways.go @@ -26,10 +26,10 @@ func InternetGateways() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveInternetGatewayArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveInternetGatewayArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/key_pairs.go b/plugins/source/aws/resources/services/ec2/key_pairs.go index 9c192c5bbd3136..65ffebc38f8ffb 100644 --- a/plugins/source/aws/resources/services/ec2/key_pairs.go +++ b/plugins/source/aws/resources/services/ec2/key_pairs.go @@ -26,10 +26,10 @@ func KeyPairs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveKeyPairArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveKeyPairArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/launch_template_versions.go b/plugins/source/aws/resources/services/ec2/launch_template_versions.go index 2974fa5cbfc3aa..c3586a7caf9bdd 100644 --- a/plugins/source/aws/resources/services/ec2/launch_template_versions.go +++ b/plugins/source/aws/resources/services/ec2/launch_template_versions.go @@ -22,16 +22,16 @@ func launchTemplateVersions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "version_number", - Type: arrow.PrimitiveTypes.Int64, - Resolver: schema.PathResolver("VersionNumber"), - PrimaryKey: true, + Name: "version_number", + Type: arrow.PrimitiveTypes.Int64, + Resolver: schema.PathResolver("VersionNumber"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/launch_templates.go b/plugins/source/aws/resources/services/ec2/launch_templates.go index b5d6e8799977a9..f3a54f58072573 100644 --- a/plugins/source/aws/resources/services/ec2/launch_templates.go +++ b/plugins/source/aws/resources/services/ec2/launch_templates.go @@ -26,10 +26,10 @@ func LaunchTemplates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEc2LaunchTemplateArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEc2LaunchTemplateArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go b/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go index f1de398cf98473..45c513f32ecb01 100644 --- a/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go +++ b/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go @@ -23,22 +23,22 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Transform: transformers.TransformWithStruct(&types.ManagedPrefixList{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PrefixListArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PrefixListArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/nat_gateways.go b/plugins/source/aws/resources/services/ec2/nat_gateways.go index da175eed00053e..80f2249ed81d6a 100644 --- a/plugins/source/aws/resources/services/ec2/nat_gateways.go +++ b/plugins/source/aws/resources/services/ec2/nat_gateways.go @@ -26,10 +26,10 @@ func NatGateways() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveNatGatewayArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveNatGatewayArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/network_acls.go b/plugins/source/aws/resources/services/ec2/network_acls.go index 610b7e4133a81b..4bd8b297fa2f4a 100644 --- a/plugins/source/aws/resources/services/ec2/network_acls.go +++ b/plugins/source/aws/resources/services/ec2/network_acls.go @@ -26,10 +26,10 @@ func NetworkAcls() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveNetworkAclArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveNetworkAclArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/network_interfaces.go b/plugins/source/aws/resources/services/ec2/network_interfaces.go index 40d304497dfa73..c4405433ec3447 100644 --- a/plugins/source/aws/resources/services/ec2/network_interfaces.go +++ b/plugins/source/aws/resources/services/ec2/network_interfaces.go @@ -26,10 +26,10 @@ func NetworkInterfaces() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveNetworkInterfaceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveNetworkInterfaceArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/regions.go b/plugins/source/aws/resources/services/ec2/regions.go index b31ac5749e4ad8..0ce797666255de 100644 --- a/plugins/source/aws/resources/services/ec2/regions.go +++ b/plugins/source/aws/resources/services/ec2/regions.go @@ -33,10 +33,10 @@ func Regions() *schema.Table { Resolver: client.ResolveAWSPartition, }, { - Name: "region", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RegionName"), - PrimaryKey: true, + Name: "region", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RegionName"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/reserved_instances.go b/plugins/source/aws/resources/services/ec2/reserved_instances.go index ca8144b51ef70d..693c14b6a8575a 100644 --- a/plugins/source/aws/resources/services/ec2/reserved_instances.go +++ b/plugins/source/aws/resources/services/ec2/reserved_instances.go @@ -26,10 +26,10 @@ func ReservedInstances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveReservedInstanceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveReservedInstanceArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/route_tables.go b/plugins/source/aws/resources/services/ec2/route_tables.go index ec917f54977ddd..be6bfcbd378e8b 100644 --- a/plugins/source/aws/resources/services/ec2/route_tables.go +++ b/plugins/source/aws/resources/services/ec2/route_tables.go @@ -26,10 +26,10 @@ func RouteTables() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveRouteTableArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveRouteTableArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/security_groups.go b/plugins/source/aws/resources/services/ec2/security_groups.go index df78fa25c8e5ed..9f9dfcd0992d66 100644 --- a/plugins/source/aws/resources/services/ec2/security_groups.go +++ b/plugins/source/aws/resources/services/ec2/security_groups.go @@ -26,10 +26,10 @@ func SecurityGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveSecurityGroupArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveSecurityGroupArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go b/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go index 7866f7afd83191..1f4980b6a6c790 100644 --- a/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go +++ b/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go @@ -24,10 +24,10 @@ func spotFleetInstances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveActiveInstanceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveActiveInstanceArn, + PrimaryKeyComponent: true, }, { Name: "spot_fleet_request_id", diff --git a/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go b/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go index c7d2430a1a026b..5e16207cebb74a 100644 --- a/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go +++ b/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go @@ -18,7 +18,7 @@ func SpotFleetRequests() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetRequestConfig.html`, Resolver: fetchEC2SpotFleetRequests, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.SpotFleetRequestConfig{}, transformers.WithPrimaryKeys("SpotFleetRequestId")), + Transform: transformers.TransformWithStruct(&types.SpotFleetRequestConfig{}, transformers.WithPrimaryKeyComponents("SpotFleetRequestId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/spot_instance_requests.go b/plugins/source/aws/resources/services/ec2/spot_instance_requests.go index eee543130f66b3..0d91ae3978ce15 100644 --- a/plugins/source/aws/resources/services/ec2/spot_instance_requests.go +++ b/plugins/source/aws/resources/services/ec2/spot_instance_requests.go @@ -18,7 +18,7 @@ func SpotInstanceRequests() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotInstanceRequest.html`, Resolver: fetchEC2SpotInstanceRequests, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.SpotInstanceRequest{}, transformers.WithPrimaryKeys("SpotInstanceRequestId")), + Transform: transformers.TransformWithStruct(&types.SpotInstanceRequest{}, transformers.WithPrimaryKeyComponents("SpotInstanceRequestId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/subnets.go b/plugins/source/aws/resources/services/ec2/subnets.go index f390f3e407da87..4f17a1a43ac410 100644 --- a/plugins/source/aws/resources/services/ec2/subnets.go +++ b/plugins/source/aws/resources/services/ec2/subnets.go @@ -23,22 +23,22 @@ The 'request_account_id' and 'request_region' columns are added to show from whe Transform: transformers.TransformWithStruct(&types.Subnet{}), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SubnetArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SubnetArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 93faab07fb8f9e..747d0a7a9b29b4 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go @@ -23,16 +23,16 @@ func transitGatewayAttachments() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "transit_gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "transit_gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayAttachmentId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayAttachmentId"), + PrimaryKeyComponent: true, }, }, } 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 40fbcf59bfd0d7..4133b605b35ea1 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 @@ -23,16 +23,16 @@ func transitGatewayMulticastDomains() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "transit_gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "transit_gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayMulticastDomainArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayMulticastDomainArn"), + PrimaryKeyComponent: true, }, }, } 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 c89dd488c5a0d8..450bd7d5018498 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 @@ -23,16 +23,16 @@ func transitGatewayPeeringAttachments() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "transit_gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "transit_gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayAttachmentId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayAttachmentId"), + PrimaryKeyComponent: true, }, }, } 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 3d24e1a8dc7fad..694e0f4b5c62f4 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 @@ -23,16 +23,16 @@ func transitGatewayRouteTables() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "transit_gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "transit_gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayRouteTableId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayRouteTableId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go index a6118356b0dd94..8d42cd75558ea4 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go @@ -23,16 +23,16 @@ func transitGatewayVpcAttachments() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "transit_gateway_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "transit_gateway_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayAttachmentId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayAttachmentId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ec2/transit_gateways.go b/plugins/source/aws/resources/services/ec2/transit_gateways.go index 5ed63f824b1cfc..4b46387c15aa62 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateways.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateways.go @@ -28,10 +28,10 @@ func TransitGateways() *schema.Table { Resolver: schema.PathResolver("TransitGatewayId"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TransitGatewayArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TransitGatewayArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_connections.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_connections.go index bdcbd68968f478..389f1e535a168f 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_connections.go @@ -18,7 +18,7 @@ func VpcEndpointConnections() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpcEndpointConnection.html`, Resolver: fetchEc2VpcEndpointConnections, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.VpcEndpointConnection{}, transformers.WithPrimaryKeys("VpcEndpointConnectionId", "VpcEndpointOwner")), + Transform: transformers.TransformWithStruct(&types.VpcEndpointConnection{}, transformers.WithPrimaryKeyComponents("VpcEndpointConnectionId", "VpcEndpointOwner")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), 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 5fbf021d69b46e..9590be09aa300c 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 @@ -18,7 +18,7 @@ func VpcEndpointServiceConfigurations() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceConfiguration.html`, Resolver: fetchEc2VpcEndpointServiceConfigurations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.ServiceConfiguration{}, transformers.WithPrimaryKeys("ServiceId")), + Transform: transformers.TransformWithStruct(&types.ServiceConfiguration{}, transformers.WithPrimaryKeyComponents("ServiceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go index 685831ccc47969..ca53fe001eac31 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go @@ -18,7 +18,7 @@ func vpcEndpointServicePermissions() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AllowedPrincipal.html`, Resolver: fetchEc2VpcEndpointServicePermissions, - Transform: transformers.TransformWithStruct(&types.AllowedPrincipal{}, transformers.WithPrimaryKeys("ServiceId", "ServicePermissionId")), + Transform: transformers.TransformWithStruct(&types.AllowedPrincipal{}, transformers.WithPrimaryKeyComponents("ServiceId", "ServicePermissionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), 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 e151c26323a4f8..9f132a97b08fab 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go @@ -19,7 +19,7 @@ func VpcEndpointServices() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ServiceDetail.html`, Resolver: fetchEc2VpcEndpointServices, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.ServiceDetail{}, transformers.WithPrimaryKeys("ServiceId")), + Transform: transformers.TransformWithStruct(&types.ServiceDetail{}, transformers.WithPrimaryKeyComponents("ServiceId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go index 854af3748da0cf..6f0a0bf0bcf78b 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go @@ -26,10 +26,10 @@ func VpcEndpoints() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVpcEndpointArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVpcEndpointArn, + PrimaryKeyComponent: true, }, { Name: "tags", 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 e1528157b4eca9..7c0764d60e8fea 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go @@ -26,10 +26,10 @@ func VpcPeeringConnections() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVpcPeeringConnectionArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVpcPeeringConnectionArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/vpcs.go b/plugins/source/aws/resources/services/ec2/vpcs.go index 754f7bcbb56bc7..69639987a7c01c 100644 --- a/plugins/source/aws/resources/services/ec2/vpcs.go +++ b/plugins/source/aws/resources/services/ec2/vpcs.go @@ -26,10 +26,10 @@ func Vpcs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVpcArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVpcArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ec2/vpn_connections.go b/plugins/source/aws/resources/services/ec2/vpn_connections.go index 37be386baae0c2..16badf39251fca 100644 --- a/plugins/source/aws/resources/services/ec2/vpn_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpn_connections.go @@ -18,7 +18,7 @@ func VpnConnections() *schema.Table { Description: `https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpnConnections.html`, Resolver: fetchVpnConnections, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ec2"), - Transform: transformers.TransformWithStruct(&types.VpnConnection{}, transformers.WithPrimaryKeys("VpnConnectionId")), + Transform: transformers.TransformWithStruct(&types.VpnConnection{}, transformers.WithPrimaryKeyComponents("VpnConnectionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ec2/vpn_gateways.go b/plugins/source/aws/resources/services/ec2/vpn_gateways.go index 8837df9a8c30d5..296100c74b91ba 100644 --- a/plugins/source/aws/resources/services/ec2/vpn_gateways.go +++ b/plugins/source/aws/resources/services/ec2/vpn_gateways.go @@ -26,10 +26,10 @@ func VpnGateways() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveVpnGatewayArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveVpnGatewayArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecr/lifecycle_policy.go b/plugins/source/aws/resources/services/ecr/lifecycle_policy.go index 693e9ceecf10a4..3689b545a0e10f 100644 --- a/plugins/source/aws/resources/services/ecr/lifecycle_policy.go +++ b/plugins/source/aws/resources/services/ecr/lifecycle_policy.go @@ -18,17 +18,17 @@ func lifeCyclePolicy() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetLifecyclePolicy.html`, Resolver: fetchRepositoryLifecyclePolicy, Transform: transformers.TransformWithStruct(&ecr.GetLifecyclePolicyOutput{}, - transformers.WithPrimaryKeys("RegistryId"), + transformers.WithPrimaryKeyComponents("RegistryId"), transformers.WithSkipFields("ResultMetadata"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "repository_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "repository_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy_json", diff --git a/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go b/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go index b2c20d7337925d..f49a76916998e6 100644 --- a/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go +++ b/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go @@ -17,7 +17,7 @@ func PullThroughCacheRules() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_DescribePullThroughCacheRules.html`, Resolver: fetchPullThroughCacheRules, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "api.ecr"), - Transform: transformers.TransformWithStruct(&types.PullThroughCacheRule{}, transformers.WithPrimaryKeys("RegistryId", "UpstreamRegistryUrl", "EcrRepositoryPrefix")), + Transform: transformers.TransformWithStruct(&types.PullThroughCacheRule{}, transformers.WithPrimaryKeyComponents("RegistryId", "UpstreamRegistryUrl", "EcrRepositoryPrefix")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/ecr/registries.go b/plugins/source/aws/resources/services/ecr/registries.go index aba82d38eeb1d6..794048637596b5 100644 --- a/plugins/source/aws/resources/services/ecr/registries.go +++ b/plugins/source/aws/resources/services/ecr/registries.go @@ -17,7 +17,7 @@ func Registries() *schema.Table { Resolver: fetchEcrRegistries, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "api.ecr"), Transform: transformers.TransformWithStruct(&ecr.DescribeRegistryOutput{}, - transformers.WithPrimaryKeys("RegistryId"), + transformers.WithPrimaryKeyComponents("RegistryId"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/ecr/registry_policies.go b/plugins/source/aws/resources/services/ecr/registry_policies.go index 709caee4be0e5a..ecfb911aac761d 100644 --- a/plugins/source/aws/resources/services/ecr/registry_policies.go +++ b/plugins/source/aws/resources/services/ecr/registry_policies.go @@ -18,7 +18,7 @@ func RegistryPolicies() *schema.Table { Resolver: fetchEcrRegistryPolicies, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "api.ecr"), Transform: transformers.TransformWithStruct(&ecr.GetRegistryPolicyOutput{}, - transformers.WithPrimaryKeys("RegistryId"), + transformers.WithPrimaryKeyComponents("RegistryId"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/ecr/repositories.go b/plugins/source/aws/resources/services/ecr/repositories.go index 64838a2796244b..a955fe4ce9db09 100644 --- a/plugins/source/aws/resources/services/ecr/repositories.go +++ b/plugins/source/aws/resources/services/ecr/repositories.go @@ -20,15 +20,15 @@ func Repositories() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html`, Resolver: fetchEcrRepositories, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "api.ecr"), - Transform: transformers.TransformWithStruct(&types.Repository{}, transformers.WithPrimaryKeys("RegistryId")), + Transform: transformers.TransformWithStruct(&types.Repository{}, transformers.WithPrimaryKeyComponents("RegistryId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RepositoryArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RepositoryArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go b/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go index 1a4ef94169b49e..d62506cb618035 100644 --- a/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go +++ b/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go @@ -18,23 +18,23 @@ func repositoryImageScanFindings() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageScanFindings.html`, Resolver: fetchEcrRepositoryImageScanFindings, Transform: transformers.TransformWithStruct(&ecr.DescribeImageScanFindingsOutput{}, - transformers.WithPrimaryKeys("RegistryId"), + transformers.WithPrimaryKeyComponents("RegistryId"), transformers.WithSkipFields("NextToken", "ResultMetadata"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "repository_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("repository_arn"), - PrimaryKey: true, + Name: "repository_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("repository_arn"), + PrimaryKeyComponent: true, }, { - Name: "image_digest", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("image_digest"), - PrimaryKey: true, + Name: "image_digest", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("image_digest"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ecr/repository_images.go b/plugins/source/aws/resources/services/ecr/repository_images.go index 9e617f89e29d46..f68ade842ef1c6 100644 --- a/plugins/source/aws/resources/services/ecr/repository_images.go +++ b/plugins/source/aws/resources/services/ecr/repository_images.go @@ -18,16 +18,16 @@ func repositoryImages() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_ImageDetail.html`, Resolver: fetchEcrRepositoryImages, Transform: transformers.TransformWithStruct(&types.ImageDetail{}, - transformers.WithPrimaryKeys("ImageDigest", "RegistryId"), + transformers.WithPrimaryKeyComponents("ImageDigest", "RegistryId"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "repository_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "repository_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/ecr/repository_policy.go b/plugins/source/aws/resources/services/ecr/repository_policy.go index 889e3d761656f5..17e2dbf4135da0 100644 --- a/plugins/source/aws/resources/services/ecr/repository_policy.go +++ b/plugins/source/aws/resources/services/ecr/repository_policy.go @@ -18,17 +18,17 @@ func repositoryPolicy() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetRepositoryPolicy.html`, Resolver: fetchRepositoryPolicy, Transform: transformers.TransformWithStruct(&ecr.GetRepositoryPolicyOutput{}, - transformers.WithPrimaryKeys("RegistryId"), + transformers.WithPrimaryKeyComponents("RegistryId"), transformers.WithSkipFields("ResultMetadata"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "repository_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "repository_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy_json", diff --git a/plugins/source/aws/resources/services/ecrpublic/repositories.go b/plugins/source/aws/resources/services/ecrpublic/repositories.go index 322c566b64236b..5540fa9c385ab6 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repositories.go +++ b/plugins/source/aws/resources/services/ecrpublic/repositories.go @@ -25,10 +25,10 @@ func Repositories() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RepositoryArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RepositoryArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecrpublic/repository_images.go b/plugins/source/aws/resources/services/ecrpublic/repository_images.go index f2f4223784c8e6..47cb6324d5a3d4 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repository_images.go +++ b/plugins/source/aws/resources/services/ecrpublic/repository_images.go @@ -23,10 +23,10 @@ func repositoryImages() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveImageArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveImageArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ecs/cluster_container_instances.go b/plugins/source/aws/resources/services/ecs/cluster_container_instances.go index 381d5641b03d0c..3b4474d1529c70 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_container_instances.go +++ b/plugins/source/aws/resources/services/ecs/cluster_container_instances.go @@ -28,10 +28,10 @@ func clusterContainerInstances() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ContainerInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ContainerInstanceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecs/cluster_services.go b/plugins/source/aws/resources/services/ecs/cluster_services.go index 73c556de5053d4..b3b4f46b231403 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_services.go +++ b/plugins/source/aws/resources/services/ecs/cluster_services.go @@ -18,15 +18,15 @@ func clusterServices() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_Service.html`, Resolver: fetchEcsClusterServices, - Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeys("ClusterArn")), + Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeyComponents("ClusterArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ServiceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ServiceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecs/cluster_task_sets.go b/plugins/source/aws/resources/services/ecs/cluster_task_sets.go index d6f63405ee13db..2a99567ea006d5 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_task_sets.go +++ b/plugins/source/aws/resources/services/ecs/cluster_task_sets.go @@ -23,10 +23,10 @@ func clusterTaskSets() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TaskSetArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TaskSetArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecs/cluster_tasks.go b/plugins/source/aws/resources/services/ecs/cluster_tasks.go index c7a272f3477170..e9c92ab894ffdd 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_tasks.go +++ b/plugins/source/aws/resources/services/ecs/cluster_tasks.go @@ -24,10 +24,10 @@ func clusterTasks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TaskArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TaskArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecs/clusters.go b/plugins/source/aws/resources/services/ecs/clusters.go index 30ee0f2bff7c10..db0dbf7bd88b6c 100644 --- a/plugins/source/aws/resources/services/ecs/clusters.go +++ b/plugins/source/aws/resources/services/ecs/clusters.go @@ -24,10 +24,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ecs/task_definitions.go b/plugins/source/aws/resources/services/ecs/task_definitions.go index a19f633c5fa939..ff0180638aca06 100644 --- a/plugins/source/aws/resources/services/ecs/task_definitions.go +++ b/plugins/source/aws/resources/services/ecs/task_definitions.go @@ -28,10 +28,10 @@ func TaskDefinitions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TaskDefinitionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TaskDefinitionArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/efs/accesspoints.go b/plugins/source/aws/resources/services/efs/accesspoints.go index 480c14555cbad4..823aad00680425 100644 --- a/plugins/source/aws/resources/services/efs/accesspoints.go +++ b/plugins/source/aws/resources/services/efs/accesspoints.go @@ -24,10 +24,10 @@ func AccessPoints() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AccessPointArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AccessPointArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/efs/filesystems.go b/plugins/source/aws/resources/services/efs/filesystems.go index 65eb2be6b86f12..c076d1c59d3b49 100644 --- a/plugins/source/aws/resources/services/efs/filesystems.go +++ b/plugins/source/aws/resources/services/efs/filesystems.go @@ -24,10 +24,10 @@ func Filesystems() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FileSystemArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FileSystemArn"), + PrimaryKeyComponent: true, }, { Name: "backup_policy_status", diff --git a/plugins/source/aws/resources/services/eks/add_ons.go b/plugins/source/aws/resources/services/eks/add_ons.go index af73a9f6703b64..f3cc6535250824 100644 --- a/plugins/source/aws/resources/services/eks/add_ons.go +++ b/plugins/source/aws/resources/services/eks/add_ons.go @@ -23,16 +23,16 @@ func addOns() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AddonArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AddonArn"), + PrimaryKeyComponent: true, }, { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eks/clusters.go b/plugins/source/aws/resources/services/eks/clusters.go index 4088588d5d4826..967e0506a48b46 100644 --- a/plugins/source/aws/resources/services/eks/clusters.go +++ b/plugins/source/aws/resources/services/eks/clusters.go @@ -24,10 +24,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/eks/fargate_profiles.go b/plugins/source/aws/resources/services/eks/fargate_profiles.go index e50ce604bb66f2..1ae1c0bf1d5926 100644 --- a/plugins/source/aws/resources/services/eks/fargate_profiles.go +++ b/plugins/source/aws/resources/services/eks/fargate_profiles.go @@ -23,10 +23,10 @@ func fargateProfiles() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FargateProfileArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FargateProfileArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eks/identity_provider_configs.go b/plugins/source/aws/resources/services/eks/identity_provider_configs.go index 460b120bff63b0..e0a8e0960bc2b7 100644 --- a/plugins/source/aws/resources/services/eks/identity_provider_configs.go +++ b/plugins/source/aws/resources/services/eks/identity_provider_configs.go @@ -24,16 +24,16 @@ func identityProviderConfigs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("IdentityProviderConfigArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("IdentityProviderConfigArn"), + PrimaryKeyComponent: true, }, { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eks/node_groups.go b/plugins/source/aws/resources/services/eks/node_groups.go index ee3f3da9a7454e..dfe95be6c6b9aa 100644 --- a/plugins/source/aws/resources/services/eks/node_groups.go +++ b/plugins/source/aws/resources/services/eks/node_groups.go @@ -23,10 +23,10 @@ func nodeGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("NodegroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("NodegroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/clusters.go b/plugins/source/aws/resources/services/elasticache/clusters.go index 11232de92088c5..02914dc27c514c 100644 --- a/plugins/source/aws/resources/services/elasticache/clusters.go +++ b/plugins/source/aws/resources/services/elasticache/clusters.go @@ -25,10 +25,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/elasticache/engine_versions.go b/plugins/source/aws/resources/services/elasticache/engine_versions.go index cf98f08c5f4ced..94d9cd74e23d85 100644 --- a/plugins/source/aws/resources/services/elasticache/engine_versions.go +++ b/plugins/source/aws/resources/services/elasticache/engine_versions.go @@ -21,30 +21,30 @@ func EngineVersions() *schema.Table { Transform: transformers.TransformWithStruct(&types.CacheEngineVersion{}), Columns: []schema.Column{ { - Name: "account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - Description: `The AWS Account ID of the resource.`, - PrimaryKey: true, + Name: "account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + Description: `The AWS Account ID of the resource.`, + PrimaryKeyComponent: true, }, { - Name: "region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - Description: `The AWS Region of the resource.`, - PrimaryKey: true, + Name: "region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + Description: `The AWS Region of the resource.`, + PrimaryKeyComponent: true, }, { - Name: "engine", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Engine"), - PrimaryKey: true, + Name: "engine", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Engine"), + PrimaryKeyComponent: true, }, { - Name: "engine_version", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EngineVersion"), - PrimaryKey: true, + Name: "engine_version", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EngineVersion"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/events.go b/plugins/source/aws/resources/services/elasticache/events.go index 8192e6712abd2f..c6a9e7ec117c2d 100644 --- a/plugins/source/aws/resources/services/elasticache/events.go +++ b/plugins/source/aws/resources/services/elasticache/events.go @@ -23,10 +23,10 @@ func Events() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "_event_hash", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveObjectHash, - PrimaryKey: true, + Name: "_event_hash", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveObjectHash, + PrimaryKeyComponent: true, }, }, } 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 af592b7b939168..5e970530180176 100644 --- a/plugins/source/aws/resources/services/elasticache/global_replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/global_replication_groups.go @@ -23,10 +23,10 @@ func GlobalReplicationGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/parameter_groups.go b/plugins/source/aws/resources/services/elasticache/parameter_groups.go index 94abe85803c70b..d6737caed60ebd 100644 --- a/plugins/source/aws/resources/services/elasticache/parameter_groups.go +++ b/plugins/source/aws/resources/services/elasticache/parameter_groups.go @@ -23,10 +23,10 @@ func ParameterGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/replication_groups.go b/plugins/source/aws/resources/services/elasticache/replication_groups.go index db369ede5ef350..8144d15fa082b4 100644 --- a/plugins/source/aws/resources/services/elasticache/replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/replication_groups.go @@ -24,10 +24,10 @@ func ReplicationGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 45b9739ea8b707..a3c78ce4b98bb8 100644 --- a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go +++ b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go @@ -23,10 +23,10 @@ func ReservedCacheNodes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReservationARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReservationARN"), + PrimaryKeyComponent: true, }, }, } 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 42b1fd7e7ef615..55dd4e08e49d73 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 @@ -17,7 +17,7 @@ func ReservedCacheNodesOfferings() *schema.Table { Description: `https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ReservedCacheNodesOffering.html`, Resolver: fetchElasticacheReservedCacheNodesOfferings, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "elasticache"), - Transform: transformers.TransformWithStruct(&types.ReservedCacheNodesOffering{}, transformers.WithPrimaryKeys("ReservedCacheNodesOfferingId")), + Transform: transformers.TransformWithStruct(&types.ReservedCacheNodesOffering{}, transformers.WithPrimaryKeyComponents("ReservedCacheNodesOfferingId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/elasticache/service_updates.go b/plugins/source/aws/resources/services/elasticache/service_updates.go index bf882d95174f3c..493d60eb92c7dc 100644 --- a/plugins/source/aws/resources/services/elasticache/service_updates.go +++ b/plugins/source/aws/resources/services/elasticache/service_updates.go @@ -25,10 +25,10 @@ func ServiceUpdates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveServiceUpdateArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveServiceUpdateArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/snapshots.go b/plugins/source/aws/resources/services/elasticache/snapshots.go index 29f8b3d2e516e6..b40f5d3d3fe756 100644 --- a/plugins/source/aws/resources/services/elasticache/snapshots.go +++ b/plugins/source/aws/resources/services/elasticache/snapshots.go @@ -23,10 +23,10 @@ func Snapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/subnet_groups.go b/plugins/source/aws/resources/services/elasticache/subnet_groups.go index 2cc6cfb7cfacba..f4e423b83b84b6 100644 --- a/plugins/source/aws/resources/services/elasticache/subnet_groups.go +++ b/plugins/source/aws/resources/services/elasticache/subnet_groups.go @@ -23,10 +23,10 @@ func SubnetGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/update_actions.go b/plugins/source/aws/resources/services/elasticache/update_actions.go index 875ba3c6d15bf9..a1c14f65cfb61b 100644 --- a/plugins/source/aws/resources/services/elasticache/update_actions.go +++ b/plugins/source/aws/resources/services/elasticache/update_actions.go @@ -19,7 +19,7 @@ func UpdateActions() *schema.Table { Resolver: fetchElasticacheUpdateAction, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "elasticache"), Transform: transformers.TransformWithStruct(&types.UpdateAction{}, - transformers.WithPrimaryKeys("CacheClusterId", "ReplicationGroupId", "ServiceUpdateName"), + transformers.WithPrimaryKeyComponents("CacheClusterId", "ReplicationGroupId", "ServiceUpdateName"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/elasticache/user_groups.go b/plugins/source/aws/resources/services/elasticache/user_groups.go index 90520d360f98f9..97284fd8cb864e 100644 --- a/plugins/source/aws/resources/services/elasticache/user_groups.go +++ b/plugins/source/aws/resources/services/elasticache/user_groups.go @@ -23,10 +23,10 @@ func UserGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticache/users.go b/plugins/source/aws/resources/services/elasticache/users.go index 4f56bcb4cead1d..53a001afb47208 100644 --- a/plugins/source/aws/resources/services/elasticache/users.go +++ b/plugins/source/aws/resources/services/elasticache/users.go @@ -23,10 +23,10 @@ func Users() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go index 7c54b3a0ff8921..8d9502fee62713 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go @@ -24,10 +24,10 @@ func ApplicationVersions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ApplicationVersionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ApplicationVersionArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go index 2f4778f9cb0a14..92c113e69f4181 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go @@ -24,15 +24,15 @@ func Applications() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ApplicationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ApplicationArn"), + PrimaryKeyComponent: true, }, { - Name: "date_created", - Type: arrow.FixedWidthTypes.Timestamp_us, - PrimaryKey: true, + Name: "date_created", + Type: arrow.FixedWidthTypes.Timestamp_us, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go index e17c261646c19e..b776350cbc309b 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go @@ -23,16 +23,16 @@ func configurationOptions() *schema.Table { Resolver: fetchElasticbeanstalkConfigurationOptions, Transform: transformers.TransformWithStruct(&models.ConfigurationOptionDescriptionWrapper{}, transformers.WithUnwrapAllEmbeddedStructs(), - transformers.WithPrimaryKeys("ApplicationArn", "SolutionStackName", "Name"), + transformers.WithPrimaryKeyComponents("ApplicationArn", "SolutionStackName", "Name"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "environment_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "environment_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go index a0ed756a2b3055..00f7599e501a13 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go @@ -23,16 +23,16 @@ func configurationSettings() *schema.Table { Resolver: fetchElasticbeanstalkConfigurationSettings, Transform: transformers.TransformWithStruct(models.ConfigurationSettingsDescriptionWrapper{}, transformers.WithUnwrapAllEmbeddedStructs(), - transformers.WithPrimaryKeys("ApplicationArn", "SolutionStackName"), + transformers.WithPrimaryKeyComponents("ApplicationArn", "SolutionStackName"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "environment_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "environment_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go index 0e6bf3df415a78..618c7261a56d85 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go @@ -25,10 +25,10 @@ func Environments() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EnvironmentArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EnvironmentArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/elasticsearch/domains.go b/plugins/source/aws/resources/services/elasticsearch/domains.go index 3ae7e39e3db3e3..bcdde8b9535718 100644 --- a/plugins/source/aws/resources/services/elasticsearch/domains.go +++ b/plugins/source/aws/resources/services/elasticsearch/domains.go @@ -36,10 +36,10 @@ func Domains() *schema.Table { Resolver: resolveDomainTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticsearch/packages.go b/plugins/source/aws/resources/services/elasticsearch/packages.go index b1698d2509a490..09146a9a90b61d 100644 --- a/plugins/source/aws/resources/services/elasticsearch/packages.go +++ b/plugins/source/aws/resources/services/elasticsearch/packages.go @@ -23,10 +23,10 @@ func Packages() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PackageID"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PackageID"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elasticsearch/versions.go b/plugins/source/aws/resources/services/elasticsearch/versions.go index 328068d9bbc1e8..643737d85fcd3c 100644 --- a/plugins/source/aws/resources/services/elasticsearch/versions.go +++ b/plugins/source/aws/resources/services/elasticsearch/versions.go @@ -23,10 +23,10 @@ func Versions() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "version", - Type: arrow.BinaryTypes.String, - Resolver: resolveVersion, - PrimaryKey: true, + Name: "version", + Type: arrow.BinaryTypes.String, + Resolver: resolveVersion, + PrimaryKeyComponent: true, }, { Name: "instance_types", diff --git a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go index 4262f2a7b4460f..3e074e4fabec6b 100644 --- a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go @@ -24,10 +24,10 @@ func VpcEndpoints() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("VpcEndpointId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("VpcEndpointId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go index 424377797ebc7d..746d3f2c69af98 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go @@ -22,10 +22,10 @@ func pipelineJobs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go index bb5e6044147900..01b449c6133d85 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go @@ -23,10 +23,10 @@ func Pipelines() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/elastictranscoder/presets.go b/plugins/source/aws/resources/services/elastictranscoder/presets.go index e8fbb1adba76a6..cf1340c7c7594e 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/presets.go +++ b/plugins/source/aws/resources/services/elastictranscoder/presets.go @@ -23,10 +23,10 @@ func Presets() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } 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 542bf93677a50c..7c18272bd0c13d 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go @@ -19,15 +19,15 @@ func loadBalancerPolicies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_PolicyDescription.html`, Resolver: fetchElbv1LoadBalancerPolicies, - Transform: transformers.TransformWithStruct(&types.PolicyDescription{}, transformers.WithPrimaryKeys("PolicyName")), + Transform: transformers.TransformWithStruct(&types.PolicyDescription{}, transformers.WithPrimaryKeyComponents("PolicyName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "load_balancer_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "load_balancer_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "load_balancer_name", diff --git a/plugins/source/aws/resources/services/elbv1/load_balancers.go b/plugins/source/aws/resources/services/elbv1/load_balancers.go index 5e20b7f430e546..3b0971f3c2f46d 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancers.go @@ -24,10 +24,10 @@ func LoadBalancers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveLoadBalancerARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveLoadBalancerARN(), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/elbv2/listener_certificates.go b/plugins/source/aws/resources/services/elbv2/listener_certificates.go index f71a9a29b0d79e..058947aba7f23f 100644 --- a/plugins/source/aws/resources/services/elbv2/listener_certificates.go +++ b/plugins/source/aws/resources/services/elbv2/listener_certificates.go @@ -23,16 +23,16 @@ func listenerCertificates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "listener_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "listener_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elbv2/listener_rules.go b/plugins/source/aws/resources/services/elbv2/listener_rules.go index b731a4039284c5..ce1b23abdd76bf 100644 --- a/plugins/source/aws/resources/services/elbv2/listener_rules.go +++ b/plugins/source/aws/resources/services/elbv2/listener_rules.go @@ -28,10 +28,10 @@ func listenerRules() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RuleArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RuleArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elbv2/listeners.go b/plugins/source/aws/resources/services/elbv2/listeners.go index d3f9ba439ae572..0984a8bcf6c9ac 100644 --- a/plugins/source/aws/resources/services/elbv2/listeners.go +++ b/plugins/source/aws/resources/services/elbv2/listeners.go @@ -23,10 +23,10 @@ func listeners() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ListenerArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ListenerArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 152f4052ba7110..b59975fa6cbfce 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go @@ -17,15 +17,15 @@ func loadBalancerAttributes() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_LoadBalancerAttribute.html`, Resolver: fetchLoadBalancerAttributes, - Transform: transformers.TransformWithStruct(&types.LoadBalancerAttribute{}, transformers.WithPrimaryKeys("Key")), + Transform: transformers.TransformWithStruct(&types.LoadBalancerAttribute{}, transformers.WithPrimaryKeyComponents("Key")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "load_balancer_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "load_balancer_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go b/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go index b996d4b5ade3ca..38bd9e928bc22f 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go @@ -20,15 +20,15 @@ func webACLs() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_GetWebACLForResource.html`, Resolver: resolveLoadBalancerWebACL, - Transform: transformers.TransformWithStruct(&wafv2types.WebACL{}, transformers.WithPrimaryKeys("ARN")), + Transform: transformers.TransformWithStruct(&wafv2types.WebACL{}, transformers.WithPrimaryKeyComponents("ARN")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "load_balancer_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "load_balancer_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elbv2/load_balancers.go b/plugins/source/aws/resources/services/elbv2/load_balancers.go index 2322f3ef3a28b4..0da72a7999e624 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancers.go @@ -29,10 +29,10 @@ func LoadBalancers() *schema.Table { Resolver: resolveLoadBalancerTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LoadBalancerArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LoadBalancerArn"), + PrimaryKeyComponent: true, }, }, 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 caaf90411aaaa7..b65744797049db 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 @@ -18,17 +18,17 @@ func targetGroupTargetHealthDescriptions() *schema.Table { Description: `https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_TargetHealthDescription.html`, Resolver: fetchTargetGroupTargetHealthDescriptions, Transform: transformers.TransformWithStruct(&types.TargetHealthDescription{}, - transformers.WithPrimaryKeys("Target.Id", "Target.Port"), + transformers.WithPrimaryKeyComponents("Target.Id", "Target.Port"), transformers.WithUnwrapStructFields("Target"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "target_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "target_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/elbv2/target_groups.go b/plugins/source/aws/resources/services/elbv2/target_groups.go index 24bd8f01fa7ec2..345d0c83f0ffae 100644 --- a/plugins/source/aws/resources/services/elbv2/target_groups.go +++ b/plugins/source/aws/resources/services/elbv2/target_groups.go @@ -29,10 +29,10 @@ func TargetGroups() *schema.Table { Resolver: resolveTargetGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TargetGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TargetGroupArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go b/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go index 2a0016a55c6374..75c46ae4573298 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go +++ b/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go @@ -17,15 +17,15 @@ func clusterInstanceFleets() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceFleet.html`, Resolver: fetchClusterInstanceFleets, - Transform: transformers.TransformWithStruct(&types.InstanceFleet{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.InstanceFleet{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/emr/cluster_instance_groups.go b/plugins/source/aws/resources/services/emr/cluster_instance_groups.go index 608a80fed507e0..f77d0eeeec81fe 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instance_groups.go +++ b/plugins/source/aws/resources/services/emr/cluster_instance_groups.go @@ -17,15 +17,15 @@ func clusterInstanceGroups() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceGroup.html`, Resolver: fetchClusterInstanceGroups, - Transform: transformers.TransformWithStruct(&types.InstanceGroup{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.InstanceGroup{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/emr/cluster_instances.go b/plugins/source/aws/resources/services/emr/cluster_instances.go index bbfc0d09db16f0..bcd5a2f74a679b 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instances.go +++ b/plugins/source/aws/resources/services/emr/cluster_instances.go @@ -32,10 +32,10 @@ func clusterInstances() *schema.Table { Resolver: client.ResolveAWSRegion, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveClusterInstanceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveClusterInstanceArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/emr/clusters.go b/plugins/source/aws/resources/services/emr/clusters.go index 2f34865222243c..70adc8cd710352 100644 --- a/plugins/source/aws/resources/services/emr/clusters.go +++ b/plugins/source/aws/resources/services/emr/clusters.go @@ -25,10 +25,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/emr/notebook_executions.go b/plugins/source/aws/resources/services/emr/notebook_executions.go index 8b8ca476994222..43a6f2f125f188 100644 --- a/plugins/source/aws/resources/services/emr/notebook_executions.go +++ b/plugins/source/aws/resources/services/emr/notebook_executions.go @@ -18,16 +18,16 @@ func notebookExecutions() *schema.Table { Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_NotebookExecution.html`, Resolver: fetchNotebookExecutions, PreResourceResolver: getNotebookExecution, - Transform: transformers.TransformWithStruct(&types.NotebookExecution{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.NotebookExecution{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Description: "The Amazon Resource Name (ARN) of the EMR Cluster.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: false, + Name: "cluster_arn", + Description: "The Amazon Resource Name (ARN) of the EMR Cluster.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: false, }, }, } diff --git a/plugins/source/aws/resources/services/emr/release_labels.go b/plugins/source/aws/resources/services/emr/release_labels.go index 1c639ba97327c6..cc7c8e0204646b 100644 --- a/plugins/source/aws/resources/services/emr/release_labels.go +++ b/plugins/source/aws/resources/services/emr/release_labels.go @@ -20,7 +20,7 @@ func ReleaseLabels() *schema.Table { Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "elasticmapreduce"), Transform: transformers.TransformWithStruct( &emr.DescribeReleaseLabelOutput{}, - transformers.WithPrimaryKeys("ReleaseLabel"), + transformers.WithPrimaryKeyComponents("ReleaseLabel"), transformers.WithSkipFields("ResultMetadata", "NextToken"), ), Columns: []schema.Column{ diff --git a/plugins/source/aws/resources/services/emr/security_configuration.go b/plugins/source/aws/resources/services/emr/security_configuration.go index ac2984ac8dadda..3f786ec92f59bf 100644 --- a/plugins/source/aws/resources/services/emr/security_configuration.go +++ b/plugins/source/aws/resources/services/emr/security_configuration.go @@ -19,19 +19,19 @@ func SecurityConfigurations() *schema.Table { Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_DescribeSecurityConfiguration.html`, Resolver: fetchSecurityConfigurations, Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "elasticmapreduce"), - Transform: transformers.TransformWithStruct(&types.SecurityConfigurationSummary{}, transformers.WithPrimaryKeys("Name")), + Transform: transformers.TransformWithStruct(&types.SecurityConfigurationSummary{}, transformers.WithPrimaryKeyComponents("Name")), Columns: []schema.Column{ { - Name: "account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { Name: "security_configuration", diff --git a/plugins/source/aws/resources/services/emr/steps.go b/plugins/source/aws/resources/services/emr/steps.go index a2bc2923de8711..0c6d0dc29e8628 100644 --- a/plugins/source/aws/resources/services/emr/steps.go +++ b/plugins/source/aws/resources/services/emr/steps.go @@ -18,16 +18,16 @@ func steps() *schema.Table { Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_Step.html`, Resolver: fetchEmrSteps, PreResourceResolver: getStep, - Transform: transformers.TransformWithStruct(&types.Step{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.Step{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Description: "The Amazon Resource Name (ARN) of the EMR Cluster.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_arn", + Description: "The Amazon Resource Name (ARN) of the EMR Cluster.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/emr/studio_session_mapping.go b/plugins/source/aws/resources/services/emr/studio_session_mapping.go index 0dccec4593574e..9376a94928f4e2 100644 --- a/plugins/source/aws/resources/services/emr/studio_session_mapping.go +++ b/plugins/source/aws/resources/services/emr/studio_session_mapping.go @@ -18,16 +18,16 @@ func studioSessionMapping() *schema.Table { Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_GetStudioSessionMapping.html`, Resolver: fetchEmrStudioSessionMapping, PreResourceResolver: getSessionMapping, - Transform: transformers.TransformWithStruct(&types.SessionMappingDetail{}, transformers.WithPrimaryKeys("IdentityType", "IdentityId")), + Transform: transformers.TransformWithStruct(&types.SessionMappingDetail{}, transformers.WithPrimaryKeyComponents("IdentityType", "IdentityId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "studio_arn", - Description: "The Amazon Resource Name (ARN) of the EMR Studio.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "studio_arn", + Description: "The Amazon Resource Name (ARN) of the EMR Studio.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/emr/studios.go b/plugins/source/aws/resources/services/emr/studios.go index 1ed8f1904ef287..f600c579f6d73f 100644 --- a/plugins/source/aws/resources/services/emr/studios.go +++ b/plugins/source/aws/resources/services/emr/studios.go @@ -24,11 +24,11 @@ func Studios() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Description: `The Amazon Resource Name (ARN) of the EMR Studio.`, - Resolver: schema.PathResolver("StudioArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Description: `The Amazon Resource Name (ARN) of the EMR Studio.`, + Resolver: schema.PathResolver("StudioArn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/emr/supported_instance_types.go b/plugins/source/aws/resources/services/emr/supported_instance_types.go index c96db4a870adef..d795544fc09ad6 100644 --- a/plugins/source/aws/resources/services/emr/supported_instance_types.go +++ b/plugins/source/aws/resources/services/emr/supported_instance_types.go @@ -17,16 +17,16 @@ func supportedInstanceTypes() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/emr/latest/APIReference/API_SupportedInstanceType.html`, Resolver: fetchEmrSupportedInstanceTypes, - Transform: transformers.TransformWithStruct(&types.SupportedInstanceType{}, transformers.WithPrimaryKeys("Type")), + Transform: transformers.TransformWithStruct(&types.SupportedInstanceType{}, transformers.WithPrimaryKeyComponents("Type")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "release_label", - Description: "The release label of the EMR cluster.", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("release_label"), - PrimaryKey: true, + Name: "release_label", + Description: "The release label of the EMR cluster.", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("release_label"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/api_destinations.go b/plugins/source/aws/resources/services/eventbridge/api_destinations.go index 857e9834626d1e..fe0a3c36a0c9ec 100644 --- a/plugins/source/aws/resources/services/eventbridge/api_destinations.go +++ b/plugins/source/aws/resources/services/eventbridge/api_destinations.go @@ -24,10 +24,10 @@ func ApiDestinations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ApiDestinationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ApiDestinationArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/archives.go b/plugins/source/aws/resources/services/eventbridge/archives.go index ece6c6249032f1..57cbb1c40a48ae 100644 --- a/plugins/source/aws/resources/services/eventbridge/archives.go +++ b/plugins/source/aws/resources/services/eventbridge/archives.go @@ -25,10 +25,10 @@ func Archives() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveArchiveArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveArchiveArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/connections.go b/plugins/source/aws/resources/services/eventbridge/connections.go index 49f01d383d2404..11cbd9a522360c 100644 --- a/plugins/source/aws/resources/services/eventbridge/connections.go +++ b/plugins/source/aws/resources/services/eventbridge/connections.go @@ -24,10 +24,10 @@ func Connections() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ConnectionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ConnectionArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/endpoints.go b/plugins/source/aws/resources/services/eventbridge/endpoints.go index 9c66ead9f09080..73254c8ddf2d3d 100644 --- a/plugins/source/aws/resources/services/eventbridge/endpoints.go +++ b/plugins/source/aws/resources/services/eventbridge/endpoints.go @@ -23,10 +23,10 @@ func Endpoints() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } 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 d22487568dd82f..b7079224d78cd9 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go +++ b/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go @@ -18,7 +18,7 @@ func eventBusRules() *schema.Table { Name: "aws_eventbridge_event_bus_rules", Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Rule.html`, Resolver: fetchEventBusRules, - Transform: transformers.TransformWithStruct(&types.Rule{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Rule{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go b/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go index 46d9532652d056..d3a91c71509b4a 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go +++ b/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go @@ -17,21 +17,21 @@ func eventBusTargets() *schema.Table { Name: "aws_eventbridge_event_bus_targets", Description: `https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_Target.html`, Resolver: fetchEventBusTargets, - Transform: transformers.TransformWithStruct(&types.Target{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.Target{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "rule_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "rule_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "event_bus_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("event_bus_arn"), - PrimaryKey: true, + Name: "event_bus_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("event_bus_arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/event_buses.go b/plugins/source/aws/resources/services/eventbridge/event_buses.go index 116f1eff166b4f..d53484700d22f8 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_buses.go +++ b/plugins/source/aws/resources/services/eventbridge/event_buses.go @@ -30,9 +30,9 @@ func EventBuses() *schema.Table { Resolver: resolveEventBusTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/eventbridge/event_sources.go b/plugins/source/aws/resources/services/eventbridge/event_sources.go index 43bfa1fcfa368e..1076227e2e525b 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_sources.go +++ b/plugins/source/aws/resources/services/eventbridge/event_sources.go @@ -24,10 +24,10 @@ func EventSources() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/eventbridge/replays.go b/plugins/source/aws/resources/services/eventbridge/replays.go index 23a0f5dfb6a926..794c88c7ab3198 100644 --- a/plugins/source/aws/resources/services/eventbridge/replays.go +++ b/plugins/source/aws/resources/services/eventbridge/replays.go @@ -25,10 +25,10 @@ func Replays() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReplayArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReplayArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/firehose/delivery_streams.go b/plugins/source/aws/resources/services/firehose/delivery_streams.go index 8278884514a08e..90d4116b1c0174 100644 --- a/plugins/source/aws/resources/services/firehose/delivery_streams.go +++ b/plugins/source/aws/resources/services/firehose/delivery_streams.go @@ -31,10 +31,10 @@ func DeliveryStreams() *schema.Table { Resolver: resolveFirehoseDeliveryStreamTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DeliveryStreamARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DeliveryStreamARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/batch_imports.go b/plugins/source/aws/resources/services/frauddetector/batch_imports.go index fcc65915c83e7b..aa6411fe790ca4 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_imports.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_imports.go @@ -23,10 +23,10 @@ func BatchImports() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go index dc29b8ea2a1836..cc109079fb088e 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go @@ -23,10 +23,10 @@ func BatchPredictions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/detectors.go b/plugins/source/aws/resources/services/frauddetector/detectors.go index 37f8ae0a09c863..bdca92b32117e4 100644 --- a/plugins/source/aws/resources/services/frauddetector/detectors.go +++ b/plugins/source/aws/resources/services/frauddetector/detectors.go @@ -24,10 +24,10 @@ func Detectors() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/frauddetector/entity_types.go b/plugins/source/aws/resources/services/frauddetector/entity_types.go index 2727fb7be2d591..dd586ea6cf299e 100644 --- a/plugins/source/aws/resources/services/frauddetector/entity_types.go +++ b/plugins/source/aws/resources/services/frauddetector/entity_types.go @@ -24,10 +24,10 @@ func EntityTypes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/frauddetector/event_types.go b/plugins/source/aws/resources/services/frauddetector/event_types.go index 5dcd6bcc422ec0..9bafd2fde57258 100644 --- a/plugins/source/aws/resources/services/frauddetector/event_types.go +++ b/plugins/source/aws/resources/services/frauddetector/event_types.go @@ -24,10 +24,10 @@ func EventTypes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/frauddetector/external_models.go b/plugins/source/aws/resources/services/frauddetector/external_models.go index 247df728a8055f..d7ca37890f49d7 100644 --- a/plugins/source/aws/resources/services/frauddetector/external_models.go +++ b/plugins/source/aws/resources/services/frauddetector/external_models.go @@ -23,10 +23,10 @@ func ExternalModels() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/labels.go b/plugins/source/aws/resources/services/frauddetector/labels.go index cd848483e762ec..7de4a20ce585f9 100644 --- a/plugins/source/aws/resources/services/frauddetector/labels.go +++ b/plugins/source/aws/resources/services/frauddetector/labels.go @@ -25,10 +25,10 @@ func Labels() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/frauddetector/model_versions.go b/plugins/source/aws/resources/services/frauddetector/model_versions.go index bd4cc01b4e342f..694ced84d8544f 100644 --- a/plugins/source/aws/resources/services/frauddetector/model_versions.go +++ b/plugins/source/aws/resources/services/frauddetector/model_versions.go @@ -21,10 +21,10 @@ func modelVersions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/models.go b/plugins/source/aws/resources/services/frauddetector/models.go index 872b1fed268cea..da4de101e8c9f5 100644 --- a/plugins/source/aws/resources/services/frauddetector/models.go +++ b/plugins/source/aws/resources/services/frauddetector/models.go @@ -23,10 +23,10 @@ func Models() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/frauddetector/outcomes.go b/plugins/source/aws/resources/services/frauddetector/outcomes.go index aba513a4c7dd63..d24d9a1da5e517 100644 --- a/plugins/source/aws/resources/services/frauddetector/outcomes.go +++ b/plugins/source/aws/resources/services/frauddetector/outcomes.go @@ -24,10 +24,10 @@ func Outcomes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/frauddetector/rules.go b/plugins/source/aws/resources/services/frauddetector/rules.go index af1d18511b420f..e9934c43830918 100644 --- a/plugins/source/aws/resources/services/frauddetector/rules.go +++ b/plugins/source/aws/resources/services/frauddetector/rules.go @@ -21,10 +21,10 @@ func rules() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/frauddetector/variables.go b/plugins/source/aws/resources/services/frauddetector/variables.go index 9bdd1c15852492..e1f286ade1ee02 100644 --- a/plugins/source/aws/resources/services/frauddetector/variables.go +++ b/plugins/source/aws/resources/services/frauddetector/variables.go @@ -24,10 +24,10 @@ func Variables() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/fsx/backups.go b/plugins/source/aws/resources/services/fsx/backups.go index 46c4762d34499e..26c60098e7c53a 100644 --- a/plugins/source/aws/resources/services/fsx/backups.go +++ b/plugins/source/aws/resources/services/fsx/backups.go @@ -24,10 +24,10 @@ func Backups() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BackupId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BackupId"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 1e6de7272dfe5f..e961697d765954 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_associations.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_associations.go @@ -25,10 +25,10 @@ func DataRepositoryAssociations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 12c32cea823f60..70547e2fb762fa 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_tasks.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_tasks.go @@ -25,10 +25,10 @@ func DataRepositoryTasks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/fsx/file_caches.go b/plugins/source/aws/resources/services/fsx/file_caches.go index 21f5e7cf271d26..93ae346bed67d5 100644 --- a/plugins/source/aws/resources/services/fsx/file_caches.go +++ b/plugins/source/aws/resources/services/fsx/file_caches.go @@ -25,10 +25,10 @@ func FileCaches() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/fsx/file_systems.go b/plugins/source/aws/resources/services/fsx/file_systems.go index f09bbdf4502c03..a51774a6241c36 100644 --- a/plugins/source/aws/resources/services/fsx/file_systems.go +++ b/plugins/source/aws/resources/services/fsx/file_systems.go @@ -25,10 +25,10 @@ func FileSystems() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/fsx/snapshots.go b/plugins/source/aws/resources/services/fsx/snapshots.go index 5d01fd455f071a..2f9e24d0a26921 100644 --- a/plugins/source/aws/resources/services/fsx/snapshots.go +++ b/plugins/source/aws/resources/services/fsx/snapshots.go @@ -25,10 +25,10 @@ func Snapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "administrative_actions", 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 9185dc44a38bf3..19d0ef6f42cc3e 100644 --- a/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go +++ b/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go @@ -25,10 +25,10 @@ func StorageVirtualMachines() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/fsx/volumes.go b/plugins/source/aws/resources/services/fsx/volumes.go index 12ef0b828c8991..ddf1b35337e8da 100644 --- a/plugins/source/aws/resources/services/fsx/volumes.go +++ b/plugins/source/aws/resources/services/fsx/volumes.go @@ -25,10 +25,10 @@ func Volumes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceARN"), + PrimaryKeyComponent: true, }, { Name: "administrative_actions", 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 234b8e7500da51..3748cdbce43213 100644 --- a/plugins/source/aws/resources/services/glacier/vault_access_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_access_policies.go @@ -23,10 +23,10 @@ func vaultAccessPolicies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "vault_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "vault_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy", 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 8d93c489bf342d..bee80364d7270e 100644 --- a/plugins/source/aws/resources/services/glacier/vault_lock_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_lock_policies.go @@ -23,10 +23,10 @@ func vaultLockPolicies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "vault_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "vault_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy", diff --git a/plugins/source/aws/resources/services/glacier/vault_notifications.go b/plugins/source/aws/resources/services/glacier/vault_notifications.go index bbeb389ba05fc7..9e570d3e5e1a1b 100644 --- a/plugins/source/aws/resources/services/glacier/vault_notifications.go +++ b/plugins/source/aws/resources/services/glacier/vault_notifications.go @@ -22,10 +22,10 @@ func vaultNotifications() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "vault_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "vault_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glacier/vaults.go b/plugins/source/aws/resources/services/glacier/vaults.go index a340c3f2e15306..f743923870116e 100644 --- a/plugins/source/aws/resources/services/glacier/vaults.go +++ b/plugins/source/aws/resources/services/glacier/vaults.go @@ -29,10 +29,10 @@ func Vaults() *schema.Table { Resolver: resolveGlacierVaultTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("VaultARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("VaultARN"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/glue/classifiers.go b/plugins/source/aws/resources/services/glue/classifiers.go index c70cf66964e36f..4ba17d82278051 100644 --- a/plugins/source/aws/resources/services/glue/classifiers.go +++ b/plugins/source/aws/resources/services/glue/classifiers.go @@ -23,10 +23,10 @@ func Classifiers() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueClassifierName, - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueClassifierName, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glue/connections.go b/plugins/source/aws/resources/services/glue/connections.go index 6ba2e917c9e583..9283c830078694 100644 --- a/plugins/source/aws/resources/services/glue/connections.go +++ b/plugins/source/aws/resources/services/glue/connections.go @@ -25,10 +25,10 @@ func Connections() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueConnectionArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueConnectionArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glue/crawlers.go b/plugins/source/aws/resources/services/glue/crawlers.go index 14a94d7d399350..1dd315f8b3d8ae 100644 --- a/plugins/source/aws/resources/services/glue/crawlers.go +++ b/plugins/source/aws/resources/services/glue/crawlers.go @@ -26,10 +26,10 @@ func Crawlers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueCrawlerArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueCrawlerArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return crawlerARN(cl, aws.ToString(resource.Item.(types.Crawler).Name)) 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 1f1cd79d4d74ff..2a61eefaaa1e08 100644 --- a/plugins/source/aws/resources/services/glue/database_table_indexes.go +++ b/plugins/source/aws/resources/services/glue/database_table_indexes.go @@ -22,22 +22,22 @@ func databaseTableIndexes() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "database_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("database_arn"), - PrimaryKey: true, + Name: "database_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("database_arn"), + PrimaryKeyComponent: true, }, { - Name: "database_table_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("name"), - PrimaryKey: true, + Name: "database_table_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("name"), + PrimaryKeyComponent: true, }, { - Name: "index_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("IndexName"), - PrimaryKey: true, + Name: "index_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("IndexName"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glue/database_tables.go b/plugins/source/aws/resources/services/glue/database_tables.go index f2edf1f7822a89..d397219fa937cb 100644 --- a/plugins/source/aws/resources/services/glue/database_tables.go +++ b/plugins/source/aws/resources/services/glue/database_tables.go @@ -17,15 +17,15 @@ func databaseTables() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/glue/latest/webapi/API_Table.html`, Resolver: fetchGlueDatabaseTables, - Transform: transformers.TransformWithStruct(&types.Table{}, transformers.WithPrimaryKeys("Name")), + Transform: transformers.TransformWithStruct(&types.Table{}, transformers.WithPrimaryKeyComponents("Name")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "database_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "database_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/glue/databases.go b/plugins/source/aws/resources/services/glue/databases.go index 6f707f88111057..d06885a43435d7 100644 --- a/plugins/source/aws/resources/services/glue/databases.go +++ b/plugins/source/aws/resources/services/glue/databases.go @@ -25,10 +25,10 @@ func Databases() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueDatabaseArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueDatabaseArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return databaseARN(cl, aws.ToString(resource.Item.(types.Database).Name)) diff --git a/plugins/source/aws/resources/services/glue/dev_endpoints.go b/plugins/source/aws/resources/services/glue/dev_endpoints.go index 74ef85731bf14d..66653b2f0bac19 100644 --- a/plugins/source/aws/resources/services/glue/dev_endpoints.go +++ b/plugins/source/aws/resources/services/glue/dev_endpoints.go @@ -25,10 +25,10 @@ func DevEndpoints() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueDevEndpointArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueDevEndpointArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return devEndpointARN(cl, aws.ToString(resource.Item.(types.DevEndpoint).EndpointName)) diff --git a/plugins/source/aws/resources/services/glue/job_runs.go b/plugins/source/aws/resources/services/glue/job_runs.go index 0f1a12fad6b693..d14ed98cd0573f 100644 --- a/plugins/source/aws/resources/services/glue/job_runs.go +++ b/plugins/source/aws/resources/services/glue/job_runs.go @@ -17,15 +17,15 @@ func jobRuns() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/glue/latest/webapi/API_JobRun.html`, Resolver: fetchGlueJobRuns, - Transform: transformers.TransformWithStruct(&types.JobRun{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.JobRun{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "job_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "job_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glue/jobs.go b/plugins/source/aws/resources/services/glue/jobs.go index 87c39ecba173e9..c0bda1833d8eb7 100644 --- a/plugins/source/aws/resources/services/glue/jobs.go +++ b/plugins/source/aws/resources/services/glue/jobs.go @@ -25,10 +25,10 @@ func Jobs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueJobArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueJobArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return jobARN(cl, aws.ToString(resource.Item.(types.Job).Name)) 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 df92dd2eee468d..53fbae7133da71 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 @@ -17,15 +17,15 @@ func mlTransformTaskRuns() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/glue/latest/webapi/API_TaskRun.html`, Resolver: fetchGlueMlTransformTaskRuns, - Transform: transformers.TransformWithStruct(&types.TaskRun{}, transformers.WithPrimaryKeys("TaskRunId")), + Transform: transformers.TransformWithStruct(&types.TaskRun{}, transformers.WithPrimaryKeyComponents("TaskRunId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "ml_transform_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "ml_transform_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/glue/ml_transforms.go b/plugins/source/aws/resources/services/glue/ml_transforms.go index 31d6c242bdeda4..bb222c8e12788c 100644 --- a/plugins/source/aws/resources/services/glue/ml_transforms.go +++ b/plugins/source/aws/resources/services/glue/ml_transforms.go @@ -26,10 +26,10 @@ func MlTransforms() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueMlTransformArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueMlTransformArn, + PrimaryKeyComponent: true, }, { Name: "schema", diff --git a/plugins/source/aws/resources/services/glue/registries.go b/plugins/source/aws/resources/services/glue/registries.go index d58e1b3db2df8e..0f3958c52e6ddc 100644 --- a/plugins/source/aws/resources/services/glue/registries.go +++ b/plugins/source/aws/resources/services/glue/registries.go @@ -24,10 +24,10 @@ func Registries() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RegistryArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RegistryArn"), + PrimaryKeyComponent: true, }, tagsCol(func(_ *client.Client, resource *schema.Resource) string { return *resource.Item.(types.RegistryListItem).RegistryArn 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 833f990d4dde3c..e808a5fc715dde 100644 --- a/plugins/source/aws/resources/services/glue/registry_schema_versions.go +++ b/plugins/source/aws/resources/services/glue/registry_schema_versions.go @@ -21,17 +21,17 @@ func registrySchemaVersions() *schema.Table { Resolver: fetchGlueRegistrySchemaVersions, PreResourceResolver: getRegistrySchemaVersion, Transform: transformers.TransformWithStruct(&glue.GetSchemaVersionOutput{}, - transformers.WithPrimaryKeys("SchemaVersionId"), + transformers.WithPrimaryKeyComponents("SchemaVersionId"), transformers.WithSkipFields("ResultMetadata"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "registry_schema_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "registry_schema_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "metadata", diff --git a/plugins/source/aws/resources/services/glue/registry_schemas.go b/plugins/source/aws/resources/services/glue/registry_schemas.go index 8f35da3c615d82..c06d816a1263a7 100644 --- a/plugins/source/aws/resources/services/glue/registry_schemas.go +++ b/plugins/source/aws/resources/services/glue/registry_schemas.go @@ -24,10 +24,10 @@ func registrySchemas() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SchemaArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SchemaArn"), + PrimaryKeyComponent: true, }, tagsCol(func(_ *client.Client, resource *schema.Resource) string { return *resource.Item.(*glue.GetSchemaOutput).RegistryArn diff --git a/plugins/source/aws/resources/services/glue/security_configurations.go b/plugins/source/aws/resources/services/glue/security_configurations.go index 982454522486e3..384f6afb4c53b6 100644 --- a/plugins/source/aws/resources/services/glue/security_configurations.go +++ b/plugins/source/aws/resources/services/glue/security_configurations.go @@ -16,7 +16,7 @@ func SecurityConfigurations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/glue/latest/webapi/API_SecurityConfiguration.html`, Resolver: fetchGlueSecurityConfigurations, - Transform: transformers.TransformWithStruct(&types.SecurityConfiguration{}, transformers.WithPrimaryKeys("Name")), + Transform: transformers.TransformWithStruct(&types.SecurityConfiguration{}, transformers.WithPrimaryKeyComponents("Name")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "glue"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/glue/triggers.go b/plugins/source/aws/resources/services/glue/triggers.go index 8e4261777ba574..cc3138df75e848 100644 --- a/plugins/source/aws/resources/services/glue/triggers.go +++ b/plugins/source/aws/resources/services/glue/triggers.go @@ -26,10 +26,10 @@ func Triggers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueTriggerArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueTriggerArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return triggerARN(cl, aws.ToString(resource.Item.(types.Trigger).Name)) diff --git a/plugins/source/aws/resources/services/glue/workflows.go b/plugins/source/aws/resources/services/glue/workflows.go index 45525405ba2282..78ee4f09c4a0f1 100644 --- a/plugins/source/aws/resources/services/glue/workflows.go +++ b/plugins/source/aws/resources/services/glue/workflows.go @@ -26,10 +26,10 @@ func Workflows() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGlueWorkflowArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGlueWorkflowArn, + PrimaryKeyComponent: true, }, tagsCol(func(cl *client.Client, resource *schema.Resource) string { return workflowARN(cl, aws.ToString(resource.Item.(*types.Workflow).Name)) diff --git a/plugins/source/aws/resources/services/guardduty/detector_filters.go b/plugins/source/aws/resources/services/guardduty/detector_filters.go index a67f52237c98d8..de8dcb9c389dc3 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_filters.go +++ b/plugins/source/aws/resources/services/guardduty/detector_filters.go @@ -19,27 +19,27 @@ func detectorFilters() *schema.Table { Resolver: fetchDetectorFilters, PreResourceResolver: getDetectorFilter, Transform: transformers.TransformWithStruct(&guardduty.GetFilterOutput{}, - transformers.WithPrimaryKeys("Name"), + transformers.WithPrimaryKeyComponents("Name"), transformers.WithSkipFields("ResultMetadata"), ), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_findings.go b/plugins/source/aws/resources/services/guardduty/detector_findings.go index 4db1cd28a362fe..6cfeb8b28e6414 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_findings.go +++ b/plugins/source/aws/resources/services/guardduty/detector_findings.go @@ -19,28 +19,28 @@ func detectorFindings() *schema.Table { Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Finding.html`, Resolver: fetchDetectorFindings, Transform: transformers.TransformWithStruct(&types.Finding{}, - transformers.WithPrimaryKeys("Arn"), + transformers.WithPrimaryKeyComponents("Arn"), transformers.WithTypeTransformer(client.TimestampTypeTransformer), transformers.WithResolverTransformer(client.TimestampResolverTransformer), ), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_ipsets.go b/plugins/source/aws/resources/services/guardduty/detector_ipsets.go index 9bfeee31e57eba..1f4bd5ba3ba480 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_ipsets.go +++ b/plugins/source/aws/resources/services/guardduty/detector_ipsets.go @@ -19,27 +19,27 @@ func detectorIPSets() *schema.Table { Resolver: fetchDetectorIPSets, PreResourceResolver: getDetectorIPSet, Transform: transformers.TransformWithStruct(&guardduty.GetIPSetOutput{}, - transformers.WithPrimaryKeys("Name"), + transformers.WithPrimaryKeyComponents("Name"), transformers.WithSkipFields("ResultMetadata"), ), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_members.go b/plugins/source/aws/resources/services/guardduty/detector_members.go index ddef582028ec5e..101b049e60fbac 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_members.go +++ b/plugins/source/aws/resources/services/guardduty/detector_members.go @@ -20,28 +20,28 @@ func detectorMembers() *schema.Table { Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_Member.html`, Resolver: fetchDetectorMembers, Transform: transformers.TransformWithStruct(&types.Member{}, - transformers.WithPrimaryKeys("AccountId"), + transformers.WithPrimaryKeyComponents("AccountId"), transformers.WithTypeTransformer(client.TimestampTypeTransformer), transformers.WithResolverTransformer(client.TimestampResolverTransformer), ), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go b/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go index e04bc8e8985a57..0ec91c3b544df0 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go +++ b/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go @@ -19,25 +19,25 @@ func detectorPublishingDestinations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DescribePublishingDestination.html`, Resolver: fetchGuarddutyDetectorPublishingDestinations, - Transform: transformers.TransformWithStruct(&types.Destination{}, transformers.WithPrimaryKeys("DestinationId")), + Transform: transformers.TransformWithStruct(&types.Destination{}, transformers.WithPrimaryKeyComponents("DestinationId")), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go b/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go index b9774aad755f06..5a4460175ae16c 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go +++ b/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go @@ -19,25 +19,25 @@ func detectorThreatIntelSets() *schema.Table { Description: `https://docs.aws.amazon.com/guardduty/latest/APIReference/API_GetThreatIntelSet.html`, Resolver: fetchDetectorThreatIntelSets, PreResourceResolver: getDetectorThreatIntelSet, - Transform: transformers.TransformWithStruct(&guardduty.GetThreatIntelSetOutput{}, transformers.WithPrimaryKeys("Name"), transformers.WithSkipFields("ResultMetadata")), + Transform: transformers.TransformWithStruct(&guardduty.GetThreatIntelSetOutput{}, transformers.WithPrimaryKeyComponents("Name"), transformers.WithSkipFields("ResultMetadata")), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "detector_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "detector_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/guardduty/detectors.go b/plugins/source/aws/resources/services/guardduty/detectors.go index 98acf1907550ee..59afc65ca8f0fc 100644 --- a/plugins/source/aws/resources/services/guardduty/detectors.go +++ b/plugins/source/aws/resources/services/guardduty/detectors.go @@ -27,16 +27,16 @@ func Detectors() *schema.Table { Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "guardduty"), Columns: schema.ColumnList{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { Name: "arn", @@ -44,9 +44,9 @@ func Detectors() *schema.Table { Resolver: resolveGuarddutyARN(), }, { - Name: "id", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/iam/credential_reports.go b/plugins/source/aws/resources/services/iam/credential_reports.go index 2d379cdb76ae85..d7e9767206fa76 100644 --- a/plugins/source/aws/resources/services/iam/credential_reports.go +++ b/plugins/source/aws/resources/services/iam/credential_reports.go @@ -36,16 +36,16 @@ func CredentialReports() *schema.Table { Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "iam"), Columns: []schema.Column{ { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { - Name: "user_creation_time", - Type: arrow.FixedWidthTypes.Timestamp_us, - Resolver: timestampPathResolver("UserCreationTime"), - PrimaryKey: true, + Name: "user_creation_time", + Type: arrow.FixedWidthTypes.Timestamp_us, + Resolver: timestampPathResolver("UserCreationTime"), + PrimaryKeyComponent: true, }, { Name: "password_last_changed", diff --git a/plugins/source/aws/resources/services/iam/group_attached_policies.go b/plugins/source/aws/resources/services/iam/group_attached_policies.go index ff7d2f6057a1f4..b90db835be45c2 100644 --- a/plugins/source/aws/resources/services/iam/group_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/group_attached_policies.go @@ -17,14 +17,14 @@ func groupAttachedPolicies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html`, Resolver: fetchIamGroupAttachedPolicies, - Transform: transformers.TransformWithStruct(&types.AttachedPolicy{}, transformers.WithPrimaryKeys("PolicyArn")), + Transform: transformers.TransformWithStruct(&types.AttachedPolicy{}, transformers.WithPrimaryKeyComponents("PolicyArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iam/group_policies.go b/plugins/source/aws/resources/services/iam/group_policies.go index 0c65718effa83b..4735ece618bdaa 100644 --- a/plugins/source/aws/resources/services/iam/group_policies.go +++ b/plugins/source/aws/resources/services/iam/group_policies.go @@ -21,14 +21,14 @@ func groupPolicies() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetGroupPolicy.html`, Resolver: fetchIamGroupPolicies, PreResourceResolver: getGroupPolicy, - Transform: transformers.TransformWithStruct(&iam.GetGroupPolicyOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("PolicyName")), + Transform: transformers.TransformWithStruct(&iam.GetGroupPolicyOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("PolicyName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy_document", diff --git a/plugins/source/aws/resources/services/iam/groups.go b/plugins/source/aws/resources/services/iam/groups.go index 8ac0511eddffe2..3ecde45bacfacf 100644 --- a/plugins/source/aws/resources/services/iam/groups.go +++ b/plugins/source/aws/resources/services/iam/groups.go @@ -22,10 +22,10 @@ func Groups() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/iam/instance_profiles.go b/plugins/source/aws/resources/services/iam/instance_profiles.go index 8012db99a7dddc..58ef43bbdf05da 100644 --- a/plugins/source/aws/resources/services/iam/instance_profiles.go +++ b/plugins/source/aws/resources/services/iam/instance_profiles.go @@ -23,10 +23,10 @@ func InstanceProfiles() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("InstanceProfileId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("InstanceProfileId"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/iam/last_accessed_details.go b/plugins/source/aws/resources/services/iam/last_accessed_details.go index 95fa9fd4493560..6b67c1afddc96b 100644 --- a/plugins/source/aws/resources/services/iam/last_accessed_details.go +++ b/plugins/source/aws/resources/services/iam/last_accessed_details.go @@ -27,14 +27,14 @@ func userLastAccessedDetails() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html`, Resolver: fetchUserLastAccessedDetails, - Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeys("ServiceNamespace"), transformers.WithSkipFields("Arn")), + Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeyComponents("ServiceNamespace"), transformers.WithSkipFields("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } @@ -46,14 +46,14 @@ func roleLastAccessedDetails() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html`, Resolver: fetchRoleLastAccessedDetails, - Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeys("ServiceNamespace"), transformers.WithSkipFields("Arn")), + Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeyComponents("ServiceNamespace"), transformers.WithSkipFields("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "role_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "role_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } @@ -65,14 +65,14 @@ func groupLastAccessedDetails() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html`, Resolver: fetchGroupLastAccessedDetails, - Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeys("ServiceNamespace"), transformers.WithSkipFields("Arn")), + Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeyComponents("ServiceNamespace"), transformers.WithSkipFields("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } @@ -84,7 +84,7 @@ func policyLastAccessedDetails() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_ServiceLastAccessed.html`, Resolver: fetchPolicyLastAccessedDetails, - Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeys("Arn", "ServiceNamespace")), + Transform: transformers.TransformWithStruct(&LastAccessed{}, transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithPrimaryKeyComponents("Arn", "ServiceNamespace")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), }, diff --git a/plugins/source/aws/resources/services/iam/mfa_devices.go b/plugins/source/aws/resources/services/iam/mfa_devices.go index 490b7154bd847c..5106a4337cfa3d 100644 --- a/plugins/source/aws/resources/services/iam/mfa_devices.go +++ b/plugins/source/aws/resources/services/iam/mfa_devices.go @@ -21,9 +21,9 @@ func mfaDevices() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "serial_number", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "serial_number", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } 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 a126630b4c4c66..4e40a5c5f2eab6 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 @@ -25,9 +25,9 @@ func OpenidConnectIdentityProviders() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/iam/policies.go b/plugins/source/aws/resources/services/iam/policies.go index f32389d31bb530..5522b1be5d4533 100644 --- a/plugins/source/aws/resources/services/iam/policies.go +++ b/plugins/source/aws/resources/services/iam/policies.go @@ -25,10 +25,10 @@ func Policies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyId"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/iam/policy_versions.go b/plugins/source/aws/resources/services/iam/policy_versions.go index 2193e6f8fc68bb..0bf4268363ce62 100644 --- a/plugins/source/aws/resources/services/iam/policy_versions.go +++ b/plugins/source/aws/resources/services/iam/policy_versions.go @@ -21,14 +21,14 @@ func policyVersions() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_PolicyVersion.html`, Resolver: fetchPolicyVersion, PreResourceResolver: getPolicy, - Transform: transformers.TransformWithStruct(&types.PolicyVersion{}, transformers.WithPrimaryKeys("VersionId")), + Transform: transformers.TransformWithStruct(&types.PolicyVersion{}, transformers.WithPrimaryKeyComponents("VersionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "policy_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "policy_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "document_json", diff --git a/plugins/source/aws/resources/services/iam/role_attached_policies.go b/plugins/source/aws/resources/services/iam/role_attached_policies.go index 432449aa7c2e12..bf4d7b3e21b9e0 100644 --- a/plugins/source/aws/resources/services/iam/role_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/role_attached_policies.go @@ -17,14 +17,14 @@ func roleAttachedPolicies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_AttachedPolicy.html`, Resolver: fetchIamRoleAttachedPolicies, - Transform: transformers.TransformWithStruct(&types.AttachedPolicy{}, transformers.WithPrimaryKeys("PolicyArn")), + Transform: transformers.TransformWithStruct(&types.AttachedPolicy{}, transformers.WithPrimaryKeyComponents("PolicyArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "role_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "role_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iam/role_policies.go b/plugins/source/aws/resources/services/iam/role_policies.go index 6da26c21bb02c9..e4018fa9de8c4b 100644 --- a/plugins/source/aws/resources/services/iam/role_policies.go +++ b/plugins/source/aws/resources/services/iam/role_policies.go @@ -21,14 +21,14 @@ func rolePolicies() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetRolePolicy.html`, Resolver: fetchIamRolePolicies, PreResourceResolver: getRolePolicy, - Transform: transformers.TransformWithStruct(&iam.GetRolePolicyOutput{}, transformers.WithPrimaryKeys("PolicyName"), transformers.WithSkipFields("ResultMetadata")), + Transform: transformers.TransformWithStruct(&iam.GetRolePolicyOutput{}, transformers.WithPrimaryKeyComponents("PolicyName"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "role_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "role_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy_document", diff --git a/plugins/source/aws/resources/services/iam/roles.go b/plugins/source/aws/resources/services/iam/roles.go index c7de0959dc55a0..da680f79215819 100644 --- a/plugins/source/aws/resources/services/iam/roles.go +++ b/plugins/source/aws/resources/services/iam/roles.go @@ -20,7 +20,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{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Role{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "iam"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), 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 bcd4b7b8f91645..3d5ec7b2ae61ea 100644 --- a/plugins/source/aws/resources/services/iam/saml_identity_providers.go +++ b/plugins/source/aws/resources/services/iam/saml_identity_providers.go @@ -28,9 +28,9 @@ func SamlIdentityProviders() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iam/server_certificates.go b/plugins/source/aws/resources/services/iam/server_certificates.go index 43f1d5dccd3ddb..ac79454e1f0cab 100644 --- a/plugins/source/aws/resources/services/iam/server_certificates.go +++ b/plugins/source/aws/resources/services/iam/server_certificates.go @@ -22,10 +22,10 @@ func ServerCertificates() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ServerCertificateId"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ServerCertificateId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iam/signing_certificates.go b/plugins/source/aws/resources/services/iam/signing_certificates.go index 56f5d3bf7431c9..ab3aab1740b17a 100644 --- a/plugins/source/aws/resources/services/iam/signing_certificates.go +++ b/plugins/source/aws/resources/services/iam/signing_certificates.go @@ -17,14 +17,14 @@ func signingCertificates() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_SigningCertificate.html`, Resolver: fetchUserSigningCertificates, - Transform: transformers.TransformWithStruct(&types.SigningCertificate{}, transformers.WithPrimaryKeys("CertificateId")), + Transform: transformers.TransformWithStruct(&types.SigningCertificate{}, transformers.WithPrimaryKeyComponents("CertificateId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "user_id", 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 d40953dcd33d50..85945cd1bb1aa2 100644 --- a/plugins/source/aws/resources/services/iam/ssh_public_keys.go +++ b/plugins/source/aws/resources/services/iam/ssh_public_keys.go @@ -21,10 +21,10 @@ func sshPublicKeys() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "user_id", @@ -32,10 +32,10 @@ func sshPublicKeys() *schema.Table { Resolver: schema.ParentColumnResolver("user_id"), }, { - Name: "ssh_public_key_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SSHPublicKeyId"), - PrimaryKey: true, + Name: "ssh_public_key_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SSHPublicKeyId"), + PrimaryKeyComponent: true, }, }, } 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 2aeeb46724a61a..845c13a50ddea7 100644 --- a/plugins/source/aws/resources/services/iam/user_access_keys.go +++ b/plugins/source/aws/resources/services/iam/user_access_keys.go @@ -23,16 +23,16 @@ func userAccessKeys() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "access_key_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AccessKeyId"), - PrimaryKey: true, + Name: "access_key_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AccessKeyId"), + PrimaryKeyComponent: true, }, { Name: "user_id", 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 7a6ce05faabcb0..68c11430e65a5c 100644 --- a/plugins/source/aws/resources/services/iam/user_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/user_attached_policies.go @@ -21,16 +21,16 @@ func userAttachedPolicies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "policy_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyName"), - PrimaryKey: true, + Name: "policy_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyName"), + PrimaryKeyComponent: true, }, { Name: "user_id", diff --git a/plugins/source/aws/resources/services/iam/user_groups.go b/plugins/source/aws/resources/services/iam/user_groups.go index f9bce26bdca142..bc68a94edec5ea 100644 --- a/plugins/source/aws/resources/services/iam/user_groups.go +++ b/plugins/source/aws/resources/services/iam/user_groups.go @@ -17,14 +17,14 @@ func userGroups() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_Group.html`, Resolver: fetchIamUserGroups, - Transform: transformers.TransformWithStruct(&types.Group{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Group{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "user_id", diff --git a/plugins/source/aws/resources/services/iam/user_policies.go b/plugins/source/aws/resources/services/iam/user_policies.go index 4c39efd7c4f27d..1e5189f67fece4 100644 --- a/plugins/source/aws/resources/services/iam/user_policies.go +++ b/plugins/source/aws/resources/services/iam/user_policies.go @@ -21,14 +21,14 @@ func userPolicies() *schema.Table { Description: `https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetUserPolicy.html`, Resolver: fetchIamUserPolicies, PreResourceResolver: getUserPolicy, - Transform: transformers.TransformWithStruct(&iam.GetUserPolicyOutput{}, transformers.WithPrimaryKeys("PolicyName"), transformers.WithSkipFields("ResultMetadata")), + Transform: transformers.TransformWithStruct(&iam.GetUserPolicyOutput{}, transformers.WithPrimaryKeyComponents("PolicyName"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "user_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "user_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "user_id", diff --git a/plugins/source/aws/resources/services/iam/users.go b/plugins/source/aws/resources/services/iam/users.go index c7f5806c65fdfb..78dda348b0f421 100644 --- a/plugins/source/aws/resources/services/iam/users.go +++ b/plugins/source/aws/resources/services/iam/users.go @@ -25,10 +25,10 @@ func Users() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 535e04d19d2487..c655f1028eaa22 100644 --- a/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go +++ b/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go @@ -23,9 +23,9 @@ func VirtualMfaDevices() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "serial_number", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "serial_number", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/identitystore/group_memberships.go b/plugins/source/aws/resources/services/identitystore/group_memberships.go index 6f997a4fe6c171..768f004a21fbf9 100644 --- a/plugins/source/aws/resources/services/identitystore/group_memberships.go +++ b/plugins/source/aws/resources/services/identitystore/group_memberships.go @@ -24,16 +24,16 @@ func groupMemberships() *schema.Table { client.RequestAccountIDColumn(true), client.RequestRegionColumn(true), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveMembershipARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveMembershipARN, + PrimaryKeyComponent: true, }, { Name: "member_id", diff --git a/plugins/source/aws/resources/services/identitystore/groups.go b/plugins/source/aws/resources/services/identitystore/groups.go index 62b4047f301796..50bda3871ab276 100644 --- a/plugins/source/aws/resources/services/identitystore/groups.go +++ b/plugins/source/aws/resources/services/identitystore/groups.go @@ -25,10 +25,10 @@ func Groups() *schema.Table { client.RequestAccountIDColumn(true), client.RequestRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveGroupARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveGroupARN, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/identitystore/users.go b/plugins/source/aws/resources/services/identitystore/users.go index 44da65b0e166d2..d67f8b0da9691e 100644 --- a/plugins/source/aws/resources/services/identitystore/users.go +++ b/plugins/source/aws/resources/services/identitystore/users.go @@ -25,10 +25,10 @@ func Users() *schema.Table { client.RequestAccountIDColumn(true), client.RequestRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveUserARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveUserARN, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/inspector/findings.go b/plugins/source/aws/resources/services/inspector/findings.go index 2b8228cfa056c5..15d05d7d200354 100644 --- a/plugins/source/aws/resources/services/inspector/findings.go +++ b/plugins/source/aws/resources/services/inspector/findings.go @@ -25,9 +25,9 @@ func Findings() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "attributes", diff --git a/plugins/source/aws/resources/services/inspector2/covered_resources.go b/plugins/source/aws/resources/services/inspector2/covered_resources.go index 96bc843c402e68..90a410b51dd0de 100644 --- a/plugins/source/aws/resources/services/inspector2/covered_resources.go +++ b/plugins/source/aws/resources/services/inspector2/covered_resources.go @@ -19,7 +19,7 @@ func CoveredResources() *schema.Table { The ` + "`request_account_id` and `request_region` columns are added to show from where the request was made.", Resolver: fetchCoveredResources, - Transform: transformers.TransformWithStruct(&types.CoveredResource{}, transformers.WithPrimaryKeys("AccountId", "ResourceId")), + Transform: transformers.TransformWithStruct(&types.CoveredResource{}, transformers.WithPrimaryKeyComponents("AccountId", "ResourceId")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, client.AWSServiceInspector2.String()), Columns: schema.ColumnList{ client.RequestAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/inspector2/findings.go b/plugins/source/aws/resources/services/inspector2/findings.go index 21f46c00097e63..2d28c53a814564 100644 --- a/plugins/source/aws/resources/services/inspector2/findings.go +++ b/plugins/source/aws/resources/services/inspector2/findings.go @@ -26,10 +26,10 @@ The ` + "`request_account_id` and `request_region` columns are added to show fro client.RequestAccountIDColumn(true), client.RequestRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FindingArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FindingArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/billing_groups.go b/plugins/source/aws/resources/services/iot/billing_groups.go index ee5de49b80b347..f6979236380e96 100644 --- a/plugins/source/aws/resources/services/iot/billing_groups.go +++ b/plugins/source/aws/resources/services/iot/billing_groups.go @@ -36,10 +36,10 @@ func BillingGroups() *schema.Table { Resolver: resolveIotBillingGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BillingGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BillingGroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/ca_certificates.go b/plugins/source/aws/resources/services/iot/ca_certificates.go index 1725d345bce378..42534412e9c090 100644 --- a/plugins/source/aws/resources/services/iot/ca_certificates.go +++ b/plugins/source/aws/resources/services/iot/ca_certificates.go @@ -30,10 +30,10 @@ func CaCertificates() *schema.Table { Resolver: ResolveIotCaCertificateCertificates, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/certificates.go b/plugins/source/aws/resources/services/iot/certificates.go index 9b04850625191e..b7061b0f7b4c93 100644 --- a/plugins/source/aws/resources/services/iot/certificates.go +++ b/plugins/source/aws/resources/services/iot/certificates.go @@ -30,10 +30,10 @@ func Certificates() *schema.Table { Resolver: ResolveIotCertificatePolicies, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/jobs.go b/plugins/source/aws/resources/services/iot/jobs.go index 73061dacfcb27b..f67d89be0174f5 100644 --- a/plugins/source/aws/resources/services/iot/jobs.go +++ b/plugins/source/aws/resources/services/iot/jobs.go @@ -31,10 +31,10 @@ func Jobs() *schema.Table { Resolver: ResolveIotJobTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("JobArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("JobArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/policies.go b/plugins/source/aws/resources/services/iot/policies.go index 111348e95fda18..5ba189a7a4b830 100644 --- a/plugins/source/aws/resources/services/iot/policies.go +++ b/plugins/source/aws/resources/services/iot/policies.go @@ -31,10 +31,10 @@ func Policies() *schema.Table { Resolver: ResolveIotPolicyTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/security_profiles.go b/plugins/source/aws/resources/services/iot/security_profiles.go index e48b46e754c158..51259597f57f56 100644 --- a/plugins/source/aws/resources/services/iot/security_profiles.go +++ b/plugins/source/aws/resources/services/iot/security_profiles.go @@ -36,10 +36,10 @@ func SecurityProfiles() *schema.Table { Resolver: ResolveIotSecurityProfileTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SecurityProfileArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SecurityProfileArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/streams.go b/plugins/source/aws/resources/services/iot/streams.go index 93240d993b157d..0176b2fbf0f073 100644 --- a/plugins/source/aws/resources/services/iot/streams.go +++ b/plugins/source/aws/resources/services/iot/streams.go @@ -25,10 +25,10 @@ func Streams() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StreamArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StreamArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/thing_groups.go b/plugins/source/aws/resources/services/iot/thing_groups.go index fabdd293b71898..29a6ca4479df0c 100644 --- a/plugins/source/aws/resources/services/iot/thing_groups.go +++ b/plugins/source/aws/resources/services/iot/thing_groups.go @@ -41,10 +41,10 @@ func ThingGroups() *schema.Table { Resolver: ResolveIotThingGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ThingGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ThingGroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/thing_types.go b/plugins/source/aws/resources/services/iot/thing_types.go index 0322fa49b8646f..8d3dc2162253b8 100644 --- a/plugins/source/aws/resources/services/iot/thing_types.go +++ b/plugins/source/aws/resources/services/iot/thing_types.go @@ -30,10 +30,10 @@ func ThingTypes() *schema.Table { Resolver: ResolveIotThingTypeTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ThingTypeArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ThingTypeArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/things.go b/plugins/source/aws/resources/services/iot/things.go index 2e342377911409..e3b792057e750e 100644 --- a/plugins/source/aws/resources/services/iot/things.go +++ b/plugins/source/aws/resources/services/iot/things.go @@ -29,10 +29,10 @@ func Things() *schema.Table { Resolver: ResolveIotThingPrincipals, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ThingArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ThingArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/iot/topic_rules.go b/plugins/source/aws/resources/services/iot/topic_rules.go index 583415d58c6358..d977cb7adb1a09 100644 --- a/plugins/source/aws/resources/services/iot/topic_rules.go +++ b/plugins/source/aws/resources/services/iot/topic_rules.go @@ -31,10 +31,10 @@ func TopicRules() *schema.Table { Resolver: resolveIotTopicRuleTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RuleArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RuleArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/kafka/cluster_operations.go b/plugins/source/aws/resources/services/kafka/cluster_operations.go index 17c037f4f3b46f..fe8ec16e2d4b63 100644 --- a/plugins/source/aws/resources/services/kafka/cluster_operations.go +++ b/plugins/source/aws/resources/services/kafka/cluster_operations.go @@ -22,10 +22,10 @@ func clusterOperations() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("OperationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("OperationArn"), + PrimaryKeyComponent: true, }, { Name: "cluster_arn", diff --git a/plugins/source/aws/resources/services/kafka/clusters.go b/plugins/source/aws/resources/services/kafka/clusters.go index 65f96cafb193a8..ae06d41befbc12 100644 --- a/plugins/source/aws/resources/services/kafka/clusters.go +++ b/plugins/source/aws/resources/services/kafka/clusters.go @@ -23,10 +23,10 @@ func Clusters() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/kafka/configurations.go b/plugins/source/aws/resources/services/kafka/configurations.go index 691a1b12f0bd4e..6ba5057152d00d 100644 --- a/plugins/source/aws/resources/services/kafka/configurations.go +++ b/plugins/source/aws/resources/services/kafka/configurations.go @@ -22,10 +22,10 @@ func Configurations() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/kafka/nodes.go b/plugins/source/aws/resources/services/kafka/nodes.go index ae623d76970e96..689687a5efbcb0 100644 --- a/plugins/source/aws/resources/services/kafka/nodes.go +++ b/plugins/source/aws/resources/services/kafka/nodes.go @@ -21,10 +21,10 @@ func nodes() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("NodeARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("NodeARN"), + PrimaryKeyComponent: true, }, { Name: "cluster_arn", diff --git a/plugins/source/aws/resources/services/kinesis/streams.go b/plugins/source/aws/resources/services/kinesis/streams.go index 5412daf0c63423..4e16e3233e14d7 100644 --- a/plugins/source/aws/resources/services/kinesis/streams.go +++ b/plugins/source/aws/resources/services/kinesis/streams.go @@ -26,10 +26,10 @@ func Streams() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StreamARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StreamARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/kms/aliases.go b/plugins/source/aws/resources/services/kms/aliases.go index 1bc803de8f4256..e47279ac4ea428 100644 --- a/plugins/source/aws/resources/services/kms/aliases.go +++ b/plugins/source/aws/resources/services/kms/aliases.go @@ -23,10 +23,10 @@ func Aliases() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AliasArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AliasArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/kms/key_grants.go b/plugins/source/aws/resources/services/kms/key_grants.go index dd8f732a9119a7..c57043b1cb7e5d 100644 --- a/plugins/source/aws/resources/services/kms/key_grants.go +++ b/plugins/source/aws/resources/services/kms/key_grants.go @@ -23,16 +23,16 @@ func keyGrants() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "key_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "key_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "grant_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GrantId"), - PrimaryKey: true, + Name: "grant_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GrantId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/kms/key_policies.go b/plugins/source/aws/resources/services/kms/key_policies.go index ea8e9996d48eeb..ccfec427ce9ca7 100644 --- a/plugins/source/aws/resources/services/kms/key_policies.go +++ b/plugins/source/aws/resources/services/kms/key_policies.go @@ -29,16 +29,16 @@ func keyPolicies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "key_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "key_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Name"), + PrimaryKeyComponent: true, }, { Name: "policy", diff --git a/plugins/source/aws/resources/services/kms/keys.go b/plugins/source/aws/resources/services/kms/keys.go index ec90f7516ce5c8..cf1df311a17adc 100644 --- a/plugins/source/aws/resources/services/kms/keys.go +++ b/plugins/source/aws/resources/services/kms/keys.go @@ -36,9 +36,9 @@ func Keys() *schema.Table { Resolver: resolveKeysTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "replica_keys", diff --git a/plugins/source/aws/resources/services/lambda/function_aliases.go b/plugins/source/aws/resources/services/lambda/function_aliases.go index 7421027d785d03..36bb4e94ad8403 100644 --- a/plugins/source/aws/resources/services/lambda/function_aliases.go +++ b/plugins/source/aws/resources/services/lambda/function_aliases.go @@ -27,10 +27,10 @@ func functionAliases() *schema.Table { Resolver: schema.ParentColumnResolver("arn"), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AliasArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AliasArn"), + PrimaryKeyComponent: true, }, }, } 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 9e36ea434cffe1..d32f5eda4e5fc6 100644 --- a/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go @@ -17,7 +17,7 @@ func functionConcurrencyConfigs() *schema.Table { Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_ProvisionedConcurrencyConfigListItem.html`, Resolver: fetchLambdaFunctionConcurrencyConfigs, Transform: transformers.TransformWithStruct(&types.ProvisionedConcurrencyConfigListItem{}, - transformers.WithPrimaryKeys("FunctionArn"), // FunctionArn here can also be a version + transformers.WithPrimaryKeyComponents("FunctionArn"), // FunctionArn here can also be a version ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), 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 508c32470929d5..697974f21e4d29 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 @@ -17,7 +17,7 @@ func functionEventInvokeConfigs() *schema.Table { Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionEventInvokeConfig.html`, Resolver: fetchLambdaFunctionEventInvokeConfigs, Transform: transformers.TransformWithStruct(&types.FunctionEventInvokeConfig{}, - transformers.WithPrimaryKeys("FunctionArn"), // FunctionArn here can also be a version + transformers.WithPrimaryKeyComponents("FunctionArn"), // FunctionArn here can also be a version ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), 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 31148d76842823..8dfd86711f4098 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 @@ -18,16 +18,16 @@ func functionEventSourceMappings() *schema.Table { Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_EventSourceMappingConfiguration.html`, Resolver: fetchLambdaFunctionEventSourceMappings, Transform: transformers.TransformWithStruct(&types.EventSourceMappingConfiguration{}, - transformers.WithPrimaryKeys("FunctionArn", "EventSourceArn"), // FunctionArn here can also be a version + transformers.WithPrimaryKeyComponents("FunctionArn", "EventSourceArn"), // FunctionArn here can also be a version ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "uuid", - Type: cqtypes.ExtensionTypes.UUID, - Resolver: schema.PathResolver("UUID"), - PrimaryKey: true, + Name: "uuid", + Type: cqtypes.ExtensionTypes.UUID, + Resolver: schema.PathResolver("UUID"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lambda/function_url_configs.go b/plugins/source/aws/resources/services/lambda/function_url_configs.go index 08795a8c30db4a..22374268e95f00 100644 --- a/plugins/source/aws/resources/services/lambda/function_url_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_url_configs.go @@ -16,7 +16,7 @@ func functionURLConfigs() *schema.Table { Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionUrlConfig.html`, Resolver: fetchLambdaFunctionURLConfigs, Transform: transformers.TransformWithStruct(&types.FunctionUrlConfig{}, - transformers.WithPrimaryKeys("FunctionArn"), // FunctionArn here can also be a version + transformers.WithPrimaryKeyComponents("FunctionArn"), // FunctionArn here can also be a version ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/lambda/function_versions.go b/plugins/source/aws/resources/services/lambda/function_versions.go index 6d46f24f5651a7..b399c910597887 100644 --- a/plugins/source/aws/resources/services/lambda/function_versions.go +++ b/plugins/source/aws/resources/services/lambda/function_versions.go @@ -17,15 +17,15 @@ func functionVersions() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_FunctionConfiguration.html`, Resolver: fetchLambdaFunctionVersions, - Transform: transformers.TransformWithStruct(&types.FunctionConfiguration{}, transformers.WithPrimaryKeys("Version")), + Transform: transformers.TransformWithStruct(&types.FunctionConfiguration{}, transformers.WithPrimaryKeyComponents("Version")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "function_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "function_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lambda/functions.go b/plugins/source/aws/resources/services/lambda/functions.go index 4cf4a86d4b7819..e2fca16895eb8f 100644 --- a/plugins/source/aws/resources/services/lambda/functions.go +++ b/plugins/source/aws/resources/services/lambda/functions.go @@ -27,10 +27,10 @@ func Functions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Configuration.FunctionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Configuration.FunctionArn"), + PrimaryKeyComponent: true, }, { Name: "policy_revision_id", 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 a851aa972bf179..0024fd328d6665 100644 --- a/plugins/source/aws/resources/services/lambda/layer_version_policies.go +++ b/plugins/source/aws/resources/services/lambda/layer_version_policies.go @@ -15,17 +15,17 @@ func layerVersionPolicies() *schema.Table { Description: `https://docs.aws.amazon.com/lambda/latest/dg/API_GetLayerVersionPolicy.html`, Resolver: fetchLambdaLayerVersionPolicies, Transform: transformers.TransformWithStruct(&lambda.GetLayerVersionPolicyOutput{}, - transformers.WithPrimaryKeys("RevisionId"), + transformers.WithPrimaryKeyComponents("RevisionId"), transformers.WithSkipFields("ResultMetadata"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "layer_version_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "layer_version_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "layer_version", diff --git a/plugins/source/aws/resources/services/lambda/layer_versions.go b/plugins/source/aws/resources/services/lambda/layer_versions.go index fde8e5f9f933be..c71d460af77b59 100644 --- a/plugins/source/aws/resources/services/lambda/layer_versions.go +++ b/plugins/source/aws/resources/services/lambda/layer_versions.go @@ -19,10 +19,10 @@ func layerVersions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LayerVersionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LayerVersionArn"), + PrimaryKeyComponent: true, }, { Name: "layer_arn", diff --git a/plugins/source/aws/resources/services/lambda/layers.go b/plugins/source/aws/resources/services/lambda/layers.go index c10c82d54b6959..7aaa6b481872f1 100644 --- a/plugins/source/aws/resources/services/lambda/layers.go +++ b/plugins/source/aws/resources/services/lambda/layers.go @@ -24,10 +24,10 @@ func Layers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LayerArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LayerArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/lambda/runtimes.go b/plugins/source/aws/resources/services/lambda/runtimes.go index 20fad385bb49bc..cc188ac9fbf50a 100644 --- a/plugins/source/aws/resources/services/lambda/runtimes.go +++ b/plugins/source/aws/resources/services/lambda/runtimes.go @@ -20,7 +20,7 @@ func Runtimes() *schema.Table { Resolver: func(_ context.Context, _ schema.ClientMeta, r *schema.Resource, c schema.Column) error { return r.Set(c.Name, string(r.Item.(types.Runtime))) }, - PrimaryKey: true, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/alarms.go b/plugins/source/aws/resources/services/lightsail/alarms.go index 9740e39cd394b7..13936b4a8e0cea 100644 --- a/plugins/source/aws/resources/services/lightsail/alarms.go +++ b/plugins/source/aws/resources/services/lightsail/alarms.go @@ -24,9 +24,9 @@ func Alarms() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } 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 8128a43fcece93..db0b49501eefee 100644 --- a/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go +++ b/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go @@ -17,15 +17,15 @@ func bucketAccessKeys() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_AccessKey.html`, Resolver: fetchLightsailBucketAccessKeys, - Transform: transformers.TransformWithStruct(&types.AccessKey{}, transformers.WithPrimaryKeys("AccessKeyId")), + Transform: transformers.TransformWithStruct(&types.AccessKey{}, transformers.WithPrimaryKeyComponents("AccessKeyId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/buckets.go b/plugins/source/aws/resources/services/lightsail/buckets.go index bdd2f0888bd28f..d1bcd34f7869a6 100644 --- a/plugins/source/aws/resources/services/lightsail/buckets.go +++ b/plugins/source/aws/resources/services/lightsail/buckets.go @@ -19,7 +19,7 @@ func Buckets() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Bucket.html`, Resolver: fetchLightsailBuckets, - Transform: transformers.TransformWithStruct(&types.Bucket{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Bucket{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "lightsail"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/lightsail/certificates.go b/plugins/source/aws/resources/services/lightsail/certificates.go index 7108973ba48545..2dd9bce518d3b4 100644 --- a/plugins/source/aws/resources/services/lightsail/certificates.go +++ b/plugins/source/aws/resources/services/lightsail/certificates.go @@ -17,7 +17,7 @@ func Certificates() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_Certificate.html`, Resolver: fetchLightsailCertificates, - Transform: transformers.TransformWithStruct(&types.Certificate{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Certificate{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "lightsail"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), 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 65637988b32f40..4516a8540a8f4a 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_deployments.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_deployments.go @@ -17,15 +17,15 @@ func containerServiceDeployments() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerServiceDeployment.html`, Resolver: fetchLightsailContainerServiceDeployments, - Transform: transformers.TransformWithStruct(&types.ContainerServiceDeployment{}, transformers.WithPrimaryKeys("Version")), + Transform: transformers.TransformWithStruct(&types.ContainerServiceDeployment{}, transformers.WithPrimaryKeyComponents("Version")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "container_service_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "container_service_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 c47dbf06d5720b..2b037c9eac4382 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_images.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_images.go @@ -17,15 +17,15 @@ func containerServiceImages() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_ContainerImage.html`, Resolver: fetchLightsailContainerServiceImages, - Transform: transformers.TransformWithStruct(&types.ContainerImage{}, transformers.WithPrimaryKeys("Image")), + Transform: transformers.TransformWithStruct(&types.ContainerImage{}, transformers.WithPrimaryKeyComponents("Image")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "container_service_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "container_service_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/container_services.go b/plugins/source/aws/resources/services/lightsail/container_services.go index 2c326984dfd692..768c0f55d961d9 100644 --- a/plugins/source/aws/resources/services/lightsail/container_services.go +++ b/plugins/source/aws/resources/services/lightsail/container_services.go @@ -24,9 +24,9 @@ func ContainerServices() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/lightsail/database_events.go b/plugins/source/aws/resources/services/lightsail/database_events.go index 7aa37736de2787..0aa61692aca947 100644 --- a/plugins/source/aws/resources/services/lightsail/database_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_events.go @@ -18,15 +18,15 @@ func databaseEvents() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseEvent.html`, Resolver: fetchLightsailDatabaseEvents, - Transform: transformers.TransformWithStruct(&types.RelationalDatabaseEvent{}, transformers.WithPrimaryKeys("CreatedAt")), + Transform: transformers.TransformWithStruct(&types.RelationalDatabaseEvent{}, transformers.WithPrimaryKeyComponents("CreatedAt")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "database_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "database_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 c476cf567c0ed4..f151483e28f1fb 100644 --- a/plugins/source/aws/resources/services/lightsail/database_log_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_log_events.go @@ -22,17 +22,17 @@ func databaseLogEvents() *schema.Table { Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_GetRelationalDatabaseLogEvents.html`, Resolver: fetchLightsailDatabaseLogEvents, Transform: transformers.TransformWithStruct(&models.LogEventWrapper{}, - transformers.WithPrimaryKeys("CreatedAt"), + transformers.WithPrimaryKeyComponents("CreatedAt"), transformers.WithUnwrapAllEmbeddedStructs(), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "database_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "database_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/database_parameters.go b/plugins/source/aws/resources/services/lightsail/database_parameters.go index 2ad8faffc77cdc..890700f4e40446 100644 --- a/plugins/source/aws/resources/services/lightsail/database_parameters.go +++ b/plugins/source/aws/resources/services/lightsail/database_parameters.go @@ -18,15 +18,15 @@ func databaseParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabaseParameter.html`, Resolver: fetchLightsailDatabaseParameters, - Transform: transformers.TransformWithStruct(&types.RelationalDatabaseParameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.RelationalDatabaseParameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "database_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "database_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/database_snapshots.go b/plugins/source/aws/resources/services/lightsail/database_snapshots.go index 537bf560053e78..5054669c117e63 100644 --- a/plugins/source/aws/resources/services/lightsail/database_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/database_snapshots.go @@ -25,9 +25,9 @@ func DatabaseSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/lightsail/databases.go b/plugins/source/aws/resources/services/lightsail/databases.go index 0adfa12225fd1b..4e1eeeed33800f 100644 --- a/plugins/source/aws/resources/services/lightsail/databases.go +++ b/plugins/source/aws/resources/services/lightsail/databases.go @@ -18,7 +18,7 @@ func Databases() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_RelationalDatabase.html`, Resolver: fetchLightsailDatabases, - Transform: transformers.TransformWithStruct(&types.RelationalDatabase{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.RelationalDatabase{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "lightsail"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go index 26e8ee5f736d70..480fb9a921e869 100644 --- a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go @@ -19,7 +19,7 @@ func diskSnapshots() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_DiskSnapshot.html`, Resolver: fetchLightsailDiskSnapshots, - Transform: transformers.TransformWithStruct(&types.DiskSnapshot{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.DiskSnapshot{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/lightsail/disks.go b/plugins/source/aws/resources/services/lightsail/disks.go index ae6f6d2f5c9248..519123bcb66fe7 100644 --- a/plugins/source/aws/resources/services/lightsail/disks.go +++ b/plugins/source/aws/resources/services/lightsail/disks.go @@ -25,9 +25,9 @@ func Disks() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/lightsail/distributions.go b/plugins/source/aws/resources/services/lightsail/distributions.go index 94de36958a1495..93d2e45e70fc40 100644 --- a/plugins/source/aws/resources/services/lightsail/distributions.go +++ b/plugins/source/aws/resources/services/lightsail/distributions.go @@ -27,10 +27,10 @@ func Distributions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 19974154855814..c53455bb4cf904 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_port_states.go +++ b/plugins/source/aws/resources/services/lightsail/instance_port_states.go @@ -19,23 +19,23 @@ func instancePortStates() *schema.Table { Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_InstancePortState.html`, Resolver: fetchLightsailInstancePortStates, Transform: transformers.TransformWithStruct(&types.InstancePortState{}, - transformers.WithPrimaryKeys("FromPort", "ToPort", "Protocol"), + transformers.WithPrimaryKeyComponents("FromPort", "ToPort", "Protocol"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "allow_list", - Description: "This column contains a concatenated list of all allowed addresses", - Type: arrow.BinaryTypes.String, - Resolver: resolveInstancePortAllowList, - PrimaryKey: true, + Name: "allow_list", + Description: "This column contains a concatenated list of all allowed addresses", + Type: arrow.BinaryTypes.String, + Resolver: resolveInstancePortAllowList, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go index 2bb44444764df5..ad3a10f543bae6 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go @@ -25,9 +25,9 @@ func InstanceSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/lightsail/instances.go b/plugins/source/aws/resources/services/lightsail/instances.go index f97d14578c8193..94f69f8c14f1fc 100644 --- a/plugins/source/aws/resources/services/lightsail/instances.go +++ b/plugins/source/aws/resources/services/lightsail/instances.go @@ -30,9 +30,9 @@ func Instances() *schema.Table { Resolver: resolveLightsailInstanceAccessDetails, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", 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 01a08a1f48779e..e6c3126f83533a 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 @@ -18,7 +18,7 @@ func loadBalancerTlsCertificates() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/lightsail/2016-11-28/api-reference/API_LoadBalancerTlsCertificate.html`, Resolver: fetchLightsailLoadBalancerTlsCertificates, - Transform: transformers.TransformWithStruct(&types.LoadBalancerTlsCertificate{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.LoadBalancerTlsCertificate{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/lightsail/load_balancers.go b/plugins/source/aws/resources/services/lightsail/load_balancers.go index 05f855831be204..4407714f180702 100644 --- a/plugins/source/aws/resources/services/lightsail/load_balancers.go +++ b/plugins/source/aws/resources/services/lightsail/load_balancers.go @@ -25,9 +25,9 @@ func LoadBalancers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/lightsail/static_ips.go b/plugins/source/aws/resources/services/lightsail/static_ips.go index 06a540e4172a6c..49e8fd6b698f3b 100644 --- a/plugins/source/aws/resources/services/lightsail/static_ips.go +++ b/plugins/source/aws/resources/services/lightsail/static_ips.go @@ -24,9 +24,9 @@ func StaticIps() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } 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 ddec4e5c38f6f1..8320bab1d3bdea 100644 --- a/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go +++ b/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go @@ -31,20 +31,20 @@ 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(&wrappedBrokerConfigurationRevision{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("ConfigurationId"), transformers.WithUnwrapAllEmbeddedStructs()), + Transform: transformers.TransformWithStruct(&wrappedBrokerConfigurationRevision{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("ConfigurationId"), transformers.WithUnwrapAllEmbeddedStructs()), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "broker_configuration_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "broker_configuration_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "revision", - Type: arrow.PrimitiveTypes.Int32, - PrimaryKey: true, + Name: "revision", + Type: arrow.PrimitiveTypes.Int32, + PrimaryKeyComponent: true, }, { Name: "data", diff --git a/plugins/source/aws/resources/services/mq/broker_configurations.go b/plugins/source/aws/resources/services/mq/broker_configurations.go index 7c6f5632a7a966..c0efd4a6104110 100644 --- a/plugins/source/aws/resources/services/mq/broker_configurations.go +++ b/plugins/source/aws/resources/services/mq/broker_configurations.go @@ -16,7 +16,7 @@ func brokerConfigurations() *schema.Table { Name: tableName, 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"), transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&mq.DescribeConfigurationOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), diff --git a/plugins/source/aws/resources/services/mq/broker_users.go b/plugins/source/aws/resources/services/mq/broker_users.go index 735a24cbf286c6..d89feac3f8ea99 100644 --- a/plugins/source/aws/resources/services/mq/broker_users.go +++ b/plugins/source/aws/resources/services/mq/broker_users.go @@ -16,15 +16,15 @@ func brokerUsers() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/amazon-mq/latest/api-reference/brokers-broker-id-users-username.html`, Resolver: fetchMqBrokerUsers, - Transform: transformers.TransformWithStruct(&mq.DescribeUserOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("Username")), + Transform: transformers.TransformWithStruct(&mq.DescribeUserOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("Username")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "broker_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "broker_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/mq/brokers.go b/plugins/source/aws/resources/services/mq/brokers.go index 4f189cea62efa8..908d49c7b9f3b0 100644 --- a/plugins/source/aws/resources/services/mq/brokers.go +++ b/plugins/source/aws/resources/services/mq/brokers.go @@ -24,10 +24,10 @@ func Brokers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BrokerArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BrokerArn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/mwaa/environments.go b/plugins/source/aws/resources/services/mwaa/environments.go index 64fb61a4d4a4e6..7f8144cee021fe 100644 --- a/plugins/source/aws/resources/services/mwaa/environments.go +++ b/plugins/source/aws/resources/services/mwaa/environments.go @@ -24,10 +24,10 @@ func Environments() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } 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 17aca56406d71f..80c8d21d7d8b90 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 @@ -17,15 +17,15 @@ func clusterParameterGroupParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBParameterGroups`, Resolver: fetchNeptuneClusterParameterGroupParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_parameter_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_parameter_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 797c64dcdbd71c..cdabcfc8b1e92d 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go @@ -25,10 +25,10 @@ func ClusterParameterGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterParameterGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterParameterGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go index ec599afa058417..1b5a7596c2b6b1 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go @@ -25,10 +25,10 @@ func ClusterSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterSnapshotArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterSnapshotArn"), + PrimaryKeyComponent: true, }, { Name: "attributes", diff --git a/plugins/source/aws/resources/services/neptune/clusters.go b/plugins/source/aws/resources/services/neptune/clusters.go index 9ad20c2c3dc8cf..c153c5a8854d8e 100644 --- a/plugins/source/aws/resources/services/neptune/clusters.go +++ b/plugins/source/aws/resources/services/neptune/clusters.go @@ -25,10 +25,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 8579e70097dd1f..dcdf8b7d2cc0d0 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 @@ -14,15 +14,15 @@ func dbParameterGroupDbParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/neptune/latest/userguide/api-parameters.html#DescribeDBClusterParameters`, Resolver: fetchNeptuneDbParameterGroupDbParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "db_parameter_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "db_parameter_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 6fad1d7dedca4d..b4703af4af2d3f 100644 --- a/plugins/source/aws/resources/services/neptune/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/db_parameter_groups.go @@ -25,10 +25,10 @@ func DbParameterGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBParameterGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBParameterGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/neptune/event_subscriptions.go b/plugins/source/aws/resources/services/neptune/event_subscriptions.go index c3b2ac4a28a3ca..4d2a846533e156 100644 --- a/plugins/source/aws/resources/services/neptune/event_subscriptions.go +++ b/plugins/source/aws/resources/services/neptune/event_subscriptions.go @@ -25,10 +25,10 @@ func EventSubscriptions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EventSubscriptionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EventSubscriptionArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/neptune/global_clusters.go b/plugins/source/aws/resources/services/neptune/global_clusters.go index cd8b90abfc0a76..535a0da17d83d8 100644 --- a/plugins/source/aws/resources/services/neptune/global_clusters.go +++ b/plugins/source/aws/resources/services/neptune/global_clusters.go @@ -22,10 +22,10 @@ func GlobalClusters() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GlobalClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GlobalClusterArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/neptune/instances.go b/plugins/source/aws/resources/services/neptune/instances.go index 2bc1d62d5a2236..98284604973edd 100644 --- a/plugins/source/aws/resources/services/neptune/instances.go +++ b/plugins/source/aws/resources/services/neptune/instances.go @@ -25,10 +25,10 @@ func Instances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBInstanceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/neptune/subnet_groups.go b/plugins/source/aws/resources/services/neptune/subnet_groups.go index 5fdbc3c1a8a4ea..2ea423242ea78f 100644 --- a/plugins/source/aws/resources/services/neptune/subnet_groups.go +++ b/plugins/source/aws/resources/services/neptune/subnet_groups.go @@ -25,10 +25,10 @@ func SubnetGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBSubnetGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBSubnetGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go b/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go index f4c6c18994ed5c..6c5f1ddc100b28 100644 --- a/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go +++ b/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go @@ -29,10 +29,10 @@ func FirewallPolicies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FirewallPolicyArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FirewallPolicyArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkfirewall/firewalls.go b/plugins/source/aws/resources/services/networkfirewall/firewalls.go index 2d828f41343c2b..3532b32d6c5b4a 100644 --- a/plugins/source/aws/resources/services/networkfirewall/firewalls.go +++ b/plugins/source/aws/resources/services/networkfirewall/firewalls.go @@ -29,10 +29,10 @@ func Firewalls() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("FirewallArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("FirewallArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkfirewall/rule_groups.go b/plugins/source/aws/resources/services/networkfirewall/rule_groups.go index 903bf4ec7aa319..8333481fe7ffe4 100644 --- a/plugins/source/aws/resources/services/networkfirewall/rule_groups.go +++ b/plugins/source/aws/resources/services/networkfirewall/rule_groups.go @@ -29,10 +29,10 @@ func RuleGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RuleGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RuleGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go b/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go index 12eeb47d01d89b..ddc06c9e8bc122 100644 --- a/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go +++ b/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go @@ -29,10 +29,10 @@ func TLSInspectionConfigurations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TLSInspectionConfigurationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TLSInspectionConfigurationArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkmanager/global_networks.go b/plugins/source/aws/resources/services/networkmanager/global_networks.go index a37451761f88c7..a3582327d689fa 100644 --- a/plugins/source/aws/resources/services/networkmanager/global_networks.go +++ b/plugins/source/aws/resources/services/networkmanager/global_networks.go @@ -25,16 +25,16 @@ The 'request_region' column is added to show region of where the request was ma client.DefaultAccountIDColumn(false), // Only including the request_region in the PK because the ARN doesn't include it as it is a global resource { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GlobalNetworkArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GlobalNetworkArn"), + PrimaryKeyComponent: true, }, { diff --git a/plugins/source/aws/resources/services/networkmanager/link.go b/plugins/source/aws/resources/services/networkmanager/link.go index 2e41a2158197cc..cae1f97b046e9f 100644 --- a/plugins/source/aws/resources/services/networkmanager/link.go +++ b/plugins/source/aws/resources/services/networkmanager/link.go @@ -19,19 +19,19 @@ func links() *schema.Table { Description: `https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_Link.html The 'request_region' column is added to show region of where the request was made from.`, Resolver: fetchLinks, - Transform: transformers.TransformWithStruct(&types.Link{}, transformers.WithPrimaryKeys("GlobalNetworkId")), + Transform: transformers.TransformWithStruct(&types.Link{}, transformers.WithPrimaryKeyComponents("GlobalNetworkId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LinkArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LinkArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkmanager/sites.go b/plugins/source/aws/resources/services/networkmanager/sites.go index ec246b66eff6b6..2ce7af015758bb 100644 --- a/plugins/source/aws/resources/services/networkmanager/sites.go +++ b/plugins/source/aws/resources/services/networkmanager/sites.go @@ -19,20 +19,20 @@ func sites() *schema.Table { Description: `https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_Site.html The 'request_region' column is added to show region of where the request was made from.`, Resolver: fetchSites, - Transform: transformers.TransformWithStruct(&types.Site{}, transformers.WithPrimaryKeys("GlobalNetworkId")), + Transform: transformers.TransformWithStruct(&types.Site{}, transformers.WithPrimaryKeyComponents("GlobalNetworkId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SiteArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SiteArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go b/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go index b4ed1bf2969826..3a5f06f27f8b73 100644 --- a/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go +++ b/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go @@ -18,14 +18,14 @@ func transitGatewayRegistration() *schema.Table { Description: `https://docs.aws.amazon.com/networkmanager/latest/APIReference/API_TransitGatewayRegistration.html The 'request_region' column is added to show region of where the request was made from.`, Resolver: fetchTransitGatewayRegistration, - Transform: transformers.TransformWithStruct(&types.TransitGatewayRegistration{}, transformers.WithPrimaryKeys("GlobalNetworkId", "TransitGatewayArn")), + Transform: transformers.TransformWithStruct(&types.TransitGatewayRegistration{}, transformers.WithPrimaryKeyComponents("GlobalNetworkId", "TransitGatewayArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }}, Relations: schema.Tables{}, } diff --git a/plugins/source/aws/resources/services/organizations/account_parents.go b/plugins/source/aws/resources/services/organizations/account_parents.go index 47357267a4c505..1d1966ba8b0d63 100644 --- a/plugins/source/aws/resources/services/organizations/account_parents.go +++ b/plugins/source/aws/resources/services/organizations/account_parents.go @@ -18,25 +18,25 @@ func organizationalAccountParents() *schema.Table { Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_ListParents.html The 'request_account_id' column is added to show from where the request was made.`, Resolver: fetchParents, - Transform: transformers.TransformWithStruct(&types.Parent{}, transformers.WithPrimaryKeys("Type")), + Transform: transformers.TransformWithStruct(&types.Parent{}, transformers.WithPrimaryKeyComponents("Type")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("id"), + PrimaryKeyComponent: true, }, { - Name: "parent_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "parent_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/organizations/accounts.go b/plugins/source/aws/resources/services/organizations/accounts.go index 82b1c0a1812946..4f4b725b88da63 100644 --- a/plugins/source/aws/resources/services/organizations/accounts.go +++ b/plugins/source/aws/resources/services/organizations/accounts.go @@ -19,14 +19,14 @@ func Accounts() *schema.Table { Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_Account.html The 'request_account_id' column is added to show from where the request was made.`, Resolver: fetchOrganizationsAccounts, - Transform: transformers.TransformWithStruct(&types.Account{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Account{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/organizations/delegated_admins.go b/plugins/source/aws/resources/services/organizations/delegated_admins.go index 05301f3671a102..fb681f5609ede6 100644 --- a/plugins/source/aws/resources/services/organizations/delegated_admins.go +++ b/plugins/source/aws/resources/services/organizations/delegated_admins.go @@ -16,7 +16,7 @@ func DelegatedAdministrators() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_DelegatedAdministrator.html`, Resolver: fetchOrganizationsDelegatedAdmins, - Transform: transformers.TransformWithStruct(&types.DelegatedAdministrator{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.DelegatedAdministrator{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/organizations/delegated_services.go b/plugins/source/aws/resources/services/organizations/delegated_services.go index 4f32c75d8d865a..6db5c9a95ea7e0 100644 --- a/plugins/source/aws/resources/services/organizations/delegated_services.go +++ b/plugins/source/aws/resources/services/organizations/delegated_services.go @@ -16,7 +16,7 @@ func delegatedServices() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_DelegatedService.html`, Resolver: fetchOrganizationsDelegatedServices, - Transform: transformers.TransformWithStruct(&types.DelegatedService{}, transformers.WithPrimaryKeys("ServicePrincipal")), + Transform: transformers.TransformWithStruct(&types.DelegatedService{}, transformers.WithPrimaryKeyComponents("ServicePrincipal")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), }, diff --git a/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go b/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go index fa320cd4d3ecc6..f45502d214dce2 100644 --- a/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go +++ b/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go @@ -18,25 +18,25 @@ func organizationalUnitParents() *schema.Table { Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_ListParents.html The 'request_account_id' column is added to show from where the request was made.`, Resolver: fetchOUParents, - Transform: transformers.TransformWithStruct(&types.Parent{}, transformers.WithPrimaryKeys("Type")), + Transform: transformers.TransformWithStruct(&types.Parent{}, transformers.WithPrimaryKeyComponents("Type")), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("id"), + PrimaryKeyComponent: true, }, { - Name: "parent_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "parent_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/organizations/organizational_units.go b/plugins/source/aws/resources/services/organizations/organizational_units.go index 7f061a6e1b1070..4134ac827ad432 100644 --- a/plugins/source/aws/resources/services/organizations/organizational_units.go +++ b/plugins/source/aws/resources/services/organizations/organizational_units.go @@ -23,15 +23,15 @@ The 'request_account_id' column is added to show from where the request was made PreResourceResolver: getOU, Transform: transformers.TransformWithStruct( &types.OrganizationalUnit{}, - transformers.WithPrimaryKeys("Arn"), + transformers.WithPrimaryKeyComponents("Arn"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, }, Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/organizations/organizations.go b/plugins/source/aws/resources/services/organizations/organizations.go index 24491eb112e213..9cc5189bb02460 100644 --- a/plugins/source/aws/resources/services/organizations/organizations.go +++ b/plugins/source/aws/resources/services/organizations/organizations.go @@ -23,15 +23,15 @@ The 'request_account_id' column is added to show from where the request was made transformers.WithSkipFields( "AvailablePolicyTypes", // deprecated and misleading field according to docs ), - transformers.WithPrimaryKeys("Arn"), + transformers.WithPrimaryKeyComponents("Arn"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/organizations/policies.go b/plugins/source/aws/resources/services/organizations/policies.go index 369d76e7224056..702a025a1ffb1d 100644 --- a/plugins/source/aws/resources/services/organizations/policies.go +++ b/plugins/source/aws/resources/services/organizations/policies.go @@ -17,7 +17,7 @@ func Policies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_Policy.html`, Resolver: fetchOrganizationsPolicies, - Transform: transformers.TransformWithStruct(&types.PolicySummary{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.PolicySummary{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ // This is needed as a PK because aws managed policies don't have an account_id in the ARN diff --git a/plugins/source/aws/resources/services/organizations/roots.go b/plugins/source/aws/resources/services/organizations/roots.go index 1c26b63e83cd02..a32c4c96018d77 100644 --- a/plugins/source/aws/resources/services/organizations/roots.go +++ b/plugins/source/aws/resources/services/organizations/roots.go @@ -19,14 +19,14 @@ func Roots() *schema.Table { Description: `https://docs.aws.amazon.com/organizations/latest/APIReference/API_Root.html The 'request_account_id' column is added to show from where the request was made.`, Resolver: fetchOrganizationsRoots, - Transform: transformers.TransformWithStruct(&types.Root{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Root{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "organizations"), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { Name: "tags", 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 d84d039820d469..203ff6cbacac3a 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 @@ -18,7 +18,7 @@ func ledgerJournalKinesisStreams() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalKinesisStreamDescription.html`, Resolver: fetchQldbLedgerJournalKinesisStreams, - Transform: transformers.TransformWithStruct(&types.JournalKinesisStreamDescription{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.JournalKinesisStreamDescription{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), 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 75a8101c2dd990..96df59ec76e55d 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 @@ -18,15 +18,15 @@ func ledgerJournalS3Exports() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/qldb/latest/developerguide/API_JournalS3ExportDescription.html`, Resolver: fetchQldbLedgerJournalS3Exports, - Transform: transformers.TransformWithStruct(&types.JournalS3ExportDescription{}, transformers.WithPrimaryKeys("ExportId")), + Transform: transformers.TransformWithStruct(&types.JournalS3ExportDescription{}, transformers.WithPrimaryKeyComponents("ExportId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "ledger_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "ledger_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/qldb/ledgers.go b/plugins/source/aws/resources/services/qldb/ledgers.go index 5b2533464f70fe..cd78c6e7a065ce 100644 --- a/plugins/source/aws/resources/services/qldb/ledgers.go +++ b/plugins/source/aws/resources/services/qldb/ledgers.go @@ -31,9 +31,9 @@ func Ledgers() *schema.Table { Description: `The tags associated with the pipeline.`, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/quicksight/analyses.go b/plugins/source/aws/resources/services/quicksight/analyses.go index db7e07b8641ee5..bf5409dd73dc7c 100644 --- a/plugins/source/aws/resources/services/quicksight/analyses.go +++ b/plugins/source/aws/resources/services/quicksight/analyses.go @@ -20,7 +20,7 @@ func Analyses() *schema.Table { Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Analysis.html", Resolver: fetchQuicksightAnalyses, PreResourceResolver: getAnalysis, - Transform: transformers.TransformWithStruct(&types.Analysis{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Analysis{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, } diff --git a/plugins/source/aws/resources/services/quicksight/dashboards.go b/plugins/source/aws/resources/services/quicksight/dashboards.go index ec0d287c32aad2..b3929b640c9120 100644 --- a/plugins/source/aws/resources/services/quicksight/dashboards.go +++ b/plugins/source/aws/resources/services/quicksight/dashboards.go @@ -19,7 +19,7 @@ func Dashboards() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DashboardSummary.html", Resolver: fetchQuicksightDashboards, - Transform: transformers.TransformWithStruct(&types.DashboardSummary{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.DashboardSummary{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, } diff --git a/plugins/source/aws/resources/services/quicksight/data_sets.go b/plugins/source/aws/resources/services/quicksight/data_sets.go index 82aeebd4843a71..88217523769733 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sets.go +++ b/plugins/source/aws/resources/services/quicksight/data_sets.go @@ -19,7 +19,7 @@ func DataSets() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSetSummary.html", Resolver: fetchQuicksightDataSets, - Transform: transformers.TransformWithStruct(&types.DataSetSummary{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.DataSetSummary{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, Relations: []*schema.Table{ingestions()}, diff --git a/plugins/source/aws/resources/services/quicksight/data_sources.go b/plugins/source/aws/resources/services/quicksight/data_sources.go index f0ccca3ab19669..1d5fb0d61980c2 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sources.go +++ b/plugins/source/aws/resources/services/quicksight/data_sources.go @@ -20,7 +20,7 @@ func DataSources() *schema.Table { Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSource.html", Resolver: fetchQuicksightDataSources, Transform: transformers.TransformWithStruct(&types.DataSource{}, - transformers.WithPrimaryKeys("Arn"), + transformers.WithPrimaryKeyComponents("Arn"), transformers.WithSkipFields("AlternateDataSourceParameters"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), diff --git a/plugins/source/aws/resources/services/quicksight/folders.go b/plugins/source/aws/resources/services/quicksight/folders.go index 905a7b5258d023..d7bd99ed6513f5 100644 --- a/plugins/source/aws/resources/services/quicksight/folders.go +++ b/plugins/source/aws/resources/services/quicksight/folders.go @@ -20,7 +20,7 @@ func Folders() *schema.Table { Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Folder.html", Resolver: fetchQuicksightFolders, PreResourceResolver: getFolder, - Transform: transformers.TransformWithStruct(&types.Folder{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Folder{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, } diff --git a/plugins/source/aws/resources/services/quicksight/group_members.go b/plugins/source/aws/resources/services/quicksight/group_members.go index ad06068a0fb03f..c29e6e642d906b 100644 --- a/plugins/source/aws/resources/services/quicksight/group_members.go +++ b/plugins/source/aws/resources/services/quicksight/group_members.go @@ -18,15 +18,15 @@ func groupMembers() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GroupMember.html", Resolver: fetchQuicksightGroupMembers, - Transform: transformers.TransformWithStruct(&types.GroupMember{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.GroupMember{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/quicksight/groups.go b/plugins/source/aws/resources/services/quicksight/groups.go index 865b7e73576462..bccd1e8f9ae75e 100644 --- a/plugins/source/aws/resources/services/quicksight/groups.go +++ b/plugins/source/aws/resources/services/quicksight/groups.go @@ -19,7 +19,7 @@ func Groups() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Group.html", Resolver: fetchQuicksightGroups, - Transform: transformers.TransformWithStruct(&types.Group{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Group{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, Relations: []*schema.Table{groupMembers()}, diff --git a/plugins/source/aws/resources/services/quicksight/ingestions.go b/plugins/source/aws/resources/services/quicksight/ingestions.go index f444e163f790b9..b7c8dabf14bce8 100644 --- a/plugins/source/aws/resources/services/quicksight/ingestions.go +++ b/plugins/source/aws/resources/services/quicksight/ingestions.go @@ -18,16 +18,16 @@ func ingestions() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_Ingestion.html", Resolver: fetchQuicksightIngestions, - Transform: transformers.TransformWithStruct(&types.Ingestion{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Ingestion{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol, { - Name: "data_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "data_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/quicksight/templates.go b/plugins/source/aws/resources/services/quicksight/templates.go index fc73f9f297484c..22f9d2864f0510 100644 --- a/plugins/source/aws/resources/services/quicksight/templates.go +++ b/plugins/source/aws/resources/services/quicksight/templates.go @@ -19,7 +19,7 @@ func Templates() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_TemplateSummary.html", Resolver: fetchQuicksightTemplates, - Transform: transformers.TransformWithStruct(&types.TemplateSummary{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.TemplateSummary{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, } diff --git a/plugins/source/aws/resources/services/quicksight/users.go b/plugins/source/aws/resources/services/quicksight/users.go index 635711b7ccf3c2..31d67db3d3ce23 100644 --- a/plugins/source/aws/resources/services/quicksight/users.go +++ b/plugins/source/aws/resources/services/quicksight/users.go @@ -19,7 +19,7 @@ func Users() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/quicksight/latest/APIReference/API_User.html", Resolver: fetchQuicksightUsers, - Transform: transformers.TransformWithStruct(&types.User{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.User{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "quicksight"), Columns: []schema.Column{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), tagsCol}, } diff --git a/plugins/source/aws/resources/services/ram/principals.go b/plugins/source/aws/resources/services/ram/principals.go index 33d1a16d92d95a..bf098ec0378cbe 100644 --- a/plugins/source/aws/resources/services/ram/principals.go +++ b/plugins/source/aws/resources/services/ram/principals.go @@ -19,7 +19,7 @@ func Principals() *schema.Table { Resolver: fetchRamPrincipals, Transform: transformers.TransformWithStruct( &types.Principal{}, - transformers.WithPrimaryKeys("Id", "ResourceShareArn"), + transformers.WithPrimaryKeyComponents("Id", "ResourceShareArn"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ram"), Columns: []schema.Column{ 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 3617fd24a1ebeb..2777e5627dd819 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_associations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_associations.go @@ -17,7 +17,7 @@ func ResourceShareAssociations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ResourceShareAssociation.html`, Resolver: fetchRamResourceShareAssociations, - Transform: transformers.TransformWithStruct(&types.ResourceShareAssociation{}, transformers.WithPrimaryKeys("AssociatedEntity", "ResourceShareArn")), + Transform: transformers.TransformWithStruct(&types.ResourceShareAssociation{}, transformers.WithPrimaryKeyComponents("AssociatedEntity", "ResourceShareArn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ram"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), 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 72f4df73674798..8849d780989ea7 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_invitations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_invitations.go @@ -24,16 +24,16 @@ func ResourceShareInvitations() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceShareInvitationArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceShareInvitationArn"), + PrimaryKeyComponent: true, }, { - Name: "receiver_combined", - Type: arrow.BinaryTypes.String, - Resolver: resolveResourceShareInvitationReceiver, - PrimaryKey: true, + Name: "receiver_combined", + Type: arrow.BinaryTypes.String, + Resolver: resolveResourceShareInvitationReceiver, + PrimaryKeyComponent: true, }, }, } 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 7321441a9ccc6c..4c315484d1cf22 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_permissions.go +++ b/plugins/source/aws/resources/services/ram/resource_share_permissions.go @@ -18,16 +18,16 @@ 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{}, transformers.WithPrimaryKeys("Arn", "Version")), + Transform: transformers.TransformWithStruct(&types.ResourceSharePermissionSummary{}, transformers.WithPrimaryKeyComponents("Arn", "Version")), Resolver: fetchRamResourceSharePermissions, Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "resource_share_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "resource_share_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "permission", diff --git a/plugins/source/aws/resources/services/ram/resource_shares.go b/plugins/source/aws/resources/services/ram/resource_shares.go index 8829b2c7c35e86..0cdb1f00129bd5 100644 --- a/plugins/source/aws/resources/services/ram/resource_shares.go +++ b/plugins/source/aws/resources/services/ram/resource_shares.go @@ -25,10 +25,10 @@ func ResourceShares() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceShareArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceShareArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ram/resource_types.go b/plugins/source/aws/resources/services/ram/resource_types.go index febcf08875ffba..6d67983e18cb8b 100644 --- a/plugins/source/aws/resources/services/ram/resource_types.go +++ b/plugins/source/aws/resources/services/ram/resource_types.go @@ -19,20 +19,20 @@ func ResourceTypes() *schema.Table { Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_ServiceNameAndResourceType.html`, Resolver: fetchRamResourceTypes, Transform: transformers.TransformWithStruct(&types.ServiceNameAndResourceType{}, - transformers.WithPrimaryKeys("ResourceType", "ServiceName")), + transformers.WithPrimaryKeyComponents("ResourceType", "ServiceName")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ram"), Columns: []schema.Column{ { - Name: "account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ram/resources.go b/plugins/source/aws/resources/services/ram/resources.go index a48d27463f505a..0ddb1e35423f61 100644 --- a/plugins/source/aws/resources/services/ram/resources.go +++ b/plugins/source/aws/resources/services/ram/resources.go @@ -17,7 +17,7 @@ func Resources() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/ram/latest/APIReference/API_Resource.html`, Resolver: fetchRamResources, - Transform: transformers.TransformWithStruct(&types.Resource{}, transformers.WithPrimaryKeys("Arn", "ResourceShareArn")), + Transform: transformers.TransformWithStruct(&types.Resource{}, transformers.WithPrimaryKeyComponents("Arn", "ResourceShareArn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ram"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/rds/certificates.go b/plugins/source/aws/resources/services/rds/certificates.go index 97b9b3bbbd6dc0..ac8b90e5787fab 100644 --- a/plugins/source/aws/resources/services/rds/certificates.go +++ b/plugins/source/aws/resources/services/rds/certificates.go @@ -23,10 +23,10 @@ func Certificates() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CertificateArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CertificateArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/rds/cluster_backtracks.go b/plugins/source/aws/resources/services/rds/cluster_backtracks.go index 3e5ea95c030203..c49b813fedbc64 100644 --- a/plugins/source/aws/resources/services/rds/cluster_backtracks.go +++ b/plugins/source/aws/resources/services/rds/cluster_backtracks.go @@ -19,16 +19,16 @@ func clusterBacktracks() *schema.Table { Resolver: fetchRdsClusterBacktracks, Transform: transformers.TransformWithStruct( &types.DBClusterBacktrack{}, - transformers.WithPrimaryKeys("BacktrackIdentifier"), + transformers.WithPrimaryKeyComponents("BacktrackIdentifier"), ), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "db_cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "db_cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 24730c19045969..19261fad9a2f71 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 @@ -17,15 +17,15 @@ func clusterParameterGroupParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html`, Resolver: fetchRdsClusterParameterGroupParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_parameter_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "cluster_parameter_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 2c50dee0c1a52d..b440dfd2c059a8 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go @@ -24,10 +24,10 @@ func ClusterParameterGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterParameterGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterParameterGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/cluster_parameters.go b/plugins/source/aws/resources/services/rds/cluster_parameters.go index d24221679e2a41..d4443e0618f1a9 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameters.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameters.go @@ -19,15 +19,15 @@ func clusterParameters() *schema.Table { Name: tableName, Description: "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html", Resolver: fetchRdsClusterParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "_engine_version_hash", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("_engine_version_hash"), - PrimaryKey: true, + Name: "_engine_version_hash", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("_engine_version_hash"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/rds/cluster_snapshots.go b/plugins/source/aws/resources/services/rds/cluster_snapshots.go index cb31a642584346..2e6c1aa04d8400 100644 --- a/plugins/source/aws/resources/services/rds/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/rds/cluster_snapshots.go @@ -24,10 +24,10 @@ func ClusterSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterSnapshotArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterSnapshotArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/clusters.go b/plugins/source/aws/resources/services/rds/clusters.go index 5bfb15fb21bff5..42177402349c36 100644 --- a/plugins/source/aws/resources/services/rds/clusters.go +++ b/plugins/source/aws/resources/services/rds/clusters.go @@ -24,10 +24,10 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBClusterArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 5423f6f0ff81e6..99c43ab467bcef 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 @@ -14,15 +14,15 @@ func dbParameterGroupDbParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Parameter.html`, Resolver: fetchRdsDbParameterGroupDbParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "db_parameter_group_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "db_parameter_group_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 f3e6f83a32fdbc..83e33a93addca8 100644 --- a/plugins/source/aws/resources/services/rds/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/db_parameter_groups.go @@ -24,10 +24,10 @@ func DbParameterGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBParameterGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBParameterGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/db_proxies.go b/plugins/source/aws/resources/services/rds/db_proxies.go index 9f46d8cd600588..f12aa1c0250f40 100644 --- a/plugins/source/aws/resources/services/rds/db_proxies.go +++ b/plugins/source/aws/resources/services/rds/db_proxies.go @@ -24,10 +24,10 @@ func DbProxies() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBProxyArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBProxyArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 9947f83e77be17..4712dd9ddd09b7 100644 --- a/plugins/source/aws/resources/services/rds/db_security_groups.go +++ b/plugins/source/aws/resources/services/rds/db_security_groups.go @@ -27,10 +27,10 @@ func DbSecurityGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBSecurityGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBSecurityGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/db_snapshots.go b/plugins/source/aws/resources/services/rds/db_snapshots.go index 093bb0b4232422..9fe8aa6291a23f 100644 --- a/plugins/source/aws/resources/services/rds/db_snapshots.go +++ b/plugins/source/aws/resources/services/rds/db_snapshots.go @@ -25,10 +25,10 @@ func DbSnapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBSnapshotArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBSnapshotArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/engine_versions.go b/plugins/source/aws/resources/services/rds/engine_versions.go index e30061200e27d4..cd5e9bb8013b2c 100644 --- a/plugins/source/aws/resources/services/rds/engine_versions.go +++ b/plugins/source/aws/resources/services/rds/engine_versions.go @@ -24,10 +24,10 @@ func EngineVersions() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "_engine_version_hash", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveObjectHash, - PrimaryKey: true, + Name: "_engine_version_hash", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveObjectHash, + PrimaryKeyComponent: true, }, { Name: "tag_list", diff --git a/plugins/source/aws/resources/services/rds/event_subscriptions.go b/plugins/source/aws/resources/services/rds/event_subscriptions.go index f28bca67e80174..0df758eb5aab8c 100644 --- a/plugins/source/aws/resources/services/rds/event_subscriptions.go +++ b/plugins/source/aws/resources/services/rds/event_subscriptions.go @@ -24,10 +24,10 @@ func EventSubscriptions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EventSubscriptionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EventSubscriptionArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/instances.go b/plugins/source/aws/resources/services/rds/instances.go index 9db45e934192ef..da84a5345427e4 100644 --- a/plugins/source/aws/resources/services/rds/instances.go +++ b/plugins/source/aws/resources/services/rds/instances.go @@ -24,10 +24,10 @@ func Instances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBInstanceArn"), + PrimaryKeyComponent: true, }, { Name: "processor_features", diff --git a/plugins/source/aws/resources/services/rds/option_groups.go b/plugins/source/aws/resources/services/rds/option_groups.go index 22bbb5ab4e69df..b37b5c75788c90 100644 --- a/plugins/source/aws/resources/services/rds/option_groups.go +++ b/plugins/source/aws/resources/services/rds/option_groups.go @@ -23,10 +23,10 @@ func OptionGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("OptionGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("OptionGroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/rds/reserved_instances.go b/plugins/source/aws/resources/services/rds/reserved_instances.go index 02917baab1686f..4aee93afa79e1c 100644 --- a/plugins/source/aws/resources/services/rds/reserved_instances.go +++ b/plugins/source/aws/resources/services/rds/reserved_instances.go @@ -24,10 +24,10 @@ func ReservedInstances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReservedDBInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReservedDBInstanceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/rds/subnet_groups.go b/plugins/source/aws/resources/services/rds/subnet_groups.go index e32af0844c5483..17809636127ab1 100644 --- a/plugins/source/aws/resources/services/rds/subnet_groups.go +++ b/plugins/source/aws/resources/services/rds/subnet_groups.go @@ -23,10 +23,10 @@ func SubnetGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DBSubnetGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DBSubnetGroupArn"), + PrimaryKeyComponent: true, }, }, } 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 12575e2bf875f8..dc3fa992430d20 100644 --- a/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/redshift/cluster_parameter_groups.go @@ -16,16 +16,16 @@ func clusterParameterGroups() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_ClusterParameterGroupStatus.html`, Resolver: fetchClusterParameterGroups, - Transform: transformers.TransformWithStruct(&types.ClusterParameterGroupStatus{}, transformers.WithPrimaryKeys("ParameterGroupName")), + Transform: transformers.TransformWithStruct(&types.ClusterParameterGroupStatus{}, transformers.WithPrimaryKeyComponents("ParameterGroupName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/redshift/cluster_parameters.go b/plugins/source/aws/resources/services/redshift/cluster_parameters.go index 54c0db1b89e4ee..cf1a310069a5f5 100644 --- a/plugins/source/aws/resources/services/redshift/cluster_parameters.go +++ b/plugins/source/aws/resources/services/redshift/cluster_parameters.go @@ -17,16 +17,16 @@ func clusterParameters() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_Parameter.html`, Resolver: fetchClusterParameters, - Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeys("ParameterName")), + Transform: transformers.TransformWithStruct(&types.Parameter{}, transformers.WithPrimaryKeyComponents("ParameterName")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("cluster_arn"), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("cluster_arn"), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/redshift/clusters.go b/plugins/source/aws/resources/services/redshift/clusters.go index 458c33e7143d36..efaff0a7d84bdc 100644 --- a/plugins/source/aws/resources/services/redshift/clusters.go +++ b/plugins/source/aws/resources/services/redshift/clusters.go @@ -25,11 +25,11 @@ func Clusters() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveClusterArn(), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveClusterArn(), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, { Name: "logging_status", diff --git a/plugins/source/aws/resources/services/redshift/data_shares.go b/plugins/source/aws/resources/services/redshift/data_shares.go index e671bc8efa7e40..20fe8ccd7973c5 100644 --- a/plugins/source/aws/resources/services/redshift/data_shares.go +++ b/plugins/source/aws/resources/services/redshift/data_shares.go @@ -18,16 +18,16 @@ func DataShares() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_DataShare.html`, Resolver: fetchDataShares, - Transform: transformers.TransformWithStruct(&types.DataShare{}, transformers.WithPrimaryKeys("ProducerArn")), + Transform: transformers.TransformWithStruct(&types.DataShare{}, transformers.WithPrimaryKeyComponents("ProducerArn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "redshift"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("DataShareArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("DataShareArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/redshift/endpoint_access.go b/plugins/source/aws/resources/services/redshift/endpoint_access.go index 46277ae9316746..5c05639ea34538 100644 --- a/plugins/source/aws/resources/services/redshift/endpoint_access.go +++ b/plugins/source/aws/resources/services/redshift/endpoint_access.go @@ -18,16 +18,16 @@ func endpointAccess() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_EndpointAccess.html`, Resolver: fetchEndpointAccess, - Transform: transformers.TransformWithStruct(&types.EndpointAccess{}, transformers.WithPrimaryKeys("ClusterIdentifier", "EndpointName", "Address")), + Transform: transformers.TransformWithStruct(&types.EndpointAccess{}, transformers.WithPrimaryKeyComponents("ClusterIdentifier", "EndpointName", "Address")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/redshift/endpoint_authorization.go b/plugins/source/aws/resources/services/redshift/endpoint_authorization.go index e4fbb356535f62..3de06cd8bfb895 100644 --- a/plugins/source/aws/resources/services/redshift/endpoint_authorization.go +++ b/plugins/source/aws/resources/services/redshift/endpoint_authorization.go @@ -18,16 +18,16 @@ func endpointAuthorization() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/redshift/latest/APIReference/API_EndpointAuthorization.html`, Resolver: fetchEndpointAuthorization, - Transform: transformers.TransformWithStruct(&types.EndpointAuthorization{}, transformers.WithPrimaryKeys("ClusterIdentifier", "Grantor", "Grantee")), + Transform: transformers.TransformWithStruct(&types.EndpointAuthorization{}, transformers.WithPrimaryKeyComponents("ClusterIdentifier", "Grantor", "Grantee")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "cluster_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "cluster_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/redshift/event_subscriptions.go b/plugins/source/aws/resources/services/redshift/event_subscriptions.go index f27e2788911ce0..c533586288d076 100644 --- a/plugins/source/aws/resources/services/redshift/event_subscriptions.go +++ b/plugins/source/aws/resources/services/redshift/event_subscriptions.go @@ -27,11 +27,11 @@ func EventSubscriptions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveEventSubscriptionARN, - Description: `ARN of the event subscription.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveEventSubscriptionARN, + Description: `ARN of the event subscription.`, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/redshift/events.go b/plugins/source/aws/resources/services/redshift/events.go index 02174fe8aeaf69..be032004928b7e 100644 --- a/plugins/source/aws/resources/services/redshift/events.go +++ b/plugins/source/aws/resources/services/redshift/events.go @@ -19,7 +19,7 @@ func Events() *schema.Table { Only events occurred in the last 14 days are returned.`, Resolver: fetchEvents, - Transform: transformers.TransformWithStruct(&types.Event{}, transformers.WithPrimaryKeys("EventId")), + Transform: transformers.TransformWithStruct(&types.Event{}, transformers.WithPrimaryKeyComponents("EventId")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "redshift"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/redshift/snapshots.go b/plugins/source/aws/resources/services/redshift/snapshots.go index 84d020ab990724..2ae07328b3ccfd 100644 --- a/plugins/source/aws/resources/services/redshift/snapshots.go +++ b/plugins/source/aws/resources/services/redshift/snapshots.go @@ -26,11 +26,11 @@ func snapshots() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveSnapshotARN, - Description: `ARN of the snapshot.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveSnapshotARN, + Description: `ARN of the snapshot.`, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/redshift/subnet_groups.go b/plugins/source/aws/resources/services/redshift/subnet_groups.go index 423305ffa94f52..54672c7080a4b0 100644 --- a/plugins/source/aws/resources/services/redshift/subnet_groups.go +++ b/plugins/source/aws/resources/services/redshift/subnet_groups.go @@ -25,11 +25,11 @@ func SubnetGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveSubnetGroupArn(), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveSubnetGroupArn(), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go index a43dd39fe30303..ea05113dec8732 100644 --- a/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go @@ -16,7 +16,7 @@ func alarmRecommendations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AlarmRecommendation.html`, Resolver: fetchAlarmRecommendations, - Transform: transformers.TransformWithStruct(&types.AlarmRecommendation{}, transformers.WithPrimaryKeys("RecommendationId")), + Transform: transformers.TransformWithStruct(&types.AlarmRecommendation{}, transformers.WithPrimaryKeyComponents("RecommendationId")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN}, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go b/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go index e07fd42a2f8eca..5391fddfa4662d 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go @@ -16,7 +16,7 @@ func appComponentCompliances() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppComponentCompliance.html`, Resolver: fetchAppComponentCompliances, - Transform: transformers.TransformWithStruct(&types.AppComponentCompliance{}, transformers.WithPrimaryKeys("AppComponentName")), + Transform: transformers.TransformWithStruct(&types.AppComponentCompliance{}, transformers.WithPrimaryKeyComponents("AppComponentName")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN}, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go index bf2348ad0242bb..3f96c5246d1804 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go @@ -21,10 +21,10 @@ func appVersionResourceMappings() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, appVersion, { - Name: "physical_resource_identifier", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PhysicalResourceId.Identifier"), - PrimaryKey: true, + Name: "physical_resource_identifier", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PhysicalResourceId.Identifier"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go index 3f54f03ee567ec..45faf46a47e3b6 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go @@ -22,10 +22,10 @@ func appVersionResources() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, appVersion, { - Name: "physical_resource_identifier", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PhysicalResourceId.Identifier"), - PrimaryKey: true, + Name: "physical_resource_identifier", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PhysicalResourceId.Identifier"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/resiliencehub/app_versions.go b/plugins/source/aws/resources/services/resiliencehub/app_versions.go index 915f4d9bd45a37..f4bbea2c6dbc63 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_versions.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_versions.go @@ -16,7 +16,7 @@ func appVersions() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_AppVersionSummary.html`, Resolver: fetchAppVersions, - Transform: transformers.TransformWithStruct(&types.AppVersionSummary{}, transformers.WithPrimaryKeys("AppVersion")), + Transform: transformers.TransformWithStruct(&types.AppVersionSummary{}, transformers.WithPrimaryKeyComponents("AppVersion")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARNTop}, Relations: []*schema.Table{appVersionResources(), appVersionResourceMappings()}, } diff --git a/plugins/source/aws/resources/services/resiliencehub/columns.go b/plugins/source/aws/resources/services/resiliencehub/columns.go index ef2aa01a87d34f..a30f2ad619bdb3 100644 --- a/plugins/source/aws/resources/services/resiliencehub/columns.go +++ b/plugins/source/aws/resources/services/resiliencehub/columns.go @@ -7,36 +7,36 @@ import ( var ( appARN = schema.Column{ - Name: "app_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("app_arn"), - PrimaryKey: true, + Name: "app_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("app_arn"), + PrimaryKeyComponent: true, } appARNTop = schema.Column{ - Name: "app_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "app_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, } assessmentARN = schema.Column{ - Name: "assessment_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "assessment_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, } appVersion = schema.Column{ - Name: "app_version", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("app_version"), - PrimaryKey: true, + Name: "app_version", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("app_version"), + PrimaryKeyComponent: true, } ) func arnColumn(path string) schema.Column { return schema.Column{ - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver(path), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver(path), + PrimaryKeyComponent: true, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go index d87e69d3233e1a..1fc723eedd3b31 100644 --- a/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go @@ -16,7 +16,7 @@ func appComponentRecommendations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_ComponentRecommendation.html`, Resolver: fetchComponentRecommendations, - Transform: transformers.TransformWithStruct(&types.ComponentRecommendation{}, transformers.WithPrimaryKeys("AppComponentName")), + Transform: transformers.TransformWithStruct(&types.ComponentRecommendation{}, transformers.WithPrimaryKeyComponents("AppComponentName")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN}, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go b/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go index d1bac95732d8a9..72c5013b577e38 100644 --- a/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go +++ b/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go @@ -16,7 +16,7 @@ func recommendationTemplates() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_RecommendationTemplate.html`, Resolver: fetchRecommendationTemplates, - Transform: transformers.TransformWithStruct(&types.RecommendationTemplate{}, transformers.WithPrimaryKeys("AppArn", "AssessmentArn")), + Transform: transformers.TransformWithStruct(&types.RecommendationTemplate{}, transformers.WithPrimaryKeyComponents("AppArn", "AssessmentArn")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), arnColumn("RecommendationTemplateArn")}, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go index 907e88c59ca070..d1fa8c8a14f658 100644 --- a/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go @@ -16,7 +16,7 @@ func sopRecommendations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_SopRecommendation.html`, Resolver: fetchSopRecommendations, - Transform: transformers.TransformWithStruct(&types.SopRecommendation{}, transformers.WithPrimaryKeys("RecommendationId")), + Transform: transformers.TransformWithStruct(&types.SopRecommendation{}, transformers.WithPrimaryKeyComponents("RecommendationId")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN}, } } diff --git a/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go index 4a9bdb763ac429..a8c14a19c65f3a 100644 --- a/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go @@ -16,7 +16,7 @@ func testRecommendations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/resilience-hub/latest/APIReference/API_TestRecommendation.html`, Resolver: fetchTestRecommendations, - Transform: transformers.TransformWithStruct(&types.TestRecommendation{}, transformers.WithPrimaryKeys("RecommendationId")), + Transform: transformers.TransformWithStruct(&types.TestRecommendation{}, transformers.WithPrimaryKeyComponents("RecommendationId")), Columns: []schema.Column{client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), appARN, assessmentARN}, } } diff --git a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go index 4bd39767e71b1f..7556584073e8c9 100644 --- a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go +++ b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go @@ -26,10 +26,10 @@ func ResourceGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/route53/delegation_sets.go b/plugins/source/aws/resources/services/route53/delegation_sets.go index 55d2486bd4a843..668baa20bc13b5 100644 --- a/plugins/source/aws/resources/services/route53/delegation_sets.go +++ b/plugins/source/aws/resources/services/route53/delegation_sets.go @@ -23,11 +23,11 @@ func DelegationSets() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDelegationSetArn(), - Description: `The Amazon Resource Name (ARN) for the resource.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDelegationSetArn(), + Description: `The Amazon Resource Name (ARN) for the resource.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53/domains.go b/plugins/source/aws/resources/services/route53/domains.go index 0175d609bc0eda..c856114882cf2b 100644 --- a/plugins/source/aws/resources/services/route53/domains.go +++ b/plugins/source/aws/resources/services/route53/domains.go @@ -25,9 +25,9 @@ func Domains() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "domain_name", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "domain_name", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/route53/health_checks.go b/plugins/source/aws/resources/services/route53/health_checks.go index 6207694f4476b9..5d8a58db58b1f7 100644 --- a/plugins/source/aws/resources/services/route53/health_checks.go +++ b/plugins/source/aws/resources/services/route53/health_checks.go @@ -23,10 +23,10 @@ func HealthChecks() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveHealthCheckArn(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveHealthCheckArn(), + PrimaryKeyComponent: true, }, { Name: "tags", 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 f146f4fa7d4411..e9a1482a8f9a19 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 @@ -25,10 +25,10 @@ func hostedZoneQueryLoggingConfigs() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveRoute53HostedZoneQueryLoggingConfigsArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveRoute53HostedZoneQueryLoggingConfigsArn, + PrimaryKeyComponent: true, }, { Name: "hosted_zone_arn", 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 0a1dc7c24f55f1..794fabfcaa2353 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 @@ -18,14 +18,14 @@ func hostedZoneResourceRecordSets() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html`, Resolver: fetchRoute53HostedZoneResourceRecordSets, - Transform: transformers.TransformWithStruct(&types.ResourceRecordSet{}, transformers.WithPrimaryKeys("Name", "Type")), + Transform: transformers.TransformWithStruct(&types.ResourceRecordSet{}, transformers.WithPrimaryKeyComponents("Name", "Type")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "hosted_zone_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "hosted_zone_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 203cf3f0c13a0f..f4379fb798d51b 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 @@ -25,11 +25,11 @@ func hostedZoneTrafficPolicyInstances() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveRoute53HostedZoneTrafficPolicyInstancesArn, - Description: `Amazon Resource Name (ARN) of the route53 hosted zone traffic policy instance.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveRoute53HostedZoneTrafficPolicyInstancesArn, + Description: `Amazon Resource Name (ARN) of the route53 hosted zone traffic policy instance.`, + PrimaryKeyComponent: true, }, { Name: "hosted_zone_arn", diff --git a/plugins/source/aws/resources/services/route53/hosted_zones.go b/plugins/source/aws/resources/services/route53/hosted_zones.go index b79e01a04d28ce..046fa4398ff4c9 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zones.go +++ b/plugins/source/aws/resources/services/route53/hosted_zones.go @@ -31,10 +31,10 @@ func HostedZones() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveRoute53HostedZoneArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveRoute53HostedZoneArn, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/route53/operations.go b/plugins/source/aws/resources/services/route53/operations.go index 3a8987c9dd4bdb..701e28eaf3e4df 100644 --- a/plugins/source/aws/resources/services/route53/operations.go +++ b/plugins/source/aws/resources/services/route53/operations.go @@ -17,7 +17,7 @@ func Operations() *schema.Table { Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_GetOperationDetail.html`, Resolver: fetchRoute53Operations, PreResourceResolver: getOperation, - Transform: transformers.TransformWithStruct(&route53domains.GetOperationDetailOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("OperationId", "Status", "SubmittedDate", "Type")), + Transform: transformers.TransformWithStruct(&route53domains.GetOperationDetailOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("OperationId", "Status", "SubmittedDate", "Type")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53domains"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/route53/traffic_policies.go b/plugins/source/aws/resources/services/route53/traffic_policies.go index 132c740b4b63e9..8c18ae5fa31ab7 100644 --- a/plugins/source/aws/resources/services/route53/traffic_policies.go +++ b/plugins/source/aws/resources/services/route53/traffic_policies.go @@ -23,10 +23,10 @@ func TrafficPolicies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveTrafficPolicyArn(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveTrafficPolicyArn(), + PrimaryKeyComponent: true, }, }, 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 7f79af0d47725a..f070843b264174 100644 --- a/plugins/source/aws/resources/services/route53/traffic_policy_versions.go +++ b/plugins/source/aws/resources/services/route53/traffic_policy_versions.go @@ -19,22 +19,22 @@ func trafficPolicyVersions() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "traffic_policy_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "traffic_policy_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, { - Name: "version", - Type: arrow.PrimitiveTypes.Int64, - Resolver: schema.PathResolver("Version"), - PrimaryKey: true, + Name: "version", + Type: arrow.PrimitiveTypes.Int64, + Resolver: schema.PathResolver("Version"), + PrimaryKeyComponent: true, }, { Name: "document", diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go index 1ca3fc8fda9eb4..770758db5a3dfe 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go @@ -22,10 +22,10 @@ func Clusters() *schema.Table { Columns: []schema.Column{ client.RequestAccountIDColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go index 45fcc7894227a9..69e732969daddd 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go @@ -22,10 +22,10 @@ func ControlPanels() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ClusterArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ClusterArn"), + PrimaryKeyComponent: true, }, }, Relations: schema.Tables{ diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go index bc31e8e30e3c51..636815e1d200a3 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go @@ -17,14 +17,14 @@ func routingControls() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/routing-control/latest/APIReference/API_ListRoutingControls.html`, Resolver: fetchRoutingControls, - Transform: transformers.TransformWithStruct(&types.RoutingControl{}, transformers.WithPrimaryKeys("ControlPanelArn")), + Transform: transformers.TransformWithStruct(&types.RoutingControl{}, transformers.WithPrimaryKeyComponents("ControlPanelArn")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RoutingControlArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RoutingControlArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go index da437a488ea224..c2c20fb26e63c4 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go @@ -21,10 +21,10 @@ func safetyRules() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveRuleARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveRuleARN, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go b/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go index 2d6bf354017d72..5db05db3a9ac29 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go @@ -22,10 +22,10 @@ func Cells() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("CellArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("CellArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go b/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go index d74eb83ded7db4..8e60b04aa42950 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go @@ -22,10 +22,10 @@ func ReadinessChecks() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ReadinessCheckArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ReadinessCheckArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go b/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go index ac4c7b788baa8b..4c18ee6f0bdc88 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go @@ -22,10 +22,10 @@ func RecoveryGroups() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RecoveryGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RecoveryGroupArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go b/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go index 37c0623c5352d8..a2d56e52f15448 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go @@ -22,10 +22,10 @@ func ResourceSets() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ResourceSetArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ResourceSetArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_configs.go b/plugins/source/aws/resources/services/route53resolver/firewall_configs.go index 6550d3972ca925..107084e1bd8db0 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_configs.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_configs.go @@ -16,7 +16,7 @@ func FirewallConfigs() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallConfig.html`, Resolver: fetchFirewallConfigs, - Transform: transformers.TransformWithStruct(&types.FirewallConfig{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.FirewallConfig{}, transformers.WithPrimaryKeyComponents("Id")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go b/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go index ab2ae94db0e963..193b3f05488348 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go @@ -17,7 +17,7 @@ func FirewallDomainLists() *schema.Table { Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallDomainList.html`, Resolver: fetchFirewallDomainList, PreResourceResolver: getFirewallDomainList, - Transform: transformers.TransformWithStruct(&types.FirewallDomainList{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.FirewallDomainList{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go b/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go index 4d908126aae4a1..44389b00e3e125 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go @@ -16,7 +16,7 @@ func FirewallRuleGroupAssociations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallRuleGroupAssociation.html`, Resolver: fetchFirewallRuleGroupAssociations, - Transform: transformers.TransformWithStruct(&types.FirewallRuleGroupAssociation{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.FirewallRuleGroupAssociation{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go b/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go index dcf0485af38774..aa36c899cf4fbc 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go @@ -17,7 +17,7 @@ func FirewallRuleGroups() *schema.Table { Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_FirewallRuleGroup.html`, Resolver: fetchFirewallRuleGroups, PreResourceResolver: getFirewallRuleGroups, - Transform: transformers.TransformWithStruct(&types.FirewallRuleGroup{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.FirewallRuleGroup{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go b/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go index 6799ac58b55631..4e5d2e1fe06685 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go @@ -16,7 +16,7 @@ func ResolverEndpoints() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverEndpoint.html`, Resolver: fetchResolverEndpoints, - Transform: transformers.TransformWithStruct(&types.ResolverEndpoint{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.ResolverEndpoint{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go index a67195e03a8d34..57b3861ccbc732 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go @@ -16,7 +16,7 @@ func ResolverQueryLogConfigAssociations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverQueryLogConfigAssociation.html`, Resolver: fetchQueryLogConfigAssociations, - Transform: transformers.TransformWithStruct(&types.ResolverQueryLogConfigAssociation{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.ResolverQueryLogConfigAssociation{}, transformers.WithPrimaryKeyComponents("Id")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go index 5d81c123e32d35..50e6f4b32d75d9 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go @@ -16,7 +16,7 @@ func ResolverQueryLogConfigs() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverQueryLogConfig.html`, Resolver: fetchQueryLogConfigs, - Transform: transformers.TransformWithStruct(&types.ResolverQueryLogConfig{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.ResolverQueryLogConfig{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go b/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go index e8c86733775750..ff422a3aac1d78 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go @@ -16,7 +16,7 @@ func ResolverRuleAssociations() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverRuleAssociation.html`, Resolver: fetchResolverRuleAssociations, - Transform: transformers.TransformWithStruct(&types.ResolverRuleAssociation{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.ResolverRuleAssociation{}, transformers.WithPrimaryKeyComponents("Id")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_rules.go b/plugins/source/aws/resources/services/route53resolver/resolver_rules.go index 897b38dc9d0a1d..05ed2e3f2256ad 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_rules.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_rules.go @@ -16,7 +16,7 @@ func ResolverRules() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_ResolverRule.html`, Resolver: fetchResolverRules, - Transform: transformers.TransformWithStruct(&types.ResolverRule{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.ResolverRule{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "route53resolver"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/s3/access_points.go b/plugins/source/aws/resources/services/s3/access_points.go index 3b387fc627dcb6..974338be219e7f 100644 --- a/plugins/source/aws/resources/services/s3/access_points.go +++ b/plugins/source/aws/resources/services/s3/access_points.go @@ -24,10 +24,10 @@ func AccessPoints() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AccessPointArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AccessPointArn"), + PrimaryKeyComponent: true, }, }, } 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 a295a14fc80a74..d5f600077cbdb0 100644 --- a/plugins/source/aws/resources/services/s3/bucket_cors_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_cors_rules.go @@ -18,14 +18,14 @@ 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{}, transformers.WithPrimaryKeys("ID")), + Transform: transformers.TransformWithStruct(&types.CORSRule{}, transformers.WithPrimaryKeyComponents("ID")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } 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 3a37af8da81c86..ce706384a464a3 100644 --- a/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go @@ -22,10 +22,10 @@ func bucketEncryptionRules() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_grants.go b/plugins/source/aws/resources/services/s3/bucket_grants.go index ed6578e0088186..dafb3c55478453 100644 --- a/plugins/source/aws/resources/services/s3/bucket_grants.go +++ b/plugins/source/aws/resources/services/s3/bucket_grants.go @@ -23,28 +23,28 @@ func bucketGrants() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "grantee_type", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Grantee.Type"), - PrimaryKey: true, + Name: "grantee_type", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Grantee.Type"), + PrimaryKeyComponent: true, }, { - Name: "grantee_id", - Type: arrow.BinaryTypes.String, - Resolver: resolveBucketGranteeID, - PrimaryKey: true, + Name: "grantee_id", + Type: arrow.BinaryTypes.String, + Resolver: resolveBucketGranteeID, + PrimaryKeyComponent: true, }, { - Name: "permission", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Permission"), - PrimaryKey: true, + Name: "permission", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Permission"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go index bcda59903f1236..c8b4101e456173 100644 --- a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go +++ b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go @@ -18,14 +18,14 @@ 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{}, transformers.WithPrimaryKeys("ID")), + Transform: transformers.TransformWithStruct(&types.LifecycleRule{}, transformers.WithPrimaryKeyComponents("ID")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_logging.go b/plugins/source/aws/resources/services/s3/bucket_logging.go index 4066e800b3b8a2..20ec1a99b058a3 100644 --- a/plugins/source/aws/resources/services/s3/bucket_logging.go +++ b/plugins/source/aws/resources/services/s3/bucket_logging.go @@ -20,10 +20,10 @@ func bucketLogging() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_notification_configurations.go b/plugins/source/aws/resources/services/s3/bucket_notification_configurations.go index 57ccea68bd5991..26d7a1bb2d4eca 100644 --- a/plugins/source/aws/resources/services/s3/bucket_notification_configurations.go +++ b/plugins/source/aws/resources/services/s3/bucket_notification_configurations.go @@ -22,10 +22,10 @@ func bucketNotificationConfigurations() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_object_lock_configurations.go b/plugins/source/aws/resources/services/s3/bucket_object_lock_configurations.go index 63c1c2ddd0c497..46a442f6c83cda 100644 --- a/plugins/source/aws/resources/services/s3/bucket_object_lock_configurations.go +++ b/plugins/source/aws/resources/services/s3/bucket_object_lock_configurations.go @@ -22,10 +22,10 @@ func bucketObjectLockConfigurations() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_ownership_controls.go b/plugins/source/aws/resources/services/s3/bucket_ownership_controls.go index d782992a0d2386..8dbe5f527dfe20 100644 --- a/plugins/source/aws/resources/services/s3/bucket_ownership_controls.go +++ b/plugins/source/aws/resources/services/s3/bucket_ownership_controls.go @@ -17,14 +17,14 @@ func bucketOwnershipControls() *schema.Table { Name: "aws_s3_bucket_ownership_controls", Description: `https://docs.aws.amazon.com/AmazonS3/latest/API/API_OwnershipControlsRule.html`, Resolver: fetchBucketOwnershipControls, - Transform: transformers.TransformWithStruct(&types.OwnershipControlsRule{}, transformers.WithPrimaryKeys("ObjectOwnership"), transformers.WithSkipFields("ResultMetadata")), + Transform: transformers.TransformWithStruct(&types.OwnershipControlsRule{}, transformers.WithPrimaryKeyComponents("ObjectOwnership"), transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_policies.go b/plugins/source/aws/resources/services/s3/bucket_policies.go index da616718430f32..370db1952a39bc 100644 --- a/plugins/source/aws/resources/services/s3/bucket_policies.go +++ b/plugins/source/aws/resources/services/s3/bucket_policies.go @@ -21,10 +21,10 @@ func bucketPolicies() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "policy_json", diff --git a/plugins/source/aws/resources/services/s3/bucket_public_access_block.go b/plugins/source/aws/resources/services/s3/bucket_public_access_block.go index 5cf2f1614c962c..ea0fa19c8f2fad 100644 --- a/plugins/source/aws/resources/services/s3/bucket_public_access_block.go +++ b/plugins/source/aws/resources/services/s3/bucket_public_access_block.go @@ -20,10 +20,10 @@ func bucketPublicAccessBlock() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_replications.go b/plugins/source/aws/resources/services/s3/bucket_replications.go index a14687f43def76..ca13ffa43e1ab2 100644 --- a/plugins/source/aws/resources/services/s3/bucket_replications.go +++ b/plugins/source/aws/resources/services/s3/bucket_replications.go @@ -20,10 +20,10 @@ func bucketReplications() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_versioning.go b/plugins/source/aws/resources/services/s3/bucket_versioning.go index 5520566981d9da..8a3f66fcaf3d83 100644 --- a/plugins/source/aws/resources/services/s3/bucket_versioning.go +++ b/plugins/source/aws/resources/services/s3/bucket_versioning.go @@ -20,10 +20,10 @@ func bucketVersionings() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/bucket_websites.go b/plugins/source/aws/resources/services/s3/bucket_websites.go index e96325da496817..35c8e3f630a503 100644 --- a/plugins/source/aws/resources/services/s3/bucket_websites.go +++ b/plugins/source/aws/resources/services/s3/bucket_websites.go @@ -21,10 +21,10 @@ func bucketWebsites() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "bucket_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "bucket_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/s3/buckets.go b/plugins/source/aws/resources/services/s3/buckets.go index bdc526e6e76a57..481df900b20d34 100644 --- a/plugins/source/aws/resources/services/s3/buckets.go +++ b/plugins/source/aws/resources/services/s3/buckets.go @@ -24,10 +24,10 @@ func Buckets() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveBucketARN(), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveBucketARN(), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/s3/multi_region_access_points.go b/plugins/source/aws/resources/services/s3/multi_region_access_points.go index ad6394eef20b21..0f2c44e0040950 100644 --- a/plugins/source/aws/resources/services/s3/multi_region_access_points.go +++ b/plugins/source/aws/resources/services/s3/multi_region_access_points.go @@ -25,11 +25,11 @@ func MultiRegionAccessPoints() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Description: `The Amazon Resource Name (ARN) of the multi-Region access point.`, - Resolver: resolveARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Description: `The Amazon Resource Name (ARN) of the multi-Region access point.`, + Resolver: resolveARN, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/sagemaker/apps.go b/plugins/source/aws/resources/services/sagemaker/apps.go index a0cf79160f1225..9e0e25d2f77c4d 100644 --- a/plugins/source/aws/resources/services/sagemaker/apps.go +++ b/plugins/source/aws/resources/services/sagemaker/apps.go @@ -25,10 +25,10 @@ func Apps() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AppArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AppArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go index 3d9424ed290aca..0e1cb21bea7621 100644 --- a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go +++ b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go @@ -25,10 +25,10 @@ func EndpointConfigurations() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("EndpointConfigArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("EndpointConfigArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/sagemaker/models.go b/plugins/source/aws/resources/services/sagemaker/models.go index aa5ebea70b3abd..a00baa74dd3189 100644 --- a/plugins/source/aws/resources/services/sagemaker/models.go +++ b/plugins/source/aws/resources/services/sagemaker/models.go @@ -25,10 +25,10 @@ func Models() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ModelArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ModelArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go index da2c5608c17b98..9f4dcee200c089 100644 --- a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go +++ b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go @@ -25,10 +25,10 @@ func NotebookInstances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("NotebookInstanceArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("NotebookInstanceArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/sagemaker/training_jobs.go b/plugins/source/aws/resources/services/sagemaker/training_jobs.go index ccbcc77c9b2f28..92d1af4902e9ce 100644 --- a/plugins/source/aws/resources/services/sagemaker/training_jobs.go +++ b/plugins/source/aws/resources/services/sagemaker/training_jobs.go @@ -25,10 +25,10 @@ func TrainingJobs() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TrainingJobArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TrainingJobArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/savingsplans/savingsplans.go b/plugins/source/aws/resources/services/savingsplans/savingsplans.go index 754fe4d3388a36..22cd8202d22bef 100644 --- a/plugins/source/aws/resources/services/savingsplans/savingsplans.go +++ b/plugins/source/aws/resources/services/savingsplans/savingsplans.go @@ -23,11 +23,11 @@ func Plans() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SavingsPlanArn"), - Description: `The Amazon Resource Name (ARN) of the Savings Plan.`, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SavingsPlanArn"), + Description: `The Amazon Resource Name (ARN) of the Savings Plan.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/scheduler/schedule_groups.go b/plugins/source/aws/resources/services/scheduler/schedule_groups.go index 5b21b620c9c92e..ea629363b3620c 100644 --- a/plugins/source/aws/resources/services/scheduler/schedule_groups.go +++ b/plugins/source/aws/resources/services/scheduler/schedule_groups.go @@ -31,10 +31,10 @@ func ScheduleGroups() *schema.Table { Resolver: resolveSchedulerScheduleTags(), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/scheduler/schedules.go b/plugins/source/aws/resources/services/scheduler/schedules.go index 5c0f8c335b98ad..6714c8cb0365d3 100644 --- a/plugins/source/aws/resources/services/scheduler/schedules.go +++ b/plugins/source/aws/resources/services/scheduler/schedules.go @@ -33,10 +33,10 @@ func Schedules() *schema.Table { Resolver: resolveSchedulerScheduleTags(), }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/secretsmanager/secrets.go b/plugins/source/aws/resources/services/secretsmanager/secrets.go index c61d8ec77e1f40..4f74795c84cbe9 100644 --- a/plugins/source/aws/resources/services/secretsmanager/secrets.go +++ b/plugins/source/aws/resources/services/secretsmanager/secrets.go @@ -26,10 +26,10 @@ func Secrets() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, { Name: "policy", diff --git a/plugins/source/aws/resources/services/secretsmanager/secrets_version.go b/plugins/source/aws/resources/services/secretsmanager/secrets_version.go index 90c792808fce10..3ca552f43e015a 100644 --- a/plugins/source/aws/resources/services/secretsmanager/secrets_version.go +++ b/plugins/source/aws/resources/services/secretsmanager/secrets_version.go @@ -18,15 +18,15 @@ func secretVersions() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecretVersionIds.html`, Resolver: fetchSecretsmanagerSecretsVersions, - Transform: transformers.TransformWithStruct(&types.SecretVersionsListEntry{}, transformers.WithPrimaryKeys("VersionId")), + Transform: transformers.TransformWithStruct(&types.SecretVersionsListEntry{}, transformers.WithPrimaryKeyComponents("VersionId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "secret_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "secret_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/securityhub/enabled_standards.go b/plugins/source/aws/resources/services/securityhub/enabled_standards.go index e8d02aa8176e31..0b1432d7a92087 100644 --- a/plugins/source/aws/resources/services/securityhub/enabled_standards.go +++ b/plugins/source/aws/resources/services/securityhub/enabled_standards.go @@ -20,7 +20,7 @@ func EnabledStandards() *schema.Table { Transform: transformers.TransformWithStruct(&types.StandardsSubscription{}, transformers.WithTypeTransformer(client.TimestampTypeTransformer), transformers.WithResolverTransformer(client.TimestampResolverTransformer), - transformers.WithPrimaryKeys("StandardsArn", "StandardsSubscriptionArn"), + transformers.WithPrimaryKeyComponents("StandardsArn", "StandardsSubscriptionArn"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "securityhub"), Columns: schema.ColumnList{client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true)}, diff --git a/plugins/source/aws/resources/services/securityhub/findings.go b/plugins/source/aws/resources/services/securityhub/findings.go index ec7a3e5356e0bf..8805150bfb67d8 100644 --- a/plugins/source/aws/resources/services/securityhub/findings.go +++ b/plugins/source/aws/resources/services/securityhub/findings.go @@ -23,21 +23,21 @@ This is useful when multi region and account aggregation is enabled.`, Transform: transformers.TransformWithStruct(&types.AwsSecurityFinding{}, transformers.WithTypeTransformer(client.TimestampTypeTransformer), transformers.WithResolverTransformer(client.TimestampResolverTransformer), - transformers.WithPrimaryKeys("AwsAccountId", "Region", "CreatedAt", "UpdatedAt", "Description", "GeneratorId", "Id", "ProductArn", "SchemaVersion", "Title"), + transformers.WithPrimaryKeyComponents("AwsAccountId", "Region", "CreatedAt", "UpdatedAt", "Description", "GeneratorId", "Id", "ProductArn", "SchemaVersion", "Title"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "securityhub"), Columns: []schema.Column{ { - Name: "request_account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - PrimaryKey: true, + Name: "request_account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + PrimaryKeyComponent: true, }, { - Name: "request_region", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSRegion, - PrimaryKey: true, + Name: "request_region", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSRegion, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/securityhub/hubs.go b/plugins/source/aws/resources/services/securityhub/hubs.go index 353dc84b61e401..734ca3ce97d324 100644 --- a/plugins/source/aws/resources/services/securityhub/hubs.go +++ b/plugins/source/aws/resources/services/securityhub/hubs.go @@ -19,7 +19,7 @@ func Hubs() *schema.Table { Transform: transformers.TransformWithStruct(&securityhub.DescribeHubOutput{}, transformers.WithTypeTransformer(client.TimestampTypeTransformer), transformers.WithResolverTransformer(client.TimestampResolverTransformer), - transformers.WithPrimaryKeys("HubArn"), + transformers.WithPrimaryKeyComponents("HubArn"), transformers.WithSkipFields("ResultMetadata"), ), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "securityhub"), diff --git a/plugins/source/aws/resources/services/servicecatalog/launch_paths.go b/plugins/source/aws/resources/services/servicecatalog/launch_paths.go index ec169620b4c73a..0256eb6f1da934 100644 --- a/plugins/source/aws/resources/services/servicecatalog/launch_paths.go +++ b/plugins/source/aws/resources/services/servicecatalog/launch_paths.go @@ -23,22 +23,22 @@ func launchPaths() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "provisioned_product_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "provisioned_product_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "product_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("product_id"), - PrimaryKey: true, + Name: "product_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("product_id"), + PrimaryKeyComponent: true, }, { - Name: "provisioning_artifact_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("provisioning_artifact_id"), - PrimaryKey: true, + Name: "provisioning_artifact_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("provisioning_artifact_id"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/servicecatalog/portfolios.go b/plugins/source/aws/resources/services/servicecatalog/portfolios.go index e7d875fd057b69..8d95259d7e4354 100644 --- a/plugins/source/aws/resources/services/servicecatalog/portfolios.go +++ b/plugins/source/aws/resources/services/servicecatalog/portfolios.go @@ -25,10 +25,10 @@ func Portfolios() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PortfolioDetail.ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PortfolioDetail.ARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/servicecatalog/products.go b/plugins/source/aws/resources/services/servicecatalog/products.go index d8a6b08eccc11b..934d6957475786 100644 --- a/plugins/source/aws/resources/services/servicecatalog/products.go +++ b/plugins/source/aws/resources/services/servicecatalog/products.go @@ -25,10 +25,10 @@ func Products() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ProductViewDetail.ProductARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ProductViewDetail.ProductARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go index 24767df5f486d1..c29aa84b80aebc 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go @@ -24,10 +24,10 @@ func ProvisionedProducts() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go b/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go index 00b288a841a528..782d8579a4ac2b 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go @@ -22,22 +22,22 @@ func provisioningArtifact() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "provisioned_product_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "provisioned_product_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "product_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("product_id"), - PrimaryKey: true, + Name: "product_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("product_id"), + PrimaryKeyComponent: true, }, { - Name: "provisioning_artifact_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("provisioning_artifact_id"), - PrimaryKey: true, + Name: "provisioning_artifact_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("provisioning_artifact_id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go b/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go index c5a571f188362e..038bad533dbef9 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go @@ -22,28 +22,28 @@ func provisioningParameters() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "provisioned_product_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("provisioned_product_arn"), - PrimaryKey: true, + Name: "provisioned_product_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("provisioned_product_arn"), + PrimaryKeyComponent: true, }, { - Name: "product_id", - Type: arrow.BinaryTypes.String, - Resolver: grandParentColumnResolver("product_id"), - PrimaryKey: true, + Name: "product_id", + Type: arrow.BinaryTypes.String, + Resolver: grandParentColumnResolver("product_id"), + PrimaryKeyComponent: true, }, { - Name: "provisioning_artifact_id", - Type: arrow.BinaryTypes.String, - Resolver: grandParentColumnResolver("provisioning_artifact_id"), - PrimaryKey: true, + Name: "provisioning_artifact_id", + Type: arrow.BinaryTypes.String, + Resolver: grandParentColumnResolver("provisioning_artifact_id"), + PrimaryKeyComponent: true, }, { - Name: "path_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("id"), - PrimaryKey: true, + Name: "path_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/servicediscovery/instances.go b/plugins/source/aws/resources/services/servicediscovery/instances.go index 495c33d5895428..cccab1d5a665f5 100644 --- a/plugins/source/aws/resources/services/servicediscovery/instances.go +++ b/plugins/source/aws/resources/services/servicediscovery/instances.go @@ -17,7 +17,7 @@ func instances() *schema.Table { Description: `https://docs.aws.amazon.com/cloud-map/latest/api/API_Instance.html`, Resolver: fetchInstances, PreResourceResolver: getInstance, - Transform: transformers.TransformWithStruct(&types.Instance{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.Instance{}, transformers.WithPrimaryKeyComponents("Id")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/servicediscovery/namespaces.go b/plugins/source/aws/resources/services/servicediscovery/namespaces.go index 274e760da9b0c9..6de7d45cbb194d 100644 --- a/plugins/source/aws/resources/services/servicediscovery/namespaces.go +++ b/plugins/source/aws/resources/services/servicediscovery/namespaces.go @@ -19,7 +19,7 @@ func Namespaces() *schema.Table { Description: `https://docs.aws.amazon.com/cloud-map/latest/api/API_Namespace.html`, Resolver: fetchNamespaces, PreResourceResolver: getNamespace, - Transform: transformers.TransformWithStruct(&types.Namespace{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Namespace{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "servicediscovery"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/servicediscovery/services.go b/plugins/source/aws/resources/services/servicediscovery/services.go index 269bf92948e7de..d128269129327f 100644 --- a/plugins/source/aws/resources/services/servicediscovery/services.go +++ b/plugins/source/aws/resources/services/servicediscovery/services.go @@ -19,7 +19,7 @@ func Services() *schema.Table { Description: `https://docs.aws.amazon.com/cloud-map/latest/api/API_Service.html`, Resolver: fetchServices, PreResourceResolver: getService, - Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeyComponents("Arn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "servicediscovery"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/servicequotas/quotas.go b/plugins/source/aws/resources/services/servicequotas/quotas.go index a573a5cfa82a34..d10332332dd8a9 100644 --- a/plugins/source/aws/resources/services/servicequotas/quotas.go +++ b/plugins/source/aws/resources/services/servicequotas/quotas.go @@ -22,10 +22,10 @@ func quotas() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("QuotaArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("QuotaArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/servicequotas/services.go b/plugins/source/aws/resources/services/servicequotas/services.go index 134d40418d8328..0d12d66f614284 100644 --- a/plugins/source/aws/resources/services/servicequotas/services.go +++ b/plugins/source/aws/resources/services/servicequotas/services.go @@ -24,16 +24,16 @@ func Services() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "service_code", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ServiceCode"), - PrimaryKey: true, + Name: "service_code", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ServiceCode"), + PrimaryKeyComponent: true, }, { - Name: "service_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ServiceName"), - PrimaryKey: true, + Name: "service_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ServiceName"), + PrimaryKeyComponent: true, }, }, 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 0d564d065677b5..4a1db11e230fef 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 @@ -22,10 +22,10 @@ func ActiveReceiptRuleSets() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Metadata.Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Metadata.Name"), + PrimaryKeyComponent: true, }, { Name: "created_timestamp", 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 ea15fe6dbe833a..c5671c469d84b3 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 @@ -22,16 +22,16 @@ func configurationSetEventDestinations() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "configuration_set_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("name"), - PrimaryKey: true, + Name: "configuration_set_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("name"), + PrimaryKeyComponent: true, }, { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Name"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Name"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ses/configuration_sets.go b/plugins/source/aws/resources/services/ses/configuration_sets.go index cffacf1cc0f218..cdac2ff6c34c58 100644 --- a/plugins/source/aws/resources/services/ses/configuration_sets.go +++ b/plugins/source/aws/resources/services/ses/configuration_sets.go @@ -28,10 +28,10 @@ func ConfigurationSets() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveConfigurationSetArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveConfigurationSetArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ses/contact_lists.go b/plugins/source/aws/resources/services/ses/contact_lists.go index e9ca905a746dfc..1fe3724256d00e 100644 --- a/plugins/source/aws/resources/services/ses/contact_lists.go +++ b/plugins/source/aws/resources/services/ses/contact_lists.go @@ -25,10 +25,10 @@ func ContactLists() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ContactListName"), - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ContactListName"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 9c070bc3bb45ca..2cc73ec9dee00e 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 @@ -28,10 +28,10 @@ func CustomVerificationEmailTemplates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveCustomVerificationEmailTemplateArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveCustomVerificationEmailTemplateArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ses/identities.go b/plugins/source/aws/resources/services/ses/identities.go index 6c39a4de373ba3..0b20ed761ed3af 100644 --- a/plugins/source/aws/resources/services/ses/identities.go +++ b/plugins/source/aws/resources/services/ses/identities.go @@ -26,10 +26,10 @@ func Identities() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveIdentityArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveIdentityArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/ses/templates.go b/plugins/source/aws/resources/services/ses/templates.go index c4d7b1838a8811..c2a98714a7cb1b 100644 --- a/plugins/source/aws/resources/services/ses/templates.go +++ b/plugins/source/aws/resources/services/ses/templates.go @@ -25,10 +25,10 @@ func Templates() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveTemplateArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveTemplateArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/shield/attacks.go b/plugins/source/aws/resources/services/shield/attacks.go index 39e56e7496b74e..27a1b36286272c 100644 --- a/plugins/source/aws/resources/services/shield/attacks.go +++ b/plugins/source/aws/resources/services/shield/attacks.go @@ -24,11 +24,11 @@ func Attacks() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AttackId"), - Description: `The unique identifier (ID) of the attack`, - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AttackId"), + Description: `The unique identifier (ID) of the attack`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/shield/protection_groups.go b/plugins/source/aws/resources/services/shield/protection_groups.go index 92ae409c15349b..0d461e2f0fdc64 100644 --- a/plugins/source/aws/resources/services/shield/protection_groups.go +++ b/plugins/source/aws/resources/services/shield/protection_groups.go @@ -23,10 +23,10 @@ func ProtectionGroups() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ProtectionGroupArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ProtectionGroupArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/shield/protections.go b/plugins/source/aws/resources/services/shield/protections.go index 3cc491f0a6a2c6..dadc2ab49e59bd 100644 --- a/plugins/source/aws/resources/services/shield/protections.go +++ b/plugins/source/aws/resources/services/shield/protections.go @@ -23,10 +23,10 @@ func Protections() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ProtectionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ProtectionArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/shield/subscriptions.go b/plugins/source/aws/resources/services/shield/subscriptions.go index 61c5d2452823f1..7fe15305c2d6a0 100644 --- a/plugins/source/aws/resources/services/shield/subscriptions.go +++ b/plugins/source/aws/resources/services/shield/subscriptions.go @@ -22,10 +22,10 @@ func Subscriptions() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SubscriptionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SubscriptionArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/signer/profiles.go b/plugins/source/aws/resources/services/signer/profiles.go index bef52017cef5d0..6aa5a6fa6a313e 100644 --- a/plugins/source/aws/resources/services/signer/profiles.go +++ b/plugins/source/aws/resources/services/signer/profiles.go @@ -17,7 +17,7 @@ func Profiles() *schema.Table { Description: `https://docs.aws.amazon.com/signer/latest/api/API_GetSigningProfile.html`, Resolver: fetchProfiles, PreResourceResolver: getProfile, - Transform: transformers.TransformWithStruct(&signer.GetSigningProfileOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeys("ProfileVersionArn")), + Transform: transformers.TransformWithStruct(&signer.GetSigningProfileOutput{}, transformers.WithSkipFields("ResultMetadata"), transformers.WithPrimaryKeyComponents("ProfileVersionArn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "signer"), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), diff --git a/plugins/source/aws/resources/services/sns/subscriptions.go b/plugins/source/aws/resources/services/sns/subscriptions.go index 0bb4f1a6b05d35..cd2c28dba994ec 100644 --- a/plugins/source/aws/resources/services/sns/subscriptions.go +++ b/plugins/source/aws/resources/services/sns/subscriptions.go @@ -28,10 +28,10 @@ func Subscriptions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SubscriptionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SubscriptionArn"), + PrimaryKeyComponent: true, }, { Name: "delivery_policy", diff --git a/plugins/source/aws/resources/services/sns/topics.go b/plugins/source/aws/resources/services/sns/topics.go index 690f05abd79459..12b51af218d338 100644 --- a/plugins/source/aws/resources/services/sns/topics.go +++ b/plugins/source/aws/resources/services/sns/topics.go @@ -27,10 +27,10 @@ func Topics() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/sqs/queues.go b/plugins/source/aws/resources/services/sqs/queues.go index fe1fddb9379348..3302a84b374c66 100644 --- a/plugins/source/aws/resources/services/sqs/queues.go +++ b/plugins/source/aws/resources/services/sqs/queues.go @@ -28,10 +28,10 @@ func Queues() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "policy", diff --git a/plugins/source/aws/resources/services/ssm/associations.go b/plugins/source/aws/resources/services/ssm/associations.go index 1a0807cf46688c..6f7fa0379e9729 100644 --- a/plugins/source/aws/resources/services/ssm/associations.go +++ b/plugins/source/aws/resources/services/ssm/associations.go @@ -23,10 +23,10 @@ func Associations() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "association_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("AssociationId"), - PrimaryKey: true, + Name: "association_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("AssociationId"), + PrimaryKeyComponent: true, }, }, } 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 2e339cda2b81bc..cb9ac17813c25e 100644 --- a/plugins/source/aws/resources/services/ssm/compliance_summary_items.go +++ b/plugins/source/aws/resources/services/ssm/compliance_summary_items.go @@ -24,9 +24,9 @@ func ComplianceSummaryItems() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "compliance_type", - Type: arrow.BinaryTypes.String, - PrimaryKey: true, + Name: "compliance_type", + Type: arrow.BinaryTypes.String, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/document_versions.go b/plugins/source/aws/resources/services/ssm/document_versions.go index b40d16052f971c..89e7ae5619d2cb 100644 --- a/plugins/source/aws/resources/services/ssm/document_versions.go +++ b/plugins/source/aws/resources/services/ssm/document_versions.go @@ -18,15 +18,15 @@ func documentVersions() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_DocumentVersionInfo.html`, Resolver: fetchSsmDocumentVersions, - Transform: transformers.TransformWithStruct(&types.DocumentVersionInfo{}, transformers.WithPrimaryKeys("DocumentVersion")), + Transform: transformers.TransformWithStruct(&types.DocumentVersionInfo{}, transformers.WithPrimaryKeyComponents("DocumentVersion")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "document_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "document_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/documents.go b/plugins/source/aws/resources/services/ssm/documents.go index 61f64ad2a88d82..f5cb3671cee10f 100644 --- a/plugins/source/aws/resources/services/ssm/documents.go +++ b/plugins/source/aws/resources/services/ssm/documents.go @@ -28,10 +28,10 @@ func Documents() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDocumentARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDocumentARN, + PrimaryKeyComponent: true, }, { Name: "permissions", 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 d7794a9a1c1f87..c236c5cbd2c16e 100644 --- a/plugins/source/aws/resources/services/ssm/instance_compliance_items.go +++ b/plugins/source/aws/resources/services/ssm/instance_compliance_items.go @@ -22,16 +22,16 @@ func instanceComplianceItems() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/instance_patches.go b/plugins/source/aws/resources/services/ssm/instance_patches.go index 5aac2541050edd..d42448e8da5d07 100644 --- a/plugins/source/aws/resources/services/ssm/instance_patches.go +++ b/plugins/source/aws/resources/services/ssm/instance_patches.go @@ -22,16 +22,16 @@ func instancePatches() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { - Name: "kb_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("KBId"), - PrimaryKey: true, + Name: "kb_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("KBId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/instances.go b/plugins/source/aws/resources/services/ssm/instances.go index c190bc08e4b9ed..fbfbf05c02c197 100644 --- a/plugins/source/aws/resources/services/ssm/instances.go +++ b/plugins/source/aws/resources/services/ssm/instances.go @@ -26,10 +26,10 @@ func Instances() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveInstanceARN, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveInstanceARN, + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/ssm/inventories.go b/plugins/source/aws/resources/services/ssm/inventories.go index d211e80f0af5f7..cba4c49f2935fe 100644 --- a/plugins/source/aws/resources/services/ssm/inventories.go +++ b/plugins/source/aws/resources/services/ssm/inventories.go @@ -23,10 +23,10 @@ func Inventories() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Id"), - PrimaryKey: true, + Name: "id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Id"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/inventory_schemas.go b/plugins/source/aws/resources/services/ssm/inventory_schemas.go index 3c98d7f3adcdbe..c1464e109ab8fa 100644 --- a/plugins/source/aws/resources/services/ssm/inventory_schemas.go +++ b/plugins/source/aws/resources/services/ssm/inventory_schemas.go @@ -23,16 +23,16 @@ func InventorySchemas() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "type_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("TypeName"), - PrimaryKey: true, + Name: "type_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("TypeName"), + PrimaryKeyComponent: true, }, { - Name: "version", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Version"), - PrimaryKey: true, + Name: "version", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Version"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/parameters.go b/plugins/source/aws/resources/services/ssm/parameters.go index 5be726397dec41..1f377ca79114c6 100644 --- a/plugins/source/aws/resources/services/ssm/parameters.go +++ b/plugins/source/aws/resources/services/ssm/parameters.go @@ -23,10 +23,10 @@ func Parameters() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "name", - Type: arrow.BinaryTypes.String, - Description: `The parameter name`, - PrimaryKey: true, + Name: "name", + Type: arrow.BinaryTypes.String, + Description: `The parameter name`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/patch_baselines.go b/plugins/source/aws/resources/services/ssm/patch_baselines.go index 6e82476c432d65..2505c569a45986 100644 --- a/plugins/source/aws/resources/services/ssm/patch_baselines.go +++ b/plugins/source/aws/resources/services/ssm/patch_baselines.go @@ -23,10 +23,10 @@ func PatchBaselines() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "baseline_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("BaselineId"), - PrimaryKey: true, + Name: "baseline_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("BaselineId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssm/sessions.go b/plugins/source/aws/resources/services/ssm/sessions.go index f77d68b15ba201..e108c7ed77552e 100644 --- a/plugins/source/aws/resources/services/ssm/sessions.go +++ b/plugins/source/aws/resources/services/ssm/sessions.go @@ -18,7 +18,7 @@ func Sessions() *schema.Table { Description: `https://docs.aws.amazon.com/systems-manager/latest/APIReference/API_Session.html. Only Active sessions are fetched.`, Resolver: fetchSsmSessions, - Transform: transformers.TransformWithStruct(&types.Session{}, transformers.WithPrimaryKeys("SessionId")), + Transform: transformers.TransformWithStruct(&types.Session{}, transformers.WithPrimaryKeyComponents("SessionId")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "ssm"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go index 83d12c3652026f..65b77e18eb881e 100644 --- a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go +++ b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go @@ -19,7 +19,7 @@ func accountAssignments() *schema.Table { Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_AccountAssignment.html The 'request_account_id' and 'request_region' columns are added to show the account_id and region of where the request was made from.`, Resolver: fetchSsoadminAccountAssignments, - Transform: transformers.TransformWithStruct(&types.AccountAssignment{}, transformers.WithPrimaryKeys("PermissionSetArn", "PrincipalId", "PrincipalType", "AccountId")), + Transform: transformers.TransformWithStruct(&types.AccountAssignment{}, transformers.WithPrimaryKeyComponents("PermissionSetArn", "PrincipalId", "PrincipalType", "AccountId")), Columns: schema.ColumnList{ { Name: "request_account_id", @@ -32,10 +32,10 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: client.ResolveAWSRegion, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go b/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go index 743bf9d1075f89..8d047d2a0a0448 100644 --- a/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go @@ -17,19 +17,19 @@ func customerManagedPolicies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListManagedPoliciesInPermissionSet.html`, Resolver: fetchCustomerManagedPolicies, - Transform: transformers.TransformWithStruct(&types.CustomerManagedPolicyReference{}, transformers.WithPrimaryKeys("Name", "Path")), + Transform: transformers.TransformWithStruct(&types.CustomerManagedPolicyReference{}, transformers.WithPrimaryKeyComponents("Name", "Path")), Columns: []schema.Column{ { - Name: "permission_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("permission_set_arn"), - PrimaryKey: true, + Name: "permission_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("permission_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssoadmin/inline_policies.go b/plugins/source/aws/resources/services/ssoadmin/inline_policies.go index 553014fab262fb..e39223d926fb72 100644 --- a/plugins/source/aws/resources/services/ssoadmin/inline_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/inline_policies.go @@ -23,16 +23,16 @@ func inlinePolicies() *schema.Table { Transform: transformers.TransformWithStruct(&ssoadmin.GetInlinePolicyForPermissionSetOutput{}, transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ { - Name: "permission_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("permission_set_arn"), - PrimaryKey: true, + Name: "permission_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("permission_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, { Name: "inline_policy_json", diff --git a/plugins/source/aws/resources/services/ssoadmin/instances.go b/plugins/source/aws/resources/services/ssoadmin/instances.go index 252432f0f58286..8eb8aac91efce0 100644 --- a/plugins/source/aws/resources/services/ssoadmin/instances.go +++ b/plugins/source/aws/resources/services/ssoadmin/instances.go @@ -16,7 +16,7 @@ func Instances() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_InstanceMetadata.html`, Resolver: fetchSsoadminInstances, - Transform: transformers.TransformWithStruct(&types.InstanceMetadata{}, transformers.WithPrimaryKeys("InstanceArn")), + Transform: transformers.TransformWithStruct(&types.InstanceMetadata{}, transformers.WithPrimaryKeyComponents("InstanceArn")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "identitystore"), Relations: []*schema.Table{ diff --git a/plugins/source/aws/resources/services/ssoadmin/managed_policies.go b/plugins/source/aws/resources/services/ssoadmin/managed_policies.go index 2904cfc2d502ac..01991ac19939c9 100644 --- a/plugins/source/aws/resources/services/ssoadmin/managed_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/managed_policies.go @@ -17,19 +17,19 @@ func managedPolicies() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListManagedPoliciesInPermissionSet.html`, Resolver: fetchManagedPolicies, - Transform: transformers.TransformWithStruct(&types.AttachedManagedPolicy{}, transformers.WithPrimaryKeys("Arn")), + Transform: transformers.TransformWithStruct(&types.AttachedManagedPolicy{}, transformers.WithPrimaryKeyComponents("Arn")), Columns: []schema.Column{ { - Name: "permission_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("permission_set_arn"), - PrimaryKey: true, + Name: "permission_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("permission_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go b/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go index 13bd80938f3575..200be6bd7799d5 100644 --- a/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go +++ b/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go @@ -20,16 +20,16 @@ func permissionsBoundaries() *schema.Table { Transform: transformers.TransformWithStruct(&types.PermissionsBoundary{}, transformers.WithSkipFields("ResultMetadata")), Columns: []schema.Column{ { - Name: "permission_set_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("permission_set_arn"), - PrimaryKey: true, + Name: "permission_set_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("permission_set_arn"), + PrimaryKeyComponent: true, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go index 83f262b75e0d5f..e2e32da6123fd8 100644 --- a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go +++ b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go @@ -20,7 +20,7 @@ func permissionSets() *schema.Table { The 'request_account_id' and 'request_region' columns are added to show the account_id and region of where the request was made from.`, Resolver: fetchSsoadminPermissionSets, PreResourceResolver: getSsoadminPermissionSet, - Transform: transformers.TransformWithStruct(&types.PermissionSet{}, transformers.WithPrimaryKeys("PermissionSetArn")), + Transform: transformers.TransformWithStruct(&types.PermissionSet{}, transformers.WithPrimaryKeyComponents("PermissionSetArn")), Columns: []schema.Column{ { Name: "request_account_id", @@ -33,10 +33,10 @@ The 'request_account_id' and 'request_region' columns are added to show the acco Resolver: client.ResolveAWSRegion, }, { - Name: "instance_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("instance_arn"), - PrimaryKey: true, + Name: "instance_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("instance_arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/stepfunctions/activities.go b/plugins/source/aws/resources/services/stepfunctions/activities.go index 7384db5734bc7c..c5bbcfaa6f4f60 100644 --- a/plugins/source/aws/resources/services/stepfunctions/activities.go +++ b/plugins/source/aws/resources/services/stepfunctions/activities.go @@ -23,10 +23,10 @@ func Activities() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ActivityArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ActivityArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/stepfunctions/executions.go b/plugins/source/aws/resources/services/stepfunctions/executions.go index 0cf83977d2299a..b26ee7c6b90a10 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions.go @@ -23,10 +23,10 @@ func executions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ExecutionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ExecutionArn"), + PrimaryKeyComponent: true, }, { Name: "state_machine_arn", diff --git a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go index f242abec3eb52d..8eafae8b279216 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go @@ -23,10 +23,10 @@ func mapRuns() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("MapRunArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("MapRunArn"), + PrimaryKeyComponent: true, }, { Name: "state_machine_arn", diff --git a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go index 9b6b954193b0f9..c4e4e30b144efd 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go @@ -22,10 +22,10 @@ func mapRunExecutions() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ExecutionArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ExecutionArn"), + PrimaryKeyComponent: true, }, { Name: "map_run_arn", diff --git a/plugins/source/aws/resources/services/stepfunctions/state_machines.go b/plugins/source/aws/resources/services/stepfunctions/state_machines.go index 5dce862124af4f..f065241ed2ac0e 100644 --- a/plugins/source/aws/resources/services/stepfunctions/state_machines.go +++ b/plugins/source/aws/resources/services/stepfunctions/state_machines.go @@ -25,10 +25,10 @@ func StateMachines() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("StateMachineArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("StateMachineArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/support/cases.go b/plugins/source/aws/resources/services/support/cases.go index 7a8e27f7329c83..a9837c630d73ae 100644 --- a/plugins/source/aws/resources/services/support/cases.go +++ b/plugins/source/aws/resources/services/support/cases.go @@ -17,7 +17,7 @@ func Cases() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeCases.html`, Resolver: fetchCases, - Transform: transformers.TransformWithStruct(&types.CaseDetails{}, transformers.WithPrimaryKeys("CaseId")), + Transform: transformers.TransformWithStruct(&types.CaseDetails{}, transformers.WithPrimaryKeyComponents("CaseId")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "support"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/support/communications.go b/plugins/source/aws/resources/services/support/communications.go index 9839163f80adba..e8297396166c02 100644 --- a/plugins/source/aws/resources/services/support/communications.go +++ b/plugins/source/aws/resources/services/support/communications.go @@ -19,7 +19,7 @@ func communications() *schema.Table { Name: "aws_support_case_communications", Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeCommunications.html`, Resolver: fetchCommunications, - Transform: transformers.TransformWithStruct(&types.Communication{}, transformers.WithPrimaryKeys("CaseId", "SubmittedBy", "TimeCreated")), + Transform: transformers.TransformWithStruct(&types.Communication{}, transformers.WithPrimaryKeyComponents("CaseId", "SubmittedBy", "TimeCreated")), Columns: []schema.Column{ client.DefaultAccountIDColumn(false), }, diff --git a/plugins/source/aws/resources/services/support/services.go b/plugins/source/aws/resources/services/support/services.go index fb4f10804a485b..9316ac4446dca5 100644 --- a/plugins/source/aws/resources/services/support/services.go +++ b/plugins/source/aws/resources/services/support/services.go @@ -19,7 +19,7 @@ func Services() *schema.Table { Name: "aws_support_services", Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeServices.html`, Resolver: fetchServices, - Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeys("Code")), + Transform: transformers.TransformWithStruct(&types.Service{}, transformers.WithPrimaryKeyComponents("Code")), Multiplex: client.ServiceAccountRegionsLanguageCodeMultiplex(tableName, "support", servicesSupportedLanguageCodes), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/support/severity_levels.go b/plugins/source/aws/resources/services/support/severity_levels.go index 82ea8fbd2fa122..267d1d8db14c59 100644 --- a/plugins/source/aws/resources/services/support/severity_levels.go +++ b/plugins/source/aws/resources/services/support/severity_levels.go @@ -20,7 +20,7 @@ func SeverityLevels() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeSeverityLevels.html`, Resolver: fetchSeverityLevels, - Transform: transformers.TransformWithStruct(&types.SeverityLevel{}, transformers.WithPrimaryKeys("Code")), + Transform: transformers.TransformWithStruct(&types.SeverityLevel{}, transformers.WithPrimaryKeyComponents("Code")), Multiplex: client.ServiceAccountRegionsLanguageCodeMultiplex(tableName, "support", severitySupportedLanguageCodes), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go b/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go index efd80d1313a287..fbfb72b283b879 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go @@ -18,7 +18,7 @@ func trustedAdvisorCheckResults() *schema.Table { Name: "aws_support_trusted_advisor_check_results", Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorCheckResult.html`, Resolver: fetchTrustedAdvisorCheckResults, - Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckResult{}, transformers.WithPrimaryKeys("CheckId")), + Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckResult{}, transformers.WithPrimaryKeyComponents("CheckId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go b/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go index 51879699e433b8..2649a6bde64c6a 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go @@ -18,7 +18,7 @@ func trustedAdvisorCheckSummaries() *schema.Table { Name: "aws_support_trusted_advisor_check_summaries", Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorCheckSummaries.html`, Resolver: fetchTrustedAdvisorCheckSummaries, - Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckSummary{}, transformers.WithPrimaryKeys("CheckId")), + Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckSummary{}, transformers.WithPrimaryKeyComponents("CheckId")), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_checks.go b/plugins/source/aws/resources/services/support/trusted_advisor_checks.go index 4eb39cbd9428f3..90c07e0694413a 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_checks.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_checks.go @@ -19,7 +19,7 @@ func TrustedAdvisorChecks() *schema.Table { Name: "aws_support_trusted_advisor_checks", Description: `https://docs.aws.amazon.com/awssupport/latest/APIReference/API_DescribeTrustedAdvisorChecks.html`, Resolver: fetchTrustedAdvisorChecks, - Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckDescription{}, transformers.WithPrimaryKeys("Id")), + Transform: transformers.TransformWithStruct(&types.TrustedAdvisorCheckDescription{}, transformers.WithPrimaryKeyComponents("Id")), Multiplex: client.ServiceAccountRegionsLanguageCodeMultiplex(tableName, "support", checksSupportedLanguageCodes), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/timestream/databases.go b/plugins/source/aws/resources/services/timestream/databases.go index e10a8d19473474..75fa002249982f 100644 --- a/plugins/source/aws/resources/services/timestream/databases.go +++ b/plugins/source/aws/resources/services/timestream/databases.go @@ -30,10 +30,10 @@ func Databases() *schema.Table { Resolver: fetchDatabaseTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, diff --git a/plugins/source/aws/resources/services/timestream/tables.go b/plugins/source/aws/resources/services/timestream/tables.go index 5dbf6e7e7afd00..679a8e8ffc5c57 100644 --- a/plugins/source/aws/resources/services/timestream/tables.go +++ b/plugins/source/aws/resources/services/timestream/tables.go @@ -22,10 +22,10 @@ func tables() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/transfer/servers.go b/plugins/source/aws/resources/services/transfer/servers.go index 14bc6ef8d5b0ad..0a832d911e1056 100644 --- a/plugins/source/aws/resources/services/transfer/servers.go +++ b/plugins/source/aws/resources/services/transfer/servers.go @@ -26,10 +26,10 @@ func Servers() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("Arn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("Arn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/waf/rule_groups.go b/plugins/source/aws/resources/services/waf/rule_groups.go index 3b618a1642780c..7ed546545c6e60 100644 --- a/plugins/source/aws/resources/services/waf/rule_groups.go +++ b/plugins/source/aws/resources/services/waf/rule_groups.go @@ -26,10 +26,10 @@ func RuleGroups() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWafRuleGroupArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWafRuleGroupArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/waf/rules.go b/plugins/source/aws/resources/services/waf/rules.go index 85f5823fe28075..5a40bf1db36bc5 100644 --- a/plugins/source/aws/resources/services/waf/rules.go +++ b/plugins/source/aws/resources/services/waf/rules.go @@ -26,10 +26,10 @@ func Rules() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWafRuleArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWafRuleArn, + PrimaryKeyComponent: true, }, { Name: "tags", 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 936340b470bfa8..f27b698957a670 100644 --- a/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go +++ b/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go @@ -22,18 +22,18 @@ func SubscribedRuleGroups() *schema.Table { Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "waf"), Columns: []schema.Column{ { - Name: "account_id", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveAWSAccount, - Description: `The AWS Account ID of the resource.`, - PrimaryKey: true, + Name: "account_id", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveAWSAccount, + Description: `The AWS Account ID of the resource.`, + PrimaryKeyComponent: true, }, { - Name: "rule_group_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("RuleGroupId"), - Description: `A unique identifier for a RuleGroup.`, - PrimaryKey: true, + Name: "rule_group_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("RuleGroupId"), + Description: `A unique identifier for a RuleGroup.`, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/waf/web_acls.go b/plugins/source/aws/resources/services/waf/web_acls.go index ed3d7e208507b1..d6dbc725cfbf80 100644 --- a/plugins/source/aws/resources/services/waf/web_acls.go +++ b/plugins/source/aws/resources/services/waf/web_acls.go @@ -24,10 +24,10 @@ func WebAcls() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("WebACLArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("WebACLArn"), + PrimaryKeyComponent: true, }, { Name: "tags", 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 a5e0d2c8c096c7..e91a8fa659bf2b 100644 --- a/plugins/source/aws/resources/services/wafregional/rate_based_rules.go +++ b/plugins/source/aws/resources/services/wafregional/rate_based_rules.go @@ -27,10 +27,10 @@ func RateBasedRules() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWafregionalRateBasedRuleArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWafregionalRateBasedRuleArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/wafregional/rule_groups.go b/plugins/source/aws/resources/services/wafregional/rule_groups.go index ad640b7b0eece7..449c0e2949e04d 100644 --- a/plugins/source/aws/resources/services/wafregional/rule_groups.go +++ b/plugins/source/aws/resources/services/wafregional/rule_groups.go @@ -27,10 +27,10 @@ func RuleGroups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWafregionalRuleGroupArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWafregionalRuleGroupArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/wafregional/rules.go b/plugins/source/aws/resources/services/wafregional/rules.go index 6d5baf140a3e9d..d96b547e98efba 100644 --- a/plugins/source/aws/resources/services/wafregional/rules.go +++ b/plugins/source/aws/resources/services/wafregional/rules.go @@ -27,10 +27,10 @@ func Rules() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWafregionalRuleArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWafregionalRuleArn, + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/wafregional/web_acls.go b/plugins/source/aws/resources/services/wafregional/web_acls.go index 4063014090040a..b071db7393e8ae 100644 --- a/plugins/source/aws/resources/services/wafregional/web_acls.go +++ b/plugins/source/aws/resources/services/wafregional/web_acls.go @@ -25,10 +25,10 @@ func WebAcls() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("WebACLArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("WebACLArn"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/wafv2/ipsets.go b/plugins/source/aws/resources/services/wafv2/ipsets.go index 1924e80e12c69c..48c3d1ca9f07af 100644 --- a/plugins/source/aws/resources/services/wafv2/ipsets.go +++ b/plugins/source/aws/resources/services/wafv2/ipsets.go @@ -37,10 +37,10 @@ func Ipsets() *schema.Table { Resolver: resolveIpsetTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } 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 6b86cdd7d9db1a..7320cca62728f1 100644 --- a/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go @@ -19,16 +19,16 @@ func ManagedRuleGroups() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/waf/latest/APIReference/API_ManagedRuleGroupSummary.html`, Resolver: fetchWafv2ManagedRuleGroups, - Transform: transformers.TransformWithStruct(&types.ManagedRuleGroupSummary{}, transformers.WithPrimaryKeys("Name", "VendorName")), + Transform: transformers.TransformWithStruct(&types.ManagedRuleGroupSummary{}, transformers.WithPrimaryKeyComponents("Name", "VendorName")), Multiplex: client.ServiceAccountRegionScopeMultiplexer(tableName, "waf-regional"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "scope", - Type: arrow.BinaryTypes.String, - Resolver: client.ResolveWAFScope, - PrimaryKey: true, + Name: "scope", + Type: arrow.BinaryTypes.String, + Resolver: client.ResolveWAFScope, + PrimaryKeyComponent: true, }, { Name: "properties", 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 a140f748ca3f09..396fbf8a6ba798 100644 --- a/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go +++ b/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go @@ -31,10 +31,10 @@ func RegexPatternSets() *schema.Table { Resolver: resolveRegexPatternSetTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/wafv2/rule_groups.go b/plugins/source/aws/resources/services/wafv2/rule_groups.go index ff7cf68bb36c6c..397ebe14138bd6 100644 --- a/plugins/source/aws/resources/services/wafv2/rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/rule_groups.go @@ -33,10 +33,10 @@ func RuleGroups() *schema.Table { Resolver: resolveRuleGroupTags, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, { Name: "policy", diff --git a/plugins/source/aws/resources/services/wafv2/web_acls.go b/plugins/source/aws/resources/services/wafv2/web_acls.go index f8f0f7e18ebef1..28252021421873 100644 --- a/plugins/source/aws/resources/services/wafv2/web_acls.go +++ b/plugins/source/aws/resources/services/wafv2/web_acls.go @@ -39,10 +39,10 @@ func WebAcls() *schema.Table { Resolver: resolveWafv2webACLResourcesForWebACL, }, { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("ARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("ARN"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go b/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go index c173511fefcb3e..8689e243e409d2 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go +++ b/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go @@ -18,17 +18,17 @@ func lensReviewImprovements() *schema.Table { Name: name, Description: `https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_ImprovementSummary.html`, Transform: transformers.TransformWithStruct(new(types.ImprovementSummary), - transformers.WithPrimaryKeys("PillarId", "QuestionId"), + transformers.WithPrimaryKeyComponents("PillarId", "QuestionId"), ), Resolver: fetchLensReviewImprovements, Columns: schema.ColumnList{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "workload_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("workload_arn"), - PrimaryKey: true, + Name: "workload_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("workload_arn"), + PrimaryKeyComponent: true, }, { Name: "workload_id", @@ -36,16 +36,16 @@ func lensReviewImprovements() *schema.Table { Resolver: schema.ParentColumnResolver("workload_id"), }, { - Name: "milestone_number", - Type: arrow.PrimitiveTypes.Int64, - Resolver: schema.ParentColumnResolver("milestone_number"), - PrimaryKey: true, + Name: "milestone_number", + Type: arrow.PrimitiveTypes.Int64, + Resolver: schema.ParentColumnResolver("milestone_number"), + PrimaryKeyComponent: true, }, { - Name: "lens_alias", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("lens_alias"), - PrimaryKey: true, + Name: "lens_alias", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("lens_alias"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go b/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go index 5803574e92b4fe..f8b1be55301b82 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go +++ b/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go @@ -18,17 +18,17 @@ func lensReviews() *schema.Table { Name: name, Description: `https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_LensReview.html`, Transform: transformers.TransformWithStruct(new(types.LensReview), - transformers.WithPrimaryKeys("LensAlias"), + transformers.WithPrimaryKeyComponents("LensAlias"), ), Resolver: fetchLensReviews, Columns: schema.ColumnList{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "workload_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("workload_arn"), - PrimaryKey: true, + Name: "workload_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("workload_arn"), + PrimaryKeyComponent: true, }, { Name: "workload_id", @@ -36,10 +36,10 @@ func lensReviews() *schema.Table { Resolver: schema.ParentColumnResolver("workload_id"), }, { - Name: "milestone_number", - Type: arrow.PrimitiveTypes.Int64, - Resolver: schema.ParentColumnResolver("milestone_number"), - PrimaryKey: true, + Name: "milestone_number", + Type: arrow.PrimitiveTypes.Int64, + Resolver: schema.ParentColumnResolver("milestone_number"), + PrimaryKeyComponent: true, }, }, Relations: schema.Tables{lensReviewImprovements()}, diff --git a/plugins/source/aws/resources/services/wellarchitected/lenses.go b/plugins/source/aws/resources/services/wellarchitected/lenses.go index f3c0194cf54da5..d0fcbb714d65d9 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lenses.go +++ b/plugins/source/aws/resources/services/wellarchitected/lenses.go @@ -34,10 +34,10 @@ func Lenses() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("LensArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("LensArn"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/wellarchitected/share_invitations.go b/plugins/source/aws/resources/services/wellarchitected/share_invitations.go index 35b06cf6a7c48f..eaccd85195c723 100644 --- a/plugins/source/aws/resources/services/wellarchitected/share_invitations.go +++ b/plugins/source/aws/resources/services/wellarchitected/share_invitations.go @@ -17,7 +17,7 @@ func ShareInvitations() *schema.Table { Name: name, Description: `https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_ShareInvitation.html`, Transform: transformers.TransformWithStruct(new(types.ShareInvitationSummary), - transformers.WithPrimaryKeys("ShareInvitationId"), + transformers.WithPrimaryKeyComponents("ShareInvitationId"), ), Multiplex: client.ServiceAccountRegionMultiplexer(name, "wellarchitected"), Resolver: fetchShareInvitations, diff --git a/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go b/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go index ff2d92de266d76..b9f683b23c073a 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go +++ b/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go @@ -18,7 +18,7 @@ func workloadMilestones() *schema.Table { Name: name, Description: `https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_MilestoneSummary.html`, Transform: transformers.TransformWithStruct(new(types.MilestoneSummary), - transformers.WithPrimaryKeys("MilestoneName"), + transformers.WithPrimaryKeyComponents("MilestoneName"), transformers.WithUnwrapAllEmbeddedStructs(), transformers.WithSkipFields("WorkloadSummary"), ), @@ -27,10 +27,10 @@ func workloadMilestones() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "workload_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "workload_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, { Name: "workload_id", diff --git a/plugins/source/aws/resources/services/wellarchitected/workload_shares.go b/plugins/source/aws/resources/services/wellarchitected/workload_shares.go index 3886cf40ebeac8..7ca8de929a7851 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workload_shares.go +++ b/plugins/source/aws/resources/services/wellarchitected/workload_shares.go @@ -18,17 +18,17 @@ func workloadShares() *schema.Table { Name: name, Description: `https://docs.aws.amazon.com/wellarchitected/latest/APIReference/API_WorkloadShareSummary.html`, Transform: transformers.TransformWithStruct(new(types.WorkloadShareSummary), - transformers.WithPrimaryKeys("ShareId"), + transformers.WithPrimaryKeyComponents("ShareId"), ), Resolver: fetchWorkloadShares, Columns: schema.ColumnList{ client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "workload_arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.ParentColumnResolver("arn"), - PrimaryKey: true, + Name: "workload_arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.ParentColumnResolver("arn"), + PrimaryKeyComponent: true, }, }, Relations: nil, diff --git a/plugins/source/aws/resources/services/wellarchitected/workloads.go b/plugins/source/aws/resources/services/wellarchitected/workloads.go index 024564e46eb48e..2589363eee7ee7 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workloads.go +++ b/plugins/source/aws/resources/services/wellarchitected/workloads.go @@ -25,10 +25,10 @@ func Workloads() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("WorkloadArn"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("WorkloadArn"), + PrimaryKeyComponent: true, }, }, Relations: schema.Tables{ diff --git a/plugins/source/aws/resources/services/workspaces/directories.go b/plugins/source/aws/resources/services/workspaces/directories.go index f4371821a37e71..25f324e8828cc3 100644 --- a/plugins/source/aws/resources/services/workspaces/directories.go +++ b/plugins/source/aws/resources/services/workspaces/directories.go @@ -23,10 +23,10 @@ func Directories() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveDirectoryArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveDirectoryArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/workspaces/workspaces.go b/plugins/source/aws/resources/services/workspaces/workspaces.go index f095a9ddc9b0a8..c8b03dcd76cb41 100644 --- a/plugins/source/aws/resources/services/workspaces/workspaces.go +++ b/plugins/source/aws/resources/services/workspaces/workspaces.go @@ -23,10 +23,10 @@ func Workspaces() *schema.Table { Columns: []schema.Column{ client.DefaultAccountIDColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: resolveWorkspaceArn, - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: resolveWorkspaceArn, + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/xray/encryption_configs.go b/plugins/source/aws/resources/services/xray/encryption_configs.go index d989ec84a48cad..ed637834dc347b 100644 --- a/plugins/source/aws/resources/services/xray/encryption_configs.go +++ b/plugins/source/aws/resources/services/xray/encryption_configs.go @@ -17,7 +17,7 @@ func EncryptionConfigs() *schema.Table { Name: tableName, Description: `https://docs.aws.amazon.com/xray/latest/api/API_EncryptionConfig.html`, Resolver: fetchXrayEncryptionConfigs, - Transform: transformers.TransformWithStruct(&types.EncryptionConfig{}, transformers.WithPrimaryKeys("KeyId", "Type")), + Transform: transformers.TransformWithStruct(&types.EncryptionConfig{}, transformers.WithPrimaryKeyComponents("KeyId", "Type")), Multiplex: client.ServiceAccountRegionMultiplexer(tableName, "xray"), Columns: []schema.Column{ client.DefaultAccountIDColumn(true), diff --git a/plugins/source/aws/resources/services/xray/groups.go b/plugins/source/aws/resources/services/xray/groups.go index 25dcb8ff319084..69278b5e1f0b74 100644 --- a/plugins/source/aws/resources/services/xray/groups.go +++ b/plugins/source/aws/resources/services/xray/groups.go @@ -24,10 +24,10 @@ func Groups() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("GroupARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("GroupARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/plugins/source/aws/resources/services/xray/resource_policies.go b/plugins/source/aws/resources/services/xray/resource_policies.go index 6cc3884e3a3c5b..a58b764e82f793 100644 --- a/plugins/source/aws/resources/services/xray/resource_policies.go +++ b/plugins/source/aws/resources/services/xray/resource_policies.go @@ -23,16 +23,16 @@ func ResourcePolicies() *schema.Table { client.DefaultAccountIDColumn(true), client.DefaultRegionColumn(true), { - Name: "policy_name", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyName"), - PrimaryKey: true, + Name: "policy_name", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyName"), + PrimaryKeyComponent: true, }, { - Name: "policy_revision_id", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("PolicyRevisionId"), - PrimaryKey: true, + Name: "policy_revision_id", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("PolicyRevisionId"), + PrimaryKeyComponent: true, }, }, } diff --git a/plugins/source/aws/resources/services/xray/sampling_rules.go b/plugins/source/aws/resources/services/xray/sampling_rules.go index f5a15f1dd3e0e9..7a2ef099bfbe60 100644 --- a/plugins/source/aws/resources/services/xray/sampling_rules.go +++ b/plugins/source/aws/resources/services/xray/sampling_rules.go @@ -24,10 +24,10 @@ func SamplingRules() *schema.Table { client.DefaultAccountIDColumn(false), client.DefaultRegionColumn(false), { - Name: "arn", - Type: arrow.BinaryTypes.String, - Resolver: schema.PathResolver("SamplingRule.RuleARN"), - PrimaryKey: true, + Name: "arn", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("SamplingRule.RuleARN"), + PrimaryKeyComponent: true, }, { Name: "tags", diff --git a/scripts/table_diff/go.mod b/scripts/table_diff/go.mod index c89b7252f2a033..e075be7f7559ba 100644 --- a/scripts/table_diff/go.mod +++ b/scripts/table_diff/go.mod @@ -8,6 +8,7 @@ require ( github.com/stretchr/testify v1.8.4 ) + require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/scripts/table_diff/go.sum b/scripts/table_diff/go.sum index c66daa3e1ebdf0..32eea5b3837d46 100644 --- a/scripts/table_diff/go.sum +++ b/scripts/table_diff/go.sum @@ -25,3 +25,4 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + From 02162b32ec128f877cf48f8a5ec23e5f61f83bf8 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:30:07 -0800 Subject: [PATCH 16/78] chore: No 'This parameter controls' in docs, correct `batch_timeout` explanation (#16442) Destination plugins only. ~Will update after last few PRs are merged~ --- plugins/destination/azblob/client/spec/schema.json | 6 +++--- plugins/destination/azblob/client/spec/spec.go | 6 +++--- plugins/destination/azblob/docs/overview.md | 2 +- plugins/destination/bigquery/docs/overview.md | 2 +- plugins/destination/clickhouse/client/spec/schema.json | 6 +++--- plugins/destination/clickhouse/client/spec/spec.go | 6 +++--- plugins/destination/clickhouse/docs/overview.md | 6 +++--- plugins/destination/duckdb/client/schema.json | 2 +- plugins/destination/duckdb/client/spec.go | 2 +- plugins/destination/duckdb/docs/overview.md | 2 +- plugins/destination/elasticsearch/docs/overview.md | 4 ++-- plugins/destination/file/client/spec/schema.json | 6 +++--- plugins/destination/file/client/spec/spec.go | 6 +++--- plugins/destination/file/docs/overview.md | 2 +- plugins/destination/gcs/client/spec/schema.json | 6 +++--- plugins/destination/gcs/client/spec/spec.go | 6 +++--- plugins/destination/gcs/docs/overview.md | 2 +- plugins/destination/meilisearch/docs/overview.md | 4 ++-- plugins/destination/mongodb/client/schema.json | 2 +- plugins/destination/mongodb/client/spec.go | 2 +- plugins/destination/mssql/client/schema.json | 2 +- plugins/destination/mssql/client/spec.go | 2 +- plugins/destination/mssql/docs/configuration.md | 2 +- plugins/destination/mysql/client/schema.json | 2 +- plugins/destination/mysql/client/spec.go | 2 +- plugins/destination/mysql/docs/configuration.md | 2 +- plugins/destination/postgresql/docs/overview.md | 6 +++--- plugins/destination/s3/docs/overview.md | 2 +- 28 files changed, 50 insertions(+), 50 deletions(-) diff --git a/plugins/destination/azblob/client/spec/schema.json b/plugins/destination/azblob/client/spec/schema.json index 49d94aca60a70c..426772117bcf45 100644 --- a/plugins/destination/azblob/client/spec/schema.json +++ b/plugins/destination/azblob/client/spec/schema.json @@ -185,7 +185,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum amount of items may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum number of items that may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", "default": 10000 }, { @@ -198,7 +198,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", "default": 52428800 }, { @@ -210,7 +210,7 @@ "oneOf": [ { "$ref": "#/$defs/Duration", - "description": "This parameter controls the maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "description": "Maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", "default": "30s" }, { diff --git a/plugins/destination/azblob/client/spec/spec.go b/plugins/destination/azblob/client/spec/spec.go index d524eba3fd9ed8..e249b4b5863c15 100644 --- a/plugins/destination/azblob/client/spec/spec.go +++ b/plugins/destination/azblob/client/spec/spec.go @@ -24,17 +24,17 @@ type Spec struct { // Otherwise, for every batch a new file will be created with a different `.` suffix. NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` - // This parameter controls the maximum amount of items may be grouped together to be written in a single object. + // Maximum number of items that may be grouped together to be written in a single object. // // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` - // This parameter controls the maximum size of items that may be grouped together to be written in a single object. + // Maximum size of items that may be grouped together to be written in a single object. // // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` - // This parameter controls the maximum interval between batch writes. + // Maximum interval between batch writes. // // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` diff --git a/plugins/destination/azblob/docs/overview.md b/plugins/destination/azblob/docs/overview.md index b12d1d0ec9f4f4..174ae7ea84aae6 100644 --- a/plugins/destination/azblob/docs/overview.md +++ b/plugins/destination/azblob/docs/overview.md @@ -67,7 +67,7 @@ This is the (nested) spec used by the Azure blob destination Plugin. - `batch_timeout` (`duration`) (optional) (default: `30s` (30 seconds)) - Inactivity time before starting a new object. + Maximum interval between batch writes. ### format_spec diff --git a/plugins/destination/bigquery/docs/overview.md b/plugins/destination/bigquery/docs/overview.md index 432d5c1e070d9b..d4e9e16747cb8c 100644 --- a/plugins/destination/bigquery/docs/overview.md +++ b/plugins/destination/bigquery/docs/overview.md @@ -79,7 +79,7 @@ This is the top-level spec used by the BigQuery destination plugin. - `batch_timeout` (`duration`) (optional) (default: `10s` (10 seconds)) - Inactivity time before starting a new object. + Maximum interval between batch writes. ## Underlying library diff --git a/plugins/destination/clickhouse/client/spec/schema.json b/plugins/destination/clickhouse/client/spec/schema.json index 3afab4d1cbe0b9..7a49792f08c518 100644 --- a/plugins/destination/clickhouse/client/spec/schema.json +++ b/plugins/destination/clickhouse/client/spec/schema.json @@ -62,20 +62,20 @@ "batch_size": { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum amount of items may be grouped together to be written as a single write.", + "description": "Maximum number of items that may be grouped together to be written in a single write.", "default": 10000 }, "batch_size_bytes": { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum size of items that may be grouped together to be written as a single write.", + "description": "Maximum size of items that may be grouped together to be written in a single write.", "default": 5242880 }, "batch_timeout": { "oneOf": [ { "$ref": "#/$defs/Duration", - "description": "This parameter controls the maximum interval between batch writes.", + "description": "Maximum interval between batch writes.", "default": "20s" }, { diff --git a/plugins/destination/clickhouse/client/spec/spec.go b/plugins/destination/clickhouse/client/spec/spec.go index 7ce65cde88d019..05330348508e75 100644 --- a/plugins/destination/clickhouse/client/spec/spec.go +++ b/plugins/destination/clickhouse/client/spec/spec.go @@ -32,13 +32,13 @@ type Spec struct { // for how to read this value from a file. CACert string `json:"ca_cert,omitempty"` - // This parameter controls the maximum amount of items may be grouped together to be written as a single write. + // Maximum number of items that may be grouped together to be written in a single write. BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=10000"` - // This parameter controls the maximum size of items that may be grouped together to be written as a single write. + // Maximum size of items that may be grouped together to be written in a single write. BatchSizeBytes int `json:"batch_size_bytes,omitempty" jsonschema:"minimum=1,default=5242880"` - // This parameter controls the maximum interval between batch writes. + // Maximum interval between batch writes. BatchTimeout *configtype.Duration `json:"batch_timeout,omitempty"` } diff --git a/plugins/destination/clickhouse/docs/overview.md b/plugins/destination/clickhouse/docs/overview.md index 86d2c5ed146db6..f72dc1b9ef6994 100644 --- a/plugins/destination/clickhouse/docs/overview.md +++ b/plugins/destination/clickhouse/docs/overview.md @@ -54,15 +54,15 @@ This is the (nested) spec used by the ClickHouse destination plugin. - `batch_size` (`integer`) (optional) (default: `10000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `5242880` (= 5 MiB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. - `batch_timeout` (`duration`) (optional) (default: `20s`) - This parameter controls the maximum interval between batch writes. + Maximum interval between batch writes. #### ClickHouse table engine diff --git a/plugins/destination/duckdb/client/schema.json b/plugins/destination/duckdb/client/schema.json index 26a4cab096654c..994e644bd6b9f2 100644 --- a/plugins/destination/duckdb/client/schema.json +++ b/plugins/destination/duckdb/client/schema.json @@ -13,7 +13,7 @@ "batch_size": { "type": "integer", "minimum": 1, - "description": "Maximum amount of items that may be grouped together to be written in a single write", + "description": "Maximum number of items that may be grouped together to be written in a single write.", "default": 1000 }, "batch_size_bytes": { diff --git a/plugins/destination/duckdb/client/spec.go b/plugins/destination/duckdb/client/spec.go index ce29757ea53a8c..0fd6fe23cc8baf 100644 --- a/plugins/destination/duckdb/client/spec.go +++ b/plugins/destination/duckdb/client/spec.go @@ -11,7 +11,7 @@ type Spec struct { // Absolute or relative path to a file, such as `./example.duckdb` ConnectionString string `json:"connection_string,omitempty" jsonschema:"required,minLength=1"` - // Maximum amount of items that may be grouped together to be written in a single write + // Maximum number of items that may be grouped together to be written in a single write. BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` // Maximum size of items that may be grouped together to be written in a single write. diff --git a/plugins/destination/duckdb/docs/overview.md b/plugins/destination/duckdb/docs/overview.md index dad04d97ad0a25..f34dcb7f7524dc 100644 --- a/plugins/destination/duckdb/docs/overview.md +++ b/plugins/destination/duckdb/docs/overview.md @@ -24,7 +24,7 @@ This is the top level spec used by the DuckDB destination Plugin. - `batch_size` (`integer`) (optional) (default: `1000`) - Maximum amount of items that may be grouped together to be written in a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `4194304` (4 MiB)) diff --git a/plugins/destination/elasticsearch/docs/overview.md b/plugins/destination/elasticsearch/docs/overview.md index eed697357445fc..36d3657f5b8b3b 100644 --- a/plugins/destination/elasticsearch/docs/overview.md +++ b/plugins/destination/elasticsearch/docs/overview.md @@ -59,11 +59,11 @@ This is the spec used by the Elasticsearch destination plugin. - `batch_size` (`integer`) (optional) (default: `1000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `5242880` (5 MiB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. ## Index Template Creation diff --git a/plugins/destination/file/client/spec/schema.json b/plugins/destination/file/client/spec/schema.json index 65d52cf06e185a..b7c6ce39dcc2e1 100644 --- a/plugins/destination/file/client/spec/schema.json +++ b/plugins/destination/file/client/spec/schema.json @@ -221,7 +221,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum amount of items may be grouped together to be written in a single write.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum number of items that may be grouped together to be written in a single write.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", "default": 10000 }, { @@ -234,7 +234,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum size of items that may be grouped together to be written in a single write.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum size of items that may be grouped together to be written in a single write.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", "default": 52428800 }, { @@ -246,7 +246,7 @@ "oneOf": [ { "$ref": "#/$defs/Duration", - "description": "This parameter controls the maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "description": "Maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", "default": "30s" }, { diff --git a/plugins/destination/file/client/spec/spec.go b/plugins/destination/file/client/spec/spec.go index 644329106ae26a..85b57b9fd79259 100644 --- a/plugins/destination/file/client/spec/spec.go +++ b/plugins/destination/file/client/spec/spec.go @@ -44,17 +44,17 @@ type Spec struct { // Otherwise, for every batch a new file will be created with a different `.` suffix. NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` - // This parameter controls the maximum amount of items may be grouped together to be written in a single write. + // Maximum number of items that may be grouped together to be written in a single write. // // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` - // This parameter controls the maximum size of items that may be grouped together to be written in a single write. + // Maximum size of items that may be grouped together to be written in a single write. // // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` - // This parameter controls the maximum interval between batch writes. + // Maximum interval between batch writes. // // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` diff --git a/plugins/destination/file/docs/overview.md b/plugins/destination/file/docs/overview.md index 1e43a328f38d7a..c4cfa178a21b31 100644 --- a/plugins/destination/file/docs/overview.md +++ b/plugins/destination/file/docs/overview.md @@ -62,7 +62,7 @@ This is the (nested) spec used by the file destination Plugin. - `batch_timeout` (`duration`) (optional) (default: `30s` (30 seconds)) - Inactivity time before starting a new object. + Maximum interval between batch writes. ### format_spec diff --git a/plugins/destination/gcs/client/spec/schema.json b/plugins/destination/gcs/client/spec/schema.json index 432d251cd52721..9ed9877b35c9e8 100644 --- a/plugins/destination/gcs/client/spec/schema.json +++ b/plugins/destination/gcs/client/spec/schema.json @@ -180,7 +180,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum amount of items may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum number of items may be grouped together to be written in a single object.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", "default": 10000 }, { @@ -193,7 +193,7 @@ { "type": "integer", "minimum": 1, - "description": "This parameter controls the maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "description": "Maximum size of items that may be grouped together to be written in a single object.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", "default": 52428800 }, { @@ -205,7 +205,7 @@ "oneOf": [ { "$ref": "#/$defs/Duration", - "description": "This parameter controls the maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "description": "Maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", "default": "30s" }, { diff --git a/plugins/destination/gcs/client/spec/spec.go b/plugins/destination/gcs/client/spec/spec.go index 4d3da2f8a6b32f..de4c5ec5628578 100644 --- a/plugins/destination/gcs/client/spec/spec.go +++ b/plugins/destination/gcs/client/spec/spec.go @@ -21,17 +21,17 @@ type Spec struct { // Otherwise, for every batch a new file will be created with a different `.` suffix. NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` - // This parameter controls the maximum amount of items may be grouped together to be written in a single object. + // Maximum number of items may be grouped together to be written in a single object. // // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` - // This parameter controls the maximum size of items that may be grouped together to be written in a single object. + // Maximum size of items that may be grouped together to be written in a single object. // // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` - // This parameter controls the maximum interval between batch writes. + // Maximum interval between batch writes. // // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` diff --git a/plugins/destination/gcs/docs/overview.md b/plugins/destination/gcs/docs/overview.md index 228cb98d11c9f8..64a8c4bc32b7a4 100644 --- a/plugins/destination/gcs/docs/overview.md +++ b/plugins/destination/gcs/docs/overview.md @@ -57,7 +57,7 @@ This is the (nested) spec used by the CSV destination Plugin. - `batch_timeout` (`duration`) (optional) (default: `30s` (30 seconds)) - Inactivity time before starting a new object. + Maximum interval between batch writes. ### format_spec diff --git a/plugins/destination/meilisearch/docs/overview.md b/plugins/destination/meilisearch/docs/overview.md index 9b789edd98b7d4..47ce0b23d63bf2 100644 --- a/plugins/destination/meilisearch/docs/overview.md +++ b/plugins/destination/meilisearch/docs/overview.md @@ -65,7 +65,7 @@ This is the spec used by the Meilisearch destination plugin. - `batch_size` (`integer`) (optional) (default: `1000`) - Maximum amount of items that may be grouped together to be written in a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `4194304` (= 4 MiB)) @@ -73,7 +73,7 @@ This is the spec used by the Meilisearch destination plugin. - `batch_timeout` (`duration`) (optional) (default: `20s`) - Timeout for writing a single batch. + Maximum interval between batch writes. ## Underlying library diff --git a/plugins/destination/mongodb/client/schema.json b/plugins/destination/mongodb/client/schema.json index e44f558a8c6b60..6ea22b8fde5ae7 100644 --- a/plugins/destination/mongodb/client/schema.json +++ b/plugins/destination/mongodb/client/schema.json @@ -18,7 +18,7 @@ "batch_size": { "type": "integer", "minimum": 1, - "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "description": "Maximum number of items that may be grouped together to be written in a single write.", "default": 1000 }, "batch_size_bytes": { diff --git a/plugins/destination/mongodb/client/spec.go b/plugins/destination/mongodb/client/spec.go index 679225cda5bf85..a0ae60bdcd022a 100644 --- a/plugins/destination/mongodb/client/spec.go +++ b/plugins/destination/mongodb/client/spec.go @@ -17,7 +17,7 @@ type Spec struct { // Database to sync the data to. Database string `json:"database" jsonschema:"required,minLength=1"` - // Maximum amount of items that may be grouped together to be written in a single write. + // Maximum number of items that may be grouped together to be written in a single write. BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` // Maximum size of items that may be grouped together to be written in a single write. diff --git a/plugins/destination/mssql/client/schema.json b/plugins/destination/mssql/client/schema.json index 2c644811062a3f..337225747981b3 100644 --- a/plugins/destination/mssql/client/schema.json +++ b/plugins/destination/mssql/client/schema.json @@ -32,7 +32,7 @@ "batch_size": { "type": "integer", "minimum": 1, - "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "description": "Maximum number of items that may be grouped together to be written in a single write.", "default": 1000 }, "batch_size_bytes": { diff --git a/plugins/destination/mssql/client/spec.go b/plugins/destination/mssql/client/spec.go index 0b239c1700fc9b..0d73b47d5597e1 100644 --- a/plugins/destination/mssql/client/spec.go +++ b/plugins/destination/mssql/client/spec.go @@ -35,7 +35,7 @@ type Spec struct { // By default, Microsoft SQL Server destination plugin will use the [default](https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/ownership-and-user-schema-separation?view=sql-server-ver16#the-dbo-schema) schema named `dbo`. Schema string `json:"schema,omitempty" jsonschema:"default=dbo"` - // Maximum amount of items that may be grouped together to be written in a single write. + // Maximum number of items that may be grouped together to be written in a single write. BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` // Maximum size of items that may be grouped together to be written in a single write. diff --git a/plugins/destination/mssql/docs/configuration.md b/plugins/destination/mssql/docs/configuration.md index a886046dc0b9e1..eed1e411fbd508 100644 --- a/plugins/destination/mssql/docs/configuration.md +++ b/plugins/destination/mssql/docs/configuration.md @@ -45,7 +45,7 @@ This is the (nested) spec used by the Microsoft SQL Server destination plugin. - `batch_timeout` (`duration`) (optional) (default: `20s` (= 20 seconds)) - Timeout for writing a single batch. + Maximum interval between batch writes. ### Verbose logging for debug diff --git a/plugins/destination/mysql/client/schema.json b/plugins/destination/mysql/client/schema.json index 42c1e0ae4efedf..80b62dba46be4f 100644 --- a/plugins/destination/mysql/client/schema.json +++ b/plugins/destination/mysql/client/schema.json @@ -13,7 +13,7 @@ "batch_size": { "type": "integer", "minimum": 1, - "description": "Maximum amount of items that may be grouped together to be written in a single write.", + "description": "Maximum number of items that may be grouped together to be written in a single write.", "default": 1000 }, "batch_size_bytes": { diff --git a/plugins/destination/mysql/client/spec.go b/plugins/destination/mysql/client/spec.go index e82c24a5255de1..a7e50175b485d4 100644 --- a/plugins/destination/mysql/client/spec.go +++ b/plugins/destination/mysql/client/spec.go @@ -14,7 +14,7 @@ type Spec struct { // Connection string to connect to the database. See the [Go driver documentation](https://github.com/go-sql-driver/mysql#dsn-data-source-name) for details. ConnectionString string `json:"connection_string" jsonschema:"required,minLength=1"` - // Maximum amount of items that may be grouped together to be written in a single write. + // Maximum number of items that may be grouped together to be written in a single write. BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=1000"` // Maximum size of items that may be grouped together to be written in a single write. diff --git a/plugins/destination/mysql/docs/configuration.md b/plugins/destination/mysql/docs/configuration.md index 675e4965dc5a41..259d08fd491c52 100644 --- a/plugins/destination/mysql/docs/configuration.md +++ b/plugins/destination/mysql/docs/configuration.md @@ -22,7 +22,7 @@ This is the (nested) spec used by the MySQL destination plugin. - `batch_size` (`integer`) (optional) (default: `1000`) - Maximum amount of items that may be grouped together to be written in a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `4194304` (= 4 MiB)) diff --git a/plugins/destination/postgresql/docs/overview.md b/plugins/destination/postgresql/docs/overview.md index 6661f9a53aa130..34bc3eb479b5e2 100644 --- a/plugins/destination/postgresql/docs/overview.md +++ b/plugins/destination/postgresql/docs/overview.md @@ -52,15 +52,15 @@ This is the (nested) spec used by the PostgreSQL destination Plugin. - `batch_size` (`integer`) (optional) (default: `10000`) - This parameter controls the maximum amount of items may be grouped together to be written as a single write. + Maximum number of items that may be grouped together to be written in a single write. - `batch_size_bytes` (`integer`) (optional) (default: `100000000` (= 100 MB)) - This parameter controls the maximum size of items that may be grouped together to be written as a single write. + Maximum size of items that may be grouped together to be written in a single write. - `batch_timeout` (`duration`) (optional) (default: `60s` (= 60 seconds)) - This parameter controls the timeout for writing a single batch. + Maximum interval between batch writes. ### Verbose logging for debug diff --git a/plugins/destination/s3/docs/overview.md b/plugins/destination/s3/docs/overview.md index eac0eb208003ba..dd2e5f62a2ecd3 100644 --- a/plugins/destination/s3/docs/overview.md +++ b/plugins/destination/s3/docs/overview.md @@ -96,7 +96,7 @@ This is the (nested) spec used by the CSV destination Plugin. - `batch_timeout` (`duration`) (optional) (default: `30s` (30 seconds)) - Inactivity time before starting a new object. + Maximum interval between batch writes. ### format_spec From 7c44f7ab903841acceed7d959c3a066550c3ce8a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:08:20 +0200 Subject: [PATCH 17/78] chore(main): Release plugins-destination-sqlite v2.6.0 (#16365) :robot: I have created a release *beep* *boop* --- ## [2.6.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.5.1...plugins-destination-sqlite-v2.6.0) (2024-02-01) ### Features * Add JSON schema to sqlite destination plugin ([#16396](https://github.com/cloudquery/cloudquery/issues/16396)) ([4bdb544](https://github.com/cloudquery/cloudquery/commit/4bdb544fbc9a0fbff27961cf52e7ff416affe074)) ### Bug Fixes * **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) * **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) --- 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/sqlite/CHANGELOG.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 197a7e2763c9d5..8bcdcaf5a731bc 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -25,7 +25,7 @@ "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "2.2.19", "plugins/destination/test+FILLER": "0.0.0", - "plugins/destination/sqlite": "2.5.1", + "plugins/destination/sqlite": "2.6.0", "plugins/destination/sqlite+FILLER": "0.0.0", "plugins/destination/snowflake": "3.3.12", "plugins/destination/snowflake+FILLER": "0.0.0", diff --git a/plugins/destination/sqlite/CHANGELOG.md b/plugins/destination/sqlite/CHANGELOG.md index 682fa6a5d9e1a2..ac83fd989a6ec9 100644 --- a/plugins/destination/sqlite/CHANGELOG.md +++ b/plugins/destination/sqlite/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [2.6.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.5.1...plugins-destination-sqlite-v2.6.0) (2024-02-01) + + +### Features + +* Add JSON schema to sqlite destination plugin ([#16396](https://github.com/cloudquery/cloudquery/issues/16396)) ([4bdb544](https://github.com/cloudquery/cloudquery/commit/4bdb544fbc9a0fbff27961cf52e7ff416affe074)) + + +### Bug Fixes + +* **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) +* **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) + ## [2.5.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.5.0...plugins-destination-sqlite-v2.5.1) (2024-01-29) From 100bbcdfc7dbed8b58d92096607bdc9ddfa49e08 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Thu, 1 Feb 2024 19:13:13 +0200 Subject: [PATCH 18/78] feat: Add JSON schema to `kafka` destination plugin (#16446) Closes https://github.com/cloudquery/cloudquery/issues/16406 Basically, an adapted version of https://github.com/cloudquery/cloudquery/pull/16404 --- .github/workflows/dest_kafka.yml | 6 + plugins/destination/kafka/Makefile | 10 + plugins/destination/kafka/client/client.go | 15 +- .../destination/kafka/client/client_test.go | 9 +- plugins/destination/kafka/client/spec.go | 47 ---- .../destination/kafka/client/spec/gen/main.go | 35 +++ .../destination/kafka/client/spec/schema.go | 46 ++++ .../destination/kafka/client/spec/schema.json | 226 ++++++++++++++++++ .../kafka/client/spec/schema_test.go | 183 ++++++++++++++ plugins/destination/kafka/client/spec/spec.go | 56 +++++ plugins/destination/kafka/docs/overview.md | 1 + plugins/destination/kafka/go.mod | 6 +- plugins/destination/kafka/main.go | 2 + 13 files changed, 581 insertions(+), 61 deletions(-) delete mode 100644 plugins/destination/kafka/client/spec.go create mode 100644 plugins/destination/kafka/client/spec/gen/main.go create mode 100644 plugins/destination/kafka/client/spec/schema.go create mode 100644 plugins/destination/kafka/client/spec/schema.json create mode 100644 plugins/destination/kafka/client/spec/schema_test.go create mode 100644 plugins/destination/kafka/client/spec/spec.go diff --git a/.github/workflows/dest_kafka.yml b/.github/workflows/dest_kafka.yml index 757a413dcf9c4f..52200e35be1fb2 100644 --- a/.github/workflows/dest_kafka.yml +++ b/.github/workflows/dest_kafka.yml @@ -67,6 +67,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test diff --git a/plugins/destination/kafka/Makefile b/plugins/destination/kafka/Makefile index c957b06653ed16..5c3df7adfed0c8 100644 --- a/plugins/destination/kafka/Makefile +++ b/plugins/destination/kafka/Makefile @@ -7,3 +7,13 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + # required for loading comments from filetypes + go mod vendor + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/kafka/client/client.go b/plugins/destination/kafka/client/client.go index e0df2da9db26ae..2cc6fdc731060f 100644 --- a/plugins/destination/kafka/client/client.go +++ b/plugins/destination/kafka/client/client.go @@ -8,6 +8,7 @@ import ( "time" "github.com/Shopify/sarama" + "github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/rs/zerolog" @@ -20,12 +21,12 @@ type Client struct { producer sarama.SyncProducer logger zerolog.Logger - spec *Spec + spec *spec.Spec *filetypes.Client } -func New(_ context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewClientOptions) (plugin.Client, error) { +func New(_ context.Context, logger zerolog.Logger, s []byte, opts plugin.NewClientOptions) (plugin.Client, error) { c := &Client{ logger: logger.With().Str("module", "dest-kafka").Logger(), } @@ -33,7 +34,7 @@ func New(_ context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewC return c, nil } - if err := json.Unmarshal(spec, &c.spec); err != nil { + if err := json.Unmarshal(s, &c.spec); err != nil { return nil, fmt.Errorf("failed to unmarshal spec: %w", err) } if err := c.spec.Validate(); err != nil { @@ -55,10 +56,10 @@ func New(_ context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewC c.conf.Metadata.Full = true c.conf.ClientID = c.spec.ClientID - if c.spec.SaslUsername != "" { + if c.spec.SASLUsername != "" { c.conf.Net.SASL.Enable = true - c.conf.Net.SASL.User = c.spec.SaslUsername - c.conf.Net.SASL.Password = c.spec.SaslPassword + c.conf.Net.SASL.User = c.spec.SASLUsername + c.conf.Net.SASL.Password = c.spec.SASLPassword c.conf.Net.TLS.Enable = true c.conf.Net.TLS.Config = &tls.Config{InsecureSkipVerify: true} c.conf.Net.SASL.Handshake = true @@ -70,7 +71,7 @@ func New(_ context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewC return nil, err } - filetypesClient, err := filetypes.NewClient(c.spec.FileSpec) + filetypesClient, err := filetypes.NewClient(&c.spec.FileSpec) if err != nil { return nil, fmt.Errorf("failed to create filetypes client: %w", err) } diff --git a/plugins/destination/kafka/client/client_test.go b/plugins/destination/kafka/client/client_test.go index 7c157fcdbfd114..bf2021267bbc48 100644 --- a/plugins/destination/kafka/client/client_test.go +++ b/plugins/destination/kafka/client/client_test.go @@ -7,6 +7,7 @@ import ( "strings" "testing" + "github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/plugin" ) @@ -26,12 +27,12 @@ func getenv(key, fallback string) string { func TestPlugin(t *testing.T) { ctx := context.Background() p := plugin.NewPlugin("kafka", "development", New) - b, err := json.Marshal(&Spec{ + b, err := json.Marshal(&spec.Spec{ Brokers: strings.Split(getenv("CQ_DEST_KAFKA_CONNECTION_STRING", defaultConnectionString), ","), - SaslUsername: getenv("CQ_DEST_KAFKA_SASL_USERNAME", ""), - SaslPassword: getenv("CQ_DEST_KAFKA_SASL_PASSWORD", ""), + SASLUsername: getenv("CQ_DEST_KAFKA_SASL_USERNAME", ""), + SASLPassword: getenv("CQ_DEST_KAFKA_SASL_PASSWORD", ""), Verbose: true, - FileSpec: &filetypes.FileSpec{Format: filetypes.FormatTypeJSON}, + FileSpec: filetypes.FileSpec{Format: filetypes.FormatTypeJSON}, }) if err != nil { t.Fatal(err) diff --git a/plugins/destination/kafka/client/spec.go b/plugins/destination/kafka/client/spec.go deleted file mode 100644 index b65b4708b20b21..00000000000000 --- a/plugins/destination/kafka/client/spec.go +++ /dev/null @@ -1,47 +0,0 @@ -package client - -import ( - "fmt" - - "github.com/cloudquery/filetypes/v4" -) - -type Spec struct { - Brokers []string `json:"brokers,omitempty"` - Verbose bool `json:"verbose,omitempty"` - - SaslUsername string `json:"sasl_username,omitempty"` - SaslPassword string `json:"sasl_password,omitempty"` - - ClientID string `json:"client_id,omitempty"` - - *filetypes.FileSpec - - BatchSize int `json:"batch_size"` -} - -func (s *Spec) SetDefaults() { - if s.FileSpec == nil { - s.FileSpec = &filetypes.FileSpec{} - } - s.FileSpec.SetDefaults() - - if s.ClientID == "" { - s.ClientID = "cq-destination-kafka" - } - - if s.BatchSize == 0 { - s.BatchSize = 1000 - } -} - -func (s *Spec) Validate() error { - if len(s.Brokers) == 0 { - return fmt.Errorf("at least one broker is required") - } - if s.Format == "" { - return fmt.Errorf("format is required") - } - - return nil -} diff --git a/plugins/destination/kafka/client/spec/gen/main.go b/plugins/destination/kafka/client/spec/gen/main.go new file mode 100644 index 00000000000000..4b8f0a96a7011a --- /dev/null +++ b/plugins/destination/kafka/client/spec/gen/main.go @@ -0,0 +1,35 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" + "github.com/cloudquery/filetypes/v4" + "github.com/invopop/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + append(filetypes.FileSpec{}.JSONSchemaOptions(), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec", path.Join(currDir(), "..")), + cqjsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), + func(r *jsonschema.Reflector) { + // not required for this plugin + r.NullableFromType = false + }, + )..., + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/kafka/client/spec/schema.go b/plugins/destination/kafka/client/spec/schema.go new file mode 100644 index 00000000000000..01c80173c7f63a --- /dev/null +++ b/plugins/destination/kafka/client/spec/schema.go @@ -0,0 +1,46 @@ +package spec + +import ( + _ "embed" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" +) + +func (s Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + s.FileSpec.JSONSchemaExtend(sc) // need to call manually + + strValueIsSet := func(property string) *jsonschema.Schema { + return &jsonschema.Schema{ + Title: "`" + property + "` value is set", + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + p := *sc.Properties.Value(property) + p.Default = nil + p.Description = "" + p.MinLength = &([]uint64{1}[0]) + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set(property, &p) + return properties + }(), + Required: []string{property}, + } + } + usernamePresent := strValueIsSet("sasl_username") + passwordPresent := strValueIsSet("sasl_password") + + sc.AllOf = append(sc.AllOf, + &jsonschema.Schema{ + Title: "Require `sasl_password` when `sasl_username` is set", + If: usernamePresent, + Then: passwordPresent, + }, + &jsonschema.Schema{ + Title: "Require `sasl_username` when `sasl_password` is set", + If: passwordPresent, + Then: usernamePresent, + }, + ) +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/kafka/client/spec/schema.json b/plugins/destination/kafka/client/spec/schema.json new file mode 100644 index 00000000000000..4648bbeadaece1 --- /dev/null +++ b/plugins/destination/kafka/client/spec/schema.json @@ -0,0 +1,226 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "CSVSpec": { + "properties": { + "skip_header": { + "type": "boolean", + "description": "Specifies if the first line of a file should be the header.", + "default": false + }, + "delimiter": { + "type": "string", + "pattern": "^.$", + "description": "Character that will be used as the delimiter.", + "default": "," + } + }, + "additionalProperties": false, + "type": "object", + "description": "CloudQuery CSV file output spec." + }, + "JSONSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery JSON file output spec." + }, + "ParquetSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery Parquet file output spec." + }, + "Spec": { + "allOf": [ + { + "if": { + "properties": { + "sasl_username": { + "type": "string", + "minLength": 1 + } + }, + "required": [ + "sasl_username" + ], + "title": "`sasl_username` value is set" + }, + "then": { + "properties": { + "sasl_password": { + "type": "string", + "minLength": 1 + } + }, + "required": [ + "sasl_password" + ], + "title": "`sasl_password` value is set" + }, + "title": "Require `sasl_password` when `sasl_username` is set" + }, + { + "if": { + "properties": { + "sasl_password": { + "type": "string", + "minLength": 1 + } + }, + "required": [ + "sasl_password" + ], + "title": "`sasl_password` value is set" + }, + "then": { + "properties": { + "sasl_username": { + "type": "string", + "minLength": 1 + } + }, + "required": [ + "sasl_username" + ], + "title": "`sasl_username` value is set" + }, + "title": "Require `sasl_username` when `sasl_password` is set" + } + ], + "oneOf": [ + { + "properties": { + "format": { + "type": "string", + "const": "csv" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "json" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/JSONSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "parquet" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/ParquetSpec" + }, + { + "type": "null" + } + ] + } + } + } + ], + "properties": { + "format": { + "type": "string", + "enum": [ + "csv", + "json", + "parquet" + ], + "description": "Output format." + }, + "format_spec": { + "oneOf": [ + { + "anyOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "$ref": "#/$defs/JSONSpec" + }, + { + "$ref": "#/$defs/ParquetSpec" + } + ] + }, + { + "type": "null" + } + ] + }, + "compression": { + "type": "string", + "enum": [ + "", + "gzip" + ], + "description": "Compression type.\nEmpty or missing stands for no compression." + }, + "brokers": { + "items": { + "type": "string", + "minLength": 1 + }, + "type": "array", + "minItems": 1, + "description": "List of brokers to connect to." + }, + "verbose": { + "type": "boolean", + "description": "If `true`, the plugin will log all underlying Kafka client messages to the log." + }, + "sasl_username": { + "type": "string", + "description": "If connecting via SASL/PLAIN, the username to use." + }, + "sasl_password": { + "type": "string", + "description": "If connecting via SASL/PLAIN, the password to use." + }, + "client_id": { + "type": "string", + "description": "Client ID to be set for Kafka API calls.", + "default": "cq-destination-kafka" + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Number of records to write before starting a new object.", + "default": 1000 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "format", + "brokers" + ] + } + } +} diff --git a/plugins/destination/kafka/client/spec/schema_test.go b/plugins/destination/kafka/client/spec/schema_test.go new file mode 100644 index 00000000000000..e91c3640600f0e --- /dev/null +++ b/plugins/destination/kafka/client/spec/schema_test.go @@ -0,0 +1,183 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpecJSONSchema(t *testing.T) { + // cases about embedded filetypes.FileSpec are tested in the corresponding package + // However, we add some tests to verify that it actually is properly working + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "csv file spec", + Spec: `{ + "format": "csv", + "format_spec": { + "skip_header": true, + "delimiter": "#" + }, + "brokers": ["abc"] +}`, + }, + { + Name: "bad format value", // also a part of embedded FileSpec testing + Spec: `{"format": "cs22v", "brokers": ["abc"]}`, + Err: true, + }, + { + Name: "missing brokers", + Spec: `{"format": "csv"}`, + Err: true, + }, + { + Name: "empty brokers", + Spec: `{"format": "csv", "brokers": []}`, + Err: true, + }, + { + Name: "null brokers", + Spec: `{"format": "csv", "brokers": null}`, + Err: true, + }, + { + Name: "integer brokers", + Spec: `{"format": "csv", "brokers": 123}`, + Err: true, + }, + { + Name: "empty brokers value", + Spec: `{"format": "csv", "brokers": [""]}`, + Err: true, + }, + { + Name: "null brokers value", + Spec: `{"format": "csv", "brokers": [null]}`, + Err: true, + }, + { + Name: "integer brokers value", + Spec: `{"format": "csv", "brokers": [123]}`, + Err: true, + }, + { + Name: "proper brokers", + Spec: `{"format": "csv", "brokers": ["abc"]}`, + }, + { + Name: "null verbose", + Spec: `{"format": "csv", "brokers": ["abc"], "verbose": null}`, + Err: true, + }, + { + Name: "integer verbose", + Spec: `{"format": "csv", "brokers": ["abc"], "verbose": 123}`, + Err: true, + }, + { + Name: "verbose:true", + Spec: `{"format": "csv", "brokers": ["abc"], "verbose": true}`, + }, + { + Name: "verbose:false", + Spec: `{"format": "csv", "brokers": ["abc"], "verbose": false}`, + }, + // sasl_username & sasl_password have to go together + { + Name: "empty sasl_username with empty sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "", "sasl_password": ""}`, + }, + { + Name: "non-empty sasl_username with non-empty sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "user", "sasl_password": "password"}`, + }, + { + Name: "non-empty sasl_username without sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "user"}`, + Err: true, + }, + { + Name: "non-empty sasl_username with empty sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "user", "sasl_password": ""}`, + Err: true, + }, + { + Name: "non-empty sasl_username with integer sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "user", "sasl_password": 123}`, + Err: true, + }, + { + Name: "non-empty sasl_username with null sasl_password", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "user", "sasl_password": null}`, + Err: true, + }, + { + Name: "non-empty sasl_password without sasl_username", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_password": "password"}`, + Err: true, + }, + { + Name: "non-empty sasl_password with empty sasl_username", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": "", "sasl_password": "password"}`, + Err: true, + }, + { + Name: "non-empty sasl_password with integer sasl_username", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": 123, "sasl_password": "password"}`, + Err: true, + }, + { + Name: "non-empty sasl_password with null sasl_username", + Spec: `{"format": "csv", "brokers": ["abc"], "sasl_username": null, "sasl_password": "password"}`, + Err: true, + }, + { + Name: "empty client_id", + Spec: `{"format": "csv", "brokers": ["abc"], "client_id": ""}`, + }, + { + Name: "null client_id", + Spec: `{"format": "csv", "brokers": ["abc"], "client_id": null}`, + Err: true, + }, + { + Name: "integer client_id", + Spec: `{"format": "csv", "brokers": ["abc"], "client_id": 123}`, + Err: true, + }, + { + Name: "proper client_id", + Spec: `{"format": "csv", "brokers": ["abc"], "client_id": "abc"}`, + }, + { + Name: "zero batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": 0}`, + Err: true, + }, + { + Name: "float batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": 1.5}`, + Err: true, + }, + { + Name: "negative batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": -1}`, + Err: true, + }, + { + Name: "null batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": null}`, + Err: true, + }, + { + Name: "string batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": "abc"}`, + Err: true, + }, + { + Name: "proper batch_size", + Spec: `{"format": "csv", "brokers": ["abc"], "batch_size": 100}`, + }, + }) +} diff --git a/plugins/destination/kafka/client/spec/spec.go b/plugins/destination/kafka/client/spec/spec.go new file mode 100644 index 00000000000000..5d6d636553047c --- /dev/null +++ b/plugins/destination/kafka/client/spec/spec.go @@ -0,0 +1,56 @@ +package spec + +import ( + "fmt" + + "github.com/cloudquery/filetypes/v4" +) + +type Spec struct { + filetypes.FileSpec + + // List of brokers to connect to. + Brokers []string `json:"brokers,omitempty" jsonschema:"required,minLength=1,minItems=1"` + + // If `true`, the plugin will log all underlying Kafka client messages to the log. + Verbose bool `json:"verbose,omitempty"` + + // If connecting via SASL/PLAIN, the username to use. + SASLUsername string `json:"sasl_username,omitempty"` + + // If connecting via SASL/PLAIN, the password to use. + SASLPassword string `json:"sasl_password,omitempty"` + + // Client ID to be set for Kafka API calls. + ClientID string `json:"client_id,omitempty" jsonschema:"default=cq-destination-kafka"` + + // Number of records to write before starting a new object. + BatchSize int `json:"batch_size" jsonschema:"minimum=1,default=1000"` +} + +func (s *Spec) SetDefaults() { + s.FileSpec.SetDefaults() + + if s.ClientID == "" { + s.ClientID = "cq-destination-kafka" + } + + if s.BatchSize < 1 { + s.BatchSize = 1000 + } +} + +func (s *Spec) Validate() error { + if len(s.Brokers) == 0 { + return fmt.Errorf("at least one broker is required") + } + + // required for s.FileSpec.Validate call + err := s.FileSpec.UnmarshalSpec() + if err != nil { + return err + } + s.FileSpec.SetDefaults() + + return s.FileSpec.Validate() +} diff --git a/plugins/destination/kafka/docs/overview.md b/plugins/destination/kafka/docs/overview.md index f2444f3931e4ae..cae085db0e3966 100644 --- a/plugins/destination/kafka/docs/overview.md +++ b/plugins/destination/kafka/docs/overview.md @@ -20,6 +20,7 @@ This is the (nested) plugin spec - `brokers` (`[]string`) (required) List of brokers to connect to. + - `format` (`string`) (required) Format of the output file. Supported values are `csv`, `json` and `parquet`. diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index f4876150952866..c5af9e605d28d8 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -7,9 +7,12 @@ toolchain go1.21.6 require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 + github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 + github.com/wk8/go-ordered-map/v2 v2.1.8 ) require ( @@ -32,7 +35,6 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect - github.com/cloudquery/codegen v0.3.12 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -65,7 +67,6 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect @@ -115,7 +116,6 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect diff --git a/plugins/destination/kafka/main.go b/plugins/destination/kafka/main.go index bf81ac86f4dabe..77e0436b2c4b11 100644 --- a/plugins/destination/kafka/main.go +++ b/plugins/destination/kafka/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/kafka/client" + "github.com/cloudquery/cloudquery/plugins/destination/kafka/client/spec" internalPlugin "github.com/cloudquery/cloudquery/plugins/destination/kafka/resources/plugin" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -18,6 +19,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(spec.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatalf("failed to serve plugin: %v", err) From 10907cf0e5533cd0829c05486fea2d89694ab1fe Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:16:59 +0200 Subject: [PATCH 19/78] fix(deps): Update dependency @cloudquery/plugin-sdk-javascript to v0.1.5 (#16461) 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 | |---|---|---|---| | [@cloudquery/plugin-sdk-javascript](https://togithub.com/cloudquery/plugin-sdk-javascript) | dependencies | patch | [`0.1.4` -> `0.1.5`](https://renovatebot.com/diffs/npm/@cloudquery%2fplugin-sdk-javascript/0.1.4/0.1.5) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/plugin-sdk-javascript (@​cloudquery/plugin-sdk-javascript) ### [`v0.1.5`](https://togithub.com/cloudquery/plugin-sdk-javascript/blob/HEAD/CHANGELOG.md#015-2024-02-01) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-javascript/compare/v0.1.4...v0.1.5) ##### Bug Fixes - **deps:** Update dependency [@​cloudquery/plugin-pb-javascript](https://togithub.com/cloudquery/plugin-pb-javascript) to ^0.0.14 ([#​132](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/132)) ([2fd4d80](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/2fd4d800bacaaf92f2caf85a07068c0ecdd54f61)) - **deps:** Update dependency [@​grpc/grpc-js](https://togithub.com/grpc/grpc-js) to v1.9.14 ([#​123](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/123)) ([31069d4](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/31069d4e864db6f5801b71b4d35e5ca159857f70)) - **deps:** Update dependency [@​types/luxon](https://togithub.com/types/luxon) to v3.4.2 ([#​128](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/128)) ([1497bf3](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/1497bf344cc664dff86d98ee0d6f30f405e13c79)) - **deps:** Update dependency [@​types/uuid](https://togithub.com/types/uuid) to v9.0.8 ([#​124](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/124)) ([4678570](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/4678570c8866dadc811bb8aff5d3c92739ed0e09)) - **deps:** Update dependency ava to v6.1.1 ([#​129](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/129)) ([45bccb8](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/45bccb83594489bbcf9cfb1b3db65ca8f11519ee)) - **deps:** Update dependency eslint-plugin-n to v16.6.2 ([#​126](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/126)) ([70fcc0b](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/70fcc0bb217f127fa70ffc38814a128c32b50dd8)) - **deps:** Update dependency eslint-plugin-prettier to v5.1.3 ([#​127](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/127)) ([1b67bba](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/1b67bba680f9aaaeb09d2485699de0582ae06268))
--- ### 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/airtable/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/source/airtable/package-lock.json b/plugins/source/airtable/package-lock.json index 6cb8815f035b5b..98e56cf9137fb9 100644 --- a/plugins/source/airtable/package-lock.json +++ b/plugins/source/airtable/package-lock.json @@ -199,9 +199,9 @@ } }, "node_modules/@cloudquery/plugin-pb-javascript": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-pb-javascript/-/plugin-pb-javascript-0.0.13.tgz", - "integrity": "sha512-H/bJ/xZ47xjTZBAL/RUU/etO4/bd4PN/6oziT51myms40ncMZw4wJtQ6LQDFznV+BqQbbDvPsBmyAlkhH+vN8g==", + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-pb-javascript/-/plugin-pb-javascript-0.0.14.tgz", + "integrity": "sha512-D10skSdHwaxKw98mMZYeXnCvZXWBD+2BVyj/fCYdmm3k+rmurkFUrQpCylG+h9ftFiWzItgJI1jCaTyvMt13tg==", "dependencies": { "google-protobuf": "^3.21.2" }, @@ -210,12 +210,12 @@ } }, "node_modules/@cloudquery/plugin-sdk-javascript": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-sdk-javascript/-/plugin-sdk-javascript-0.1.4.tgz", - "integrity": "sha512-aHxowNwaJwfV/HDfh4nKB9/UuhT3EKyhTlabQ0s5ssZllfNgIk3eXbufhbxMe1Y6wSZwaTDaAKURQJdsGSJ/Ww==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-sdk-javascript/-/plugin-sdk-javascript-0.1.5.tgz", + "integrity": "sha512-9MdSf05avJShV6jUkeIuiaLQB0o5+EplrwxwcPgGg2MIH/VrIdxVYNmWIQJldUBqdIx+TQ2frQ+TiexxJwlJcg==", "dependencies": { "@apache-arrow/esnext-esm": "^12.0.1", - "@cloudquery/plugin-pb-javascript": "^0.0.13", + "@cloudquery/plugin-pb-javascript": "^0.0.14", "@grpc/grpc-js": "^1.9.0", "@types/luxon": "^3.3.1", "ajv": "^8.12.0", From 69251a3ff98f21c0e4a8fa1ff4d13877f5aaa40c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:21:33 +0200 Subject: [PATCH 20/78] chore: Update plugin `destination-sqlite` version to v2.6.0 (#16463) Updates the `destination-sqlite` plugin latest version to v2.6.0 --- website/versions/destination-sqlite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-sqlite.json b/website/versions/destination-sqlite.json index 9bf6456c3a3369..39bbd8e6e7c7b2 100644 --- a/website/versions/destination-sqlite.json +++ b/website/versions/destination-sqlite.json @@ -1 +1 @@ -{ "latest": "plugins-destination-sqlite-v2.5.1" } +{ "latest": "plugins-destination-sqlite-v2.6.0" } From 4473be65f3b68bc3aebd65ffeccacea234196d23 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:10:10 -0800 Subject: [PATCH 21/78] chore: Move test source to OSS (#16466) --- .release-please-manifest.json | 2 +- plugins/source/test/CHANGELOG.md | 91 +++++++++++++++++++ plugins/source/test/Makefile | 17 +++- plugins/source/test/client/schema.json | 45 +++++++++ plugins/source/test/client/spec.go | 16 +++- plugins/source/test/client/spec/gen/main.go | 26 ++++++ plugins/source/test/client/spec_test.go | 68 ++++++++++++++ plugins/source/test/docs/tables/README.md | 8 ++ .../test/docs/tables/test_paid_table.md | 17 ++++ .../test/docs/tables/test_some_table.md | 20 ++++ .../source/test/docs/tables/test_sub_table.md | 19 ++++ .../test/docs/tables/test_testdata_table.md | 89 ++++++++++++++++++ plugins/source/test/go.mod | 40 ++++---- plugins/source/test/go.sum | 89 +++++++++--------- .../source/test/resources/plugin/client.go | 68 +++++++++++++- .../source/test/resources/plugin/plugin.go | 2 + .../test/resources/services/paid_table.go | 53 +++++++++++ release-please-config.json | 3 + 18 files changed, 600 insertions(+), 73 deletions(-) create mode 100644 plugins/source/test/client/schema.json create mode 100644 plugins/source/test/client/spec/gen/main.go create mode 100644 plugins/source/test/client/spec_test.go create mode 100644 plugins/source/test/docs/tables/README.md create mode 100644 plugins/source/test/docs/tables/test_paid_table.md create mode 100644 plugins/source/test/docs/tables/test_some_table.md create mode 100644 plugins/source/test/docs/tables/test_sub_table.md create mode 100644 plugins/source/test/docs/tables/test_testdata_table.md create mode 100644 plugins/source/test/resources/services/paid_table.go diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8bcdcaf5a731bc..07eb10e335cec0 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -19,7 +19,7 @@ "plugins/source/okta+FILLER": "0.0.0", "plugins/source/terraform": "3.0.12", "plugins/source/terraform+FILLER": "0.0.0", - "plugins/source/test": "3.1.15", + "plugins/source/test": "4.0.7", "plugins/source/test+FILLER": "0.0.0", "plugins/destination/postgresql": "7.2.0", "plugins/destination/postgresql+FILLER": "0.0.0", diff --git a/plugins/source/test/CHANGELOG.md b/plugins/source/test/CHANGELOG.md index f5fc40d9384ede..74e691c5e7adf3 100644 --- a/plugins/source/test/CHANGELOG.md +++ b/plugins/source/test/CHANGELOG.md @@ -1,5 +1,96 @@ # Changelog +## [4.0.7](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.6...plugins-source-test-v4.0.7) (2024-01-16) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 6d44906 ([#16115](https://github.com/cloudquery/cloudquery-private/issues/16115)) ([8b0ae62](https://github.com/cloudquery/cloudquery-private/commit/8b0ae6266d19a10fe84102837802358f0b9bb1bc)) +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7e703aa ([#16134](https://github.com/cloudquery/cloudquery-private/issues/16134)) ([72d5eb3](https://github.com/cloudquery/cloudquery-private/commit/72d5eb35644ce78d775790b0298a0c7690788d28)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery-private/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery-private/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.2 ([#16130](https://github.com/cloudquery/cloudquery-private/issues/16130)) ([7ae6f41](https://github.com/cloudquery/cloudquery-private/commit/7ae6f41957edb3446ff3175857aaf3dcea2cf5bc)) + +## [4.0.6](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.5...plugins-source-test-v4.0.6) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery-private/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery-private/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery-private/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery-private/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery-private/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery-private/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery-private/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery-private/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery-private/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery-private/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + +## [4.0.5](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.4...plugins-source-test-v4.0.5) (2023-12-29) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#835](https://github.com/cloudquery/cloudquery-private/issues/835)) ([9a1b202](https://github.com/cloudquery/cloudquery-private/commit/9a1b2029d76b9fc05154f14650a2a00d866641de)) + +## [4.0.4](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.3...plugins-source-test-v4.0.4) (2023-12-28) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to bcaeaa8 ([#15791](https://github.com/cloudquery/cloudquery-private/issues/15791)) ([89dc812](https://github.com/cloudquery/cloudquery-private/commit/89dc81201529de2a1fc1ecce5efa74d6f363e57b)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.23.0 ([#15803](https://github.com/cloudquery/cloudquery-private/issues/15803)) ([b6f9373](https://github.com/cloudquery/cloudquery-private/commit/b6f937385020c63ce59b2bc60402752b6c239c6c)) + +## [4.0.3](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.2...plugins-source-test-v4.0.3) (2023-12-26) + + +### Bug Fixes + +* **deps:** Update `github.com/apache/arrow/go` to `v15` ([#15754](https://github.com/cloudquery/cloudquery-private/issues/15754)) ([bd962eb](https://github.com/cloudquery/cloudquery-private/commit/bd962eb1093cf09e928e2a0e7782288ec4020ec4)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.21.0 ([#15651](https://github.com/cloudquery/cloudquery-private/issues/15651)) ([6e96125](https://github.com/cloudquery/cloudquery-private/commit/6e96125a9d9c75616483952edb7a9e402818b264)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.21.1 ([#15699](https://github.com/cloudquery/cloudquery-private/issues/15699)) ([67c10c3](https://github.com/cloudquery/cloudquery-private/commit/67c10c38a04dcdd1512bf6dc739f89bc11baa888)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.21.2 ([#15724](https://github.com/cloudquery/cloudquery-private/issues/15724)) ([ad750b1](https://github.com/cloudquery/cloudquery-private/commit/ad750b1530af06353f2225c7d3397af580093687)) +* **deps:** Update module golang.org/x/crypto to v0.17.0 [SECURITY] ([#15730](https://github.com/cloudquery/cloudquery-private/issues/15730)) ([718be50](https://github.com/cloudquery/cloudquery-private/commit/718be502014ff36aa50cde3a83453b3d6ce15a83)) + +## [4.0.2](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.1...plugins-source-test-v4.0.2) (2023-12-12) + + +### Bug Fixes + +* **deps:** Update golang.org/x/exp digest to 6522937 ([#15518](https://github.com/cloudquery/cloudquery-private/issues/15518)) ([69f9a06](https://github.com/cloudquery/cloudquery-private/commit/69f9a06754b2feb7c73bd5a80d42fd191c7fdb17)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 3a041ad ([#15520](https://github.com/cloudquery/cloudquery-private/issues/15520)) ([b2a322a](https://github.com/cloudquery/cloudquery-private/commit/b2a322a5ec5c1945af5a655c759493a879a9be09)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.19.1 ([#15539](https://github.com/cloudquery/cloudquery-private/issues/15539)) ([a298555](https://github.com/cloudquery/cloudquery-private/commit/a298555343fc7ad483361c2f19c3d39693dab882)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.20.0 ([#15574](https://github.com/cloudquery/cloudquery-private/issues/15574)) ([317dca4](https://github.com/cloudquery/cloudquery-private/commit/317dca4182478d6f3789082ae563d9e8bd417d20)) + +## [4.0.1](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v4.0.0...plugins-source-test-v4.0.1) (2023-12-01) + + +### Bug Fixes + +* When the user is not logged in only fail the sync if paid features are used ([#627](https://github.com/cloudquery/cloudquery-private/issues/627)) ([3944448](https://github.com/cloudquery/cloudquery-private/commit/3944448e15f05eda8ef4ecd4db5c7dc59cdede6d)) + +## [4.0.0](https://github.com/cloudquery/cloudquery-private/compare/plugins-source-test-v3.1.15...plugins-source-test-v4.0.0) (2023-11-28) + + +### This Release has the Following Changes to Tables +- Table `test_paid_table` was added +- Table `test_some_table` was added +- Table `test_sub_table` was added +- Table `test_testdata_table` was added + +### ⚠ BREAKING CHANGES + +* Instrument with usage, add paid table ([#600](https://github.com/cloudquery/cloudquery-private/issues/600)) + +### Features + +* Instrument with usage, add paid table ([#600](https://github.com/cloudquery/cloudquery-private/issues/600)) ([3d0dd23](https://github.com/cloudquery/cloudquery-private/commit/3d0dd2335a6f759fcb8073d96acb72678e4dcc58)) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.4.3 - abandoned ([#409](https://github.com/cloudquery/cloudquery-private/issues/409)) ([6d39ce2](https://github.com/cloudquery/cloudquery-private/commit/6d39ce255f68f4ee875d75e96e6fb1725438223e)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.18.0 ([#15132](https://github.com/cloudquery/cloudquery-private/issues/15132)) ([81ee138](https://github.com/cloudquery/cloudquery-private/commit/81ee138ff86c4b92c3ec93208e0a7e05af2b0036)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.18.1 ([#15263](https://github.com/cloudquery/cloudquery-private/issues/15263)) ([a9a39ef](https://github.com/cloudquery/cloudquery-private/commit/a9a39efe8112a564f21c06ba7627fe6c7ced4cdf)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.18.2 ([#15325](https://github.com/cloudquery/cloudquery-private/issues/15325)) ([77f2db5](https://github.com/cloudquery/cloudquery-private/commit/77f2db52634bad6e56d970d55172b08d823b97c9)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.18.3 ([#15355](https://github.com/cloudquery/cloudquery-private/issues/15355)) ([d8455e5](https://github.com/cloudquery/cloudquery-private/commit/d8455e5ca1059746c7aced395e9bc150ea495591)) +* Trigger release ([ddb0f41](https://github.com/cloudquery/cloudquery-private/commit/ddb0f4135b0b1de7a9d94e0a934109da47648fbd)) + ## [3.1.15](https://github.com/cloudquery/cloudquery/compare/plugins-source-test-v3.1.14...plugins-source-test-v3.1.15) (2023-11-16) diff --git a/plugins/source/test/Makefile b/plugins/source/test/Makefile index 7c636651fe79e3..34ac7a3b76c9b8 100644 --- a/plugins/source/test/Makefile +++ b/plugins/source/test/Makefile @@ -19,9 +19,20 @@ lint: .PHONY: gen-docs gen-docs: build - rm -rf ./docs/tables/* - cloudquery tables --output-dir docs/tables testdata + @command -v cloudquery >/dev/null 2>&1 || { \ + echo "Error: 'cloudquery' command not found. Please install it before running gen-docs."; \ + echo "You can install it by following the instructions at: https://www.cloudquery.io/docs/quickstart"; \ + exit 1; \ + } + + rm -rf docs/tables + cloudquery tables --format markdown --output-dir docs testdata/config.yml + mv docs/$(shell basename $(CURDIR)) docs/tables + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go # All gen targets .PHONY: gen -gen: gen-docs +gen: gen-spec-schema gen-docs diff --git a/plugins/source/test/client/schema.json b/plugins/source/test/client/schema.json new file mode 100644 index 00000000000000..3900a7dbebe331 --- /dev/null +++ b/plugins/source/test/client/schema.json @@ -0,0 +1,45 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/source/test/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "num_clients": { + "type": "integer", + "minimum": 1, + "description": "Number of clients to create", + "default": 1 + }, + "num_rows": { + "oneOf": [ + { + "type": "integer", + "minimum": 0, + "description": "Number of rows to generate in test_some_table.", + "default": 1 + }, + { + "type": "null" + } + ] + }, + "num_sub_rows": { + "oneOf": [ + { + "type": "integer", + "minimum": 0, + "description": "Number of rows to generate (per row of parent) in test_sub_table.", + "default": 10 + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + } + } +} diff --git a/plugins/source/test/client/spec.go b/plugins/source/test/client/spec.go index 92486184c543e0..dd030554fe2d0a 100644 --- a/plugins/source/test/client/spec.go +++ b/plugins/source/test/client/spec.go @@ -1,11 +1,21 @@ package client +import _ "embed" + type Spec struct { - NumClients int `json:"num_clients"` // Number of clients to create. Default: 1 - NumRows *int `json:"num_rows"` // Number of rows to generate in test_some_table. Defaul: 1 - NumSubRows *int `json:"num_sub_rows"` // Number of rows to generate (per row of parent) in test_sub_table. Default: 10 + // Number of clients to create + NumClients int `json:"num_clients" jsonschema:"minimum=1,default=1"` + + // Number of rows to generate in test_some_table. + NumRows *int `json:"num_rows" jsonschema:"minimum=0,default=1"` + + // Number of rows to generate (per row of parent) in test_sub_table. + NumSubRows *int `json:"num_sub_rows" jsonschema:"minimum=0,default=10"` } +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults() { if s.NumClients <= 0 { s.NumClients = 1 diff --git a/plugins/source/test/client/spec/gen/main.go b/plugins/source/test/client/spec/gen/main.go new file mode 100644 index 00000000000000..a2afeda83aa50c --- /dev/null +++ b/plugins/source/test/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/source/test/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/source/test/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/source/test/client/spec_test.go b/plugins/source/test/client/spec_test.go new file mode 100644 index 00000000000000..4f5171b3dde92b --- /dev/null +++ b/plugins/source/test/client/spec_test.go @@ -0,0 +1,68 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + }, + { + Name: "spec with valid num_clients", + Spec: `{"num_clients": 10}`, + }, + { + Name: "spec with null num_clients", + Spec: `{"num_clients": null}`, + Err: true, + }, + { + Name: "spec with bad num_clients", + Spec: `{"num_clients": 0}`, + Err: true, + }, + { + Name: "spec with bool num_clients", + Spec: `{"num_clients": true}`, + Err: true, + }, + { + Name: "spec with str num_clients", + Spec: `{"num_clients": "abc"}`, + Err: true, + }, + { + Name: "spec with array num_clients", + Spec: `{"num_clients": [0]}`, + Err: true, + }, + { + Name: "spec with num_rows", + Spec: `{"num_rows":7}`, + }, + { + Name: "spec with negative num_rows", + Spec: `{"num_rows":-7}`, + Err: true, + }, + { + Name: "spec with str num_rows", + Spec: `{"num_rows":"abc"}`, + Err: true, + }, + { + Name: "spec with null num_rows", + Spec: `{"num_rows":null}`, + }, + { + Name: "spec with unknown field", + Spec: `{"unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/source/test/docs/tables/README.md b/plugins/source/test/docs/tables/README.md new file mode 100644 index 00000000000000..2be597849e5c9f --- /dev/null +++ b/plugins/source/test/docs/tables/README.md @@ -0,0 +1,8 @@ +# Source Plugin: test + +## Tables + +- [test_paid_table](test_paid_table.md) +- [test_some_table](test_some_table.md) + - [test_sub_table](test_sub_table.md) +- [test_testdata_table](test_testdata_table.md) \ No newline at end of file diff --git a/plugins/source/test/docs/tables/test_paid_table.md b/plugins/source/test/docs/tables/test_paid_table.md new file mode 100644 index 00000000000000..d421a2898cfbda --- /dev/null +++ b/plugins/source/test/docs/tables/test_paid_table.md @@ -0,0 +1,17 @@ +# Table: test_paid_table + +This is a premium table. To sync this table you must be logged in via `cloudquery login` or you must use a valid API Key which can be generated at `cloud.cloudquery.io` + +Test Paid table + +The composite primary key for this table is (**resource_id**, **client_id**). + +## Columns + +| Name | Type | +| ------------- | ------------- | +|_cq_id|`uuid`| +|_cq_parent_id|`uuid`| +|resource_id (PK)|`int64`| +|column2|`utf8`| +|client_id (PK)|`int64`| \ No newline at end of file diff --git a/plugins/source/test/docs/tables/test_some_table.md b/plugins/source/test/docs/tables/test_some_table.md new file mode 100644 index 00000000000000..0d79ba525aca2c --- /dev/null +++ b/plugins/source/test/docs/tables/test_some_table.md @@ -0,0 +1,20 @@ +# Table: test_some_table + +Test table + +The composite primary key for this table is (**resource_id**, **client_id**). + +## Relations + +The following tables depend on test_some_table: + - [test_sub_table](test_sub_table.md) + +## Columns + +| Name | Type | +| ------------- | ------------- | +|_cq_id|`uuid`| +|_cq_parent_id|`uuid`| +|resource_id (PK)|`int64`| +|column2|`utf8`| +|client_id (PK)|`int64`| \ No newline at end of file diff --git a/plugins/source/test/docs/tables/test_sub_table.md b/plugins/source/test/docs/tables/test_sub_table.md new file mode 100644 index 00000000000000..5662229a27fec2 --- /dev/null +++ b/plugins/source/test/docs/tables/test_sub_table.md @@ -0,0 +1,19 @@ +# Table: test_sub_table + +Sub table of test_some_table + +The composite primary key for this table is (**parent_resource_id**, **sub_resource_id**). + +## Relations + +This table depends on [test_some_table](test_some_table.md). + +## Columns + +| Name | Type | +| ------------- | ------------- | +|_cq_id|`uuid`| +|_cq_parent_id|`uuid`| +|parent_resource_id (PK)|`int64`| +|sub_resource_id (PK)|`int64`| +|data_column|`utf8`| \ No newline at end of file diff --git a/plugins/source/test/docs/tables/test_testdata_table.md b/plugins/source/test/docs/tables/test_testdata_table.md new file mode 100644 index 00000000000000..5d6212f1363afb --- /dev/null +++ b/plugins/source/test/docs/tables/test_testdata_table.md @@ -0,0 +1,89 @@ +# Table: test_testdata_table + +Testdata table + +The primary key for this table is **_cq_id**. + +## Columns + +| Name | Type | +| ------------- | ------------- | +|_cq_id (PK)|`uuid`| +|_cq_parent_id|`uuid`| +|int8|`int8`| +|int16|`int16`| +|int32|`int32`| +|int64|`int64`| +|uint8|`uint8`| +|uint16|`uint16`| +|uint32|`uint32`| +|uint64|`uint64`| +|float32|`float32`| +|float64|`float64`| +|binary|`binary`| +|string|`utf8`| +|boolean|`bool`| +|uuid|`uuid`| +|inet|`inet`| +|mac|`mac`| +|json|`json`| +|date32|`date32`| +|date64|`date64`| +|duration_s|`duration[s]`| +|duration_ms|`duration[ms]`| +|duration_us|`duration[us]`| +|duration_ns|`duration[ns]`| +|interval_month|`month_interval`| +|interval_day_time|`day_time_interval`| +|interval_month_day_nano|`month_day_nano_interval`| +|large_binary|`large_binary`| +|large_string|`large_utf8`| +|time32_s|`time32[s]`| +|time32_ms|`time32[ms]`| +|time64_us|`time64[us]`| +|time64_ns|`time64[ns]`| +|timestamp_s|`timestamp[s, tz=UTC]`| +|timestamp_ms|`timestamp[ms, tz=UTC]`| +|timestamp_us|`timestamp[us, tz=UTC]`| +|timestamp_ns|`timestamp[ns, tz=UTC]`| +|decimal128|`decimal(19, 10)`| +|struct|`struct`| +|id_list|`list`| +|int8_list|`list`| +|int16_list|`list`| +|int32_list|`list`| +|int64_list|`list`| +|uint8_list|`list`| +|uint16_list|`list`| +|uint32_list|`list`| +|uint64_list|`list`| +|float32_list|`list`| +|float64_list|`list`| +|binary_list|`list`| +|string_list|`list`| +|boolean_list|`list`| +|uuid_list|`list`| +|inet_list|`list`| +|mac_list|`list`| +|date32_list|`list`| +|date64_list|`list`| +|duration_s_list|`list`| +|duration_ms_list|`list`| +|duration_us_list|`list`| +|duration_ns_list|`list`| +|interval_month_list|`list`| +|interval_day_time_list|`list`| +|interval_month_day_nano_list|`list`| +|large_binary_list|`list`| +|large_string_list|`list`| +|time32_s_list|`list`| +|time32_ms_list|`list`| +|time64_us_list|`list`| +|time64_ns_list|`list`| +|timestamp_s_list|`list`| +|timestamp_ms_list|`list`| +|timestamp_us_list|`list`| +|timestamp_ns_list|`list`| +|decimal128_list|`list`| +|struct_list|`list, nullable>`| +|client_id|`int64`| \ No newline at end of file diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 874a4ca9780610..a29d1c5b240303 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -4,7 +4,8 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/cloudquery/plugin-sdk/v4 v4.29.1 + github.com/cloudquery/codegen v0.3.12 + github.com/cloudquery/plugin-sdk/v4 v4.28.0 github.com/rs/zerolog v1.31.0 ) @@ -15,7 +16,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.1.0 // indirect + github.com/andybalholm/brotli v1.0.6 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -25,8 +26,8 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect - github.com/cloudquery/plugin-pb-go v1.16.7 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.6 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect @@ -58,11 +59,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.10 // indirect + github.com/kataras/iris/v12 v12.2.8 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.5 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -75,7 +76,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.19 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -84,8 +85,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.16 // indirect - github.com/tdewolff/parse/v2 v2.7.11 // indirect + github.com/tdewolff/minify/v2 v2.20.10 // indirect + github.com/tdewolff/parse/v2 v2.7.7 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect @@ -104,21 +105,24 @@ require ( go.opentelemetry.io/otel/trace v1.20.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/arch v0.6.0 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect + golang.org/x/crypto v0.17.0 // indirect + golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sync v0.5.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.16.1 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/grpc v1.60.1 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index f5d263952cffa3..1b105b4a69e8f3 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= -github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= +github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,14 +45,18 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= -github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= -github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= +github.com/cloudquery/cloudquery-api-go v1.7.0 h1:9da/fBNcKnJGTKF3LFoKIMUwfnzhMCsp5RjIOSxCU7s= +github.com/cloudquery/cloudquery-api-go v1.7.0/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/plugin-pb-go v1.16.6 h1:UcN7UK89EWxh9SRGCIPQ/Ao2YB5zVugvBtF8ii536ig= +github.com/cloudquery/plugin-pb-go v1.16.6/go.mod h1:/dnO/uBQGZlTvbYDPEvSt5J30ciN6DEDrQ8Jy4MKcIM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= -github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= +github.com/cloudquery/plugin-sdk/v4 v4.28.0 h1:rX0VdS/qQCWBhaYC+b1LlaCQYZ1IKi/WsgDZt+SVBdM= +github.com/cloudquery/plugin-sdk/v4 v4.28.0/go.mod h1:LKyp3rdmidWzgf8dB9LWbz0e+03R3hXuaMzGY71vU9U= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -117,8 +121,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= -github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -128,8 +132,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= @@ -143,16 +145,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= -github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= +github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= +github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= -github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -191,8 +193,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= +github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -235,13 +237,12 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= -github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= -github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= -github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= +github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= +github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= +github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= -github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= -github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -296,10 +297,10 @@ golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4= +golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -307,12 +308,12 @@ golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -325,8 +326,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -338,8 +339,8 @@ golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -348,18 +349,18 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= -google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= -google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/plugins/source/test/resources/plugin/client.go b/plugins/source/test/resources/plugin/client.go index 60d6997c65680e..7d5a5762271a75 100644 --- a/plugins/source/test/resources/plugin/client.go +++ b/plugins/source/test/resources/plugin/client.go @@ -9,6 +9,7 @@ import ( "github.com/cloudquery/cloudquery/plugins/source/test/resources/services" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" + "github.com/cloudquery/plugin-sdk/v4/premium" "github.com/cloudquery/plugin-sdk/v4/scheduler" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/cloudquery/plugin-sdk/v4/transformers" @@ -17,23 +18,46 @@ import ( type Client struct { logger zerolog.Logger + options plugin.NewClientOptions config client.Spec tables schema.Tables scheduler *scheduler.Scheduler plugin.UnimplementedDestination + usage premium.UsageClient } func (c *Client) Logger() *zerolog.Logger { return &c.logger } +func hasPaidTables(tt schema.Tables) bool { + flattenedTables := tt.FlattenTables() + for _, t := range flattenedTables { + if t.IsPaid { + return true + } + } + return false +} + func (c *Client) Sync(ctx context.Context, options plugin.SyncOptions, res chan<- message.SyncMessage) error { tt, err := c.tables.FilterDfs(options.Tables, options.SkipTables, options.SkipDependentTables) if err != nil { return err } + if hasPaidTables(tt) { + c.usage, err = premium.NewUsageClient(c.options.PluginMeta, premium.WithLogger(c.logger)) + if err != nil { + return fmt.Errorf("failed to initialize usage client: %w", err) + } + ctx, err = premium.WithCancelOnQuotaExceeded(ctx, c.usage) + if err != nil { + return fmt.Errorf("failed to configure quota monitor: %w", err) + } + } + schedulerClient := &client.Client{ Logger: c.logger, Spec: c.config, @@ -58,8 +82,9 @@ func (*Client) Close(_ context.Context) error { func Configure(_ context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewClientOptions) (plugin.Client, error) { if opts.NoConnection { return &Client{ - logger: logger, - tables: getTables(), + logger: logger, + options: opts, + tables: getTables(), }, nil } @@ -73,8 +98,9 @@ func Configure(_ context.Context, logger zerolog.Logger, spec []byte, opts plugi } return &Client{ - logger: logger, - config: *config, + logger: logger, + options: opts, + config: *config, scheduler: scheduler.NewScheduler( scheduler.WithLogger(logger), ), @@ -86,6 +112,7 @@ func getTables() schema.Tables { tables := schema.Tables{ services.TestSomeTable(), services.TestDataTable(), + services.TestPaidTable(), } if err := transformers.TransformTables(tables); err != nil { panic(err) @@ -95,3 +122,36 @@ func getTables() schema.Tables { } return tables } + +// OnBeforeSend increases the usage count for every message. If some messages should not be counted, +// they can be ignored here. +func (c *Client) OnBeforeSend(_ context.Context, msg message.SyncMessage) (message.SyncMessage, error) { + if c.usage == nil { + return msg, nil + } + + si, ok := msg.(*message.SyncInsert) + if !ok { + return msg, nil + } + + // now we need to determine whether the table used for sync was paid + isPaid, ok := si.Record.Schema().Metadata().GetValue(schema.MetadataTableIsPaid) + if !ok || isPaid != schema.MetadataTrue { + return msg, nil + } + + if err := c.usage.Increase(uint32(si.Record.NumRows())); err != nil { + return msg, fmt.Errorf("failed to increase usage: %w", err) + } + + return msg, nil +} + +// OnSyncFinish is used to ensure the final usage count gets reported +func (c *Client) OnSyncFinish(_ context.Context) error { + if c.usage != nil { + return c.usage.Close() + } + return nil +} diff --git a/plugins/source/test/resources/plugin/plugin.go b/plugins/source/test/resources/plugin/plugin.go index 22dd1f83579c3d..bdfd41d8f19890 100644 --- a/plugins/source/test/resources/plugin/plugin.go +++ b/plugins/source/test/resources/plugin/plugin.go @@ -1,6 +1,7 @@ package plugin import ( + "github.com/cloudquery/cloudquery/plugins/source/test/client" "github.com/cloudquery/plugin-sdk/v4/plugin" ) @@ -18,5 +19,6 @@ func Plugin() *plugin.Plugin { Configure, plugin.WithKind(Kind), plugin.WithTeam(Team), + plugin.WithJSONSchema(client.JSONSchema), ) } diff --git a/plugins/source/test/resources/services/paid_table.go b/plugins/source/test/resources/services/paid_table.go new file mode 100644 index 00000000000000..6ec51ecae75ff9 --- /dev/null +++ b/plugins/source/test/resources/services/paid_table.go @@ -0,0 +1,53 @@ +package services + +import ( + "context" + "fmt" + + "github.com/apache/arrow/go/v15/arrow" + "github.com/cloudquery/cloudquery/plugins/source/test/client" + "github.com/cloudquery/plugin-sdk/v4/schema" +) + +func TestPaidTable() *schema.Table { + return &schema.Table{ + Name: "test_paid_table", + Description: "Test Paid table", + Resolver: fetchPaidTableData, + Multiplex: client.MultiplexBySpec, + IsPaid: true, + Columns: []schema.Column{ + { + Name: "resource_id", + Description: "Resource ID", + Type: arrow.PrimitiveTypes.Int64, + Resolver: schema.PathResolver("resource_id"), + PrimaryKey: true, + }, + { + Name: "column2", + Description: "Test Column 2", + Type: arrow.BinaryTypes.String, + Resolver: schema.PathResolver("column2"), + }, + { + Name: "client_id", + Description: "ID of client", + Type: arrow.PrimitiveTypes.Int64, + Resolver: client.ResolveClientID, + PrimaryKey: true, + }, + }, + } +} + +func fetchPaidTableData(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { + cl := meta.(*client.Client) + for i := 0; i < *cl.Spec.NumRows; i++ { + res <- map[string]any{ + "resource_id": i + 1, + "column2": fmt.Sprintf("test_column_data_%d", i%3), + } + } + return nil +} diff --git a/release-please-config.json b/release-please-config.json index cfdcbe80535552..fb185d8f194e19 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -121,6 +121,9 @@ "component": "plugins-source-square", "release-type": "python" }, + "plugins/source/test": { + "component": "plugins-source-test" + }, "plugins/source/typeform": { "component": "plugins-source-typeform", "extra-files": [ From 44a20dfa3629cc55f0acb5d6607dfc3391f0e4d2 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:14:16 +0200 Subject: [PATCH 22/78] chore(main): Release plugins-source-airtable v2.0.2 (#16464) :robot: I have created a release *beep* *boop* --- ## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-airtable-v2.0.1...plugins-source-airtable-v2.0.2) (2024-02-01) ### Bug Fixes * **deps:** Update dependency @cloudquery/plugin-sdk-javascript to v0.1.5 ([#16461](https://github.com/cloudquery/cloudquery/issues/16461)) ([10907cf](https://github.com/cloudquery/cloudquery/commit/10907cf0e5533cd0829c05486fea2d89694ab1fe)) --- 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/airtable/CHANGELOG.md | 7 +++++++ plugins/source/airtable/package-lock.json | 4 ++-- plugins/source/airtable/package.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 07eb10e335cec0..7019e8bd589208 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -99,7 +99,7 @@ "plugins/source/jira+FILLER": "0.0.0", "plugins/source/vault": "1.0.8", "plugins/source/vault+FILLER": "0.0.0", - "plugins/source/airtable": "2.0.1", + "plugins/source/airtable": "2.0.2", "plugins/source/airtable+FILLER": "0.0.0", "plugins/source/bitbucket": "1.0.5", "plugins/source/bitbucket+FILLER": "0.0.0", diff --git a/plugins/source/airtable/CHANGELOG.md b/plugins/source/airtable/CHANGELOG.md index 4e32e54f51f4bb..ddc674a8ba23b5 100644 --- a/plugins/source/airtable/CHANGELOG.md +++ b/plugins/source/airtable/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.0.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-airtable-v2.0.1...plugins-source-airtable-v2.0.2) (2024-02-01) + + +### Bug Fixes + +* **deps:** Update dependency @cloudquery/plugin-sdk-javascript to v0.1.5 ([#16461](https://github.com/cloudquery/cloudquery/issues/16461)) ([10907cf](https://github.com/cloudquery/cloudquery/commit/10907cf0e5533cd0829c05486fea2d89694ab1fe)) + ## [2.0.1](https://github.com/cloudquery/cloudquery/compare/plugins-source-airtable-v2.0.0...plugins-source-airtable-v2.0.1) (2024-01-15) diff --git a/plugins/source/airtable/package-lock.json b/plugins/source/airtable/package-lock.json index 98e56cf9137fb9..6fffe28611517e 100644 --- a/plugins/source/airtable/package-lock.json +++ b/plugins/source/airtable/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cloudquery/cq-source-airtable", - "version": "2.0.1", + "version": "2.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cloudquery/cq-source-airtable", - "version": "2.0.1", + "version": "2.0.2", "license": "MPL-2.0", "dependencies": { "@cloudquery/plugin-sdk-javascript": "^0.1.0", diff --git a/plugins/source/airtable/package.json b/plugins/source/airtable/package.json index 9ba06b77c0de50..22cb5cb2e6511c 100644 --- a/plugins/source/airtable/package.json +++ b/plugins/source/airtable/package.json @@ -1,6 +1,6 @@ { "name": "@cloudquery/cq-source-airtable", - "version": "2.0.1", + "version": "2.0.2", "description": "A CloudQuery source plugin to sync data from Airtable", "keywords": [ "nodejs", From d76eef19cd2e5aa76de6101d2d5ff00f0e54cedc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:19:06 +0200 Subject: [PATCH 23/78] fix(deps): Update dependency cloudquery-plugin-sdk to v0.1.13 (#16462) 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-plugin-sdk](https://togithub.com/cloudquery/plugin-sdk-python) | patch | `==0.1.12` -> `==0.1.13` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/plugin-sdk-python (cloudquery-plugin-sdk) ### [`v0.1.13`](https://togithub.com/cloudquery/plugin-sdk-python/blob/HEAD/CHANGELOG.md#0113-2024-02-01) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-python/compare/v0.1.12...v0.1.13) ##### Bug Fixes - **deps:** Update dependency black to v24 ([#​123](https://togithub.com/cloudquery/plugin-sdk-python/issues/123)) ([e1b23d1](https://togithub.com/cloudquery/plugin-sdk-python/commit/e1b23d1eded0b79c96c1efafb6a375b298bbb804)) - **deps:** Update dependency cloudquery-plugin-pb to v0.0.22 ([#​124](https://togithub.com/cloudquery/plugin-sdk-python/issues/124)) ([4f9be1b](https://togithub.com/cloudquery/plugin-sdk-python/commit/4f9be1b312994aa5616a22393f04d1b3a2270442)) - **deps:** Update dependency Jinja2 to v3.1.3 ([#​115](https://togithub.com/cloudquery/plugin-sdk-python/issues/115)) ([76cfae9](https://togithub.com/cloudquery/plugin-sdk-python/commit/76cfae9aafbacbe42b0dec9b6d9fd5cc043e9165)) - **deps:** Update dependency MarkupSafe to v2.1.4 ([#​116](https://togithub.com/cloudquery/plugin-sdk-python/issues/116)) ([2d6eb79](https://togithub.com/cloudquery/plugin-sdk-python/commit/2d6eb795f401f81b1706fa9c9cddc834acf1dbc3)) - **deps:** Update dependency numpy to v1.26.3 ([#​118](https://togithub.com/cloudquery/plugin-sdk-python/issues/118)) ([8bc822f](https://togithub.com/cloudquery/plugin-sdk-python/commit/8bc822f9b16f27126d1ec32d2f15b9b17bb78afb)) - **deps:** Update dependency pandas to v2.2.0 ([#​120](https://togithub.com/cloudquery/plugin-sdk-python/issues/120)) ([b6c82e9](https://togithub.com/cloudquery/plugin-sdk-python/commit/b6c82e98ad6a30578b39eba113dcfb1de77b3319)) - **deps:** Update dependency pluggy to v1.4.0 ([#​121](https://togithub.com/cloudquery/plugin-sdk-python/issues/121)) ([50d44e6](https://togithub.com/cloudquery/plugin-sdk-python/commit/50d44e690d37e5f29789d4d410c3d54493e0b9db)) - **deps:** Update dependency protobuf to v4.25.2 ([#​119](https://togithub.com/cloudquery/plugin-sdk-python/issues/119)) ([a907a5d](https://togithub.com/cloudquery/plugin-sdk-python/commit/a907a5d55ba57a9159e928509aa671eb7c7b4b2c)) - **deps:** Update dependency pytz to v2023.4 ([#​122](https://togithub.com/cloudquery/plugin-sdk-python/issues/122)) ([8eed670](https://togithub.com/cloudquery/plugin-sdk-python/commit/8eed6702fdba75b3d1522924f0c6cb41a1d4cf48))
--- ### 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/square/requirements.txt | 4 ++-- plugins/source/typeform/requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/square/requirements.txt b/plugins/source/square/requirements.txt index 9020e3f9a2c054..356c9a0a7ad4da 100644 --- a/plugins/source/square/requirements.txt +++ b/plugins/source/square/requirements.txt @@ -1,5 +1,5 @@ -black==23.12.1 -cloudquery-plugin-sdk==0.1.12 +black==24.1.1 +cloudquery-plugin-sdk==0.1.13 pyarrow==14.0.2 squareup==29.0.0.20230720 pytest==7.4.4 diff --git a/plugins/source/typeform/requirements.txt b/plugins/source/typeform/requirements.txt index 3898ef8f1db9f0..1add6c5efb05c4 100644 --- a/plugins/source/typeform/requirements.txt +++ b/plugins/source/typeform/requirements.txt @@ -1,5 +1,5 @@ -cloudquery-plugin-sdk==0.1.12 +cloudquery-plugin-sdk==0.1.13 pyarrow==14.0.2 requests==2.31.0 pytest==7.4.4 -pandas==2.1.4 +pandas==2.2.0 From ec9f00edca3586bf2e92fea54cc94777f38b9cba Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:23:55 +0200 Subject: [PATCH 24/78] chore(main): Release plugins-destination-duckdb v5.1.0 (#16363) :robot: I have created a release *beep* *boop* --- ## [5.1.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.12...plugins-destination-duckdb-v5.1.0) (2024-02-01) ### Features * Add JSON schema to DuckDB destination plugin ([#16372](https://github.com/cloudquery/cloudquery/issues/16372)) ([1ace351](https://github.com/cloudquery/cloudquery/commit/1ace3516342dd8a9e663b02b47e3edf28811de34)) ### Bug Fixes * **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) * **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) --- 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/duckdb/CHANGELOG.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7019e8bd589208..bb5ff2f91ebb7c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -79,7 +79,7 @@ "plugins/destination/firehose+FILLER": "0.0.0", "plugins/source/awspricing": "3.0.18", "plugins/source/awspricing+FILLER": "0.0.0", - "plugins/destination/duckdb": "5.0.12", + "plugins/destination/duckdb": "5.1.0", "plugins/destination/duckdb+FILLER": "0.0.0", "plugins/source/mysql": "2.0.12", "plugins/source/mysql+FILLER": "0.0.0", diff --git a/plugins/destination/duckdb/CHANGELOG.md b/plugins/destination/duckdb/CHANGELOG.md index 6347ec2dc64863..bbf535b805b208 100644 --- a/plugins/destination/duckdb/CHANGELOG.md +++ b/plugins/destination/duckdb/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [5.1.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.12...plugins-destination-duckdb-v5.1.0) (2024-02-01) + + +### Features + +* Add JSON schema to DuckDB destination plugin ([#16372](https://github.com/cloudquery/cloudquery/issues/16372)) ([1ace351](https://github.com/cloudquery/cloudquery/commit/1ace3516342dd8a9e663b02b47e3edf28811de34)) + + +### Bug Fixes + +* **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) +* **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) + ## [5.0.12](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.11...plugins-destination-duckdb-v5.0.12) (2024-01-29) From 3a68f8fb50aaf30490751c86e1212ae1f790b054 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:29:49 +0200 Subject: [PATCH 25/78] fix(deps): Update module github.com/cloudquery/plugin-pb-go to v1.16.8 (#16467) 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-pb-go](https://togithub.com/cloudquery/plugin-pb-go) | require | patch | `v1.16.7` -> `v1.16.8` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/plugin-pb-go (github.com/cloudquery/plugin-pb-go) ### [`v1.16.8`](https://togithub.com/cloudquery/plugin-pb-go/releases/tag/v1.16.8) [Compare Source](https://togithub.com/cloudquery/plugin-pb-go/compare/v1.16.7...v1.16.8) ##### Bug Fixes - **deps:** Update golang.org/x/exp digest to [`1b97071`](https://togithub.com/cloudquery/plugin-pb-go/commit/1b97071) ([#​227](https://togithub.com/cloudquery/plugin-pb-go/issues/227)) ([8555093](https://togithub.com/cloudquery/plugin-pb-go/commit/8555093ff259ac3d2700dbe766ca4e482fa39ed4)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`1f4bbc5`](https://togithub.com/cloudquery/plugin-pb-go/commit/1f4bbc5) ([#​228](https://togithub.com/cloudquery/plugin-pb-go/issues/228)) ([7879be4](https://togithub.com/cloudquery/plugin-pb-go/commit/7879be46f8dd0601b949cf96e956b00ae322ef48)) - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.2 ([#​225](https://togithub.com/cloudquery/plugin-pb-go/issues/225)) ([f6241c0](https://togithub.com/cloudquery/plugin-pb-go/commit/f6241c092fd810167682c21f8ed3af36ecec9f98)) - **deps:** Update module github.com/docker/docker to v24.0.8+incompatible ([#​229](https://togithub.com/cloudquery/plugin-pb-go/issues/229)) ([07bf3a9](https://togithub.com/cloudquery/plugin-pb-go/commit/07bf3a9e08bf0f1c741f377d6bc12341d6fea0b8)) - **deps:** Update module github.com/kataras/iris/v12 to v12.2.10 ([#​230](https://togithub.com/cloudquery/plugin-pb-go/issues/230)) ([5396892](https://togithub.com/cloudquery/plugin-pb-go/commit/5396892a5fefe2cec4c994ef96be9be2ff3f1718)) - **deps:** Update module github.com/klauspost/compress to v1.17.5 ([#​231](https://togithub.com/cloudquery/plugin-pb-go/issues/231)) ([51a1e22](https://togithub.com/cloudquery/plugin-pb-go/commit/51a1e22ee1806e01e659be6f34d5747fb9120ff9)) - **deps:** Update module github.com/pierrec/lz4/v4 to v4.1.21 ([#​232](https://togithub.com/cloudquery/plugin-pb-go/issues/232)) ([53a35b6](https://togithub.com/cloudquery/plugin-pb-go/commit/53a35b692f200b62aa20799658afa475bbf93692)) - **deps:** Update module github.com/tdewolff/minify/v2 to v2.20.16 ([#​233](https://togithub.com/cloudquery/plugin-pb-go/issues/233)) ([d8d3d36](https://togithub.com/cloudquery/plugin-pb-go/commit/d8d3d360363ed86d70b051b84787d393502a8d9e)) - **deps:** Update module github.com/tdewolff/parse/v2 to v2.7.11 ([#​234](https://togithub.com/cloudquery/plugin-pb-go/issues/234)) ([190ea48](https://togithub.com/cloudquery/plugin-pb-go/commit/190ea48ccd843999b24c158b794b3154c657cfeb))
--- ### 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 | 4 ++-- cli/go.sum | 8 ++++---- scaffold/cmd/templates/source/go.mod.tpl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index aaf1afc28065de..9e7a0a6030150c 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -8,11 +8,11 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.7.2 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-pb-go v1.16.7 + github.com/cloudquery/plugin-pb-go v1.16.8 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible - github.com/docker/docker v24.0.7+incompatible + github.com/docker/docker v24.0.8+incompatible github.com/getsentry/sentry-go v0.24.1 github.com/ghodss/yaml v1.0.0 github.com/google/go-cmp v0.6.0 diff --git a/cli/go.sum b/cli/go.sum index 263e073f16b753..86ab9f7c2847f7 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -68,8 +68,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= -github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= -github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= +github.com/cloudquery/plugin-pb-go v1.16.8 h1:VKSii3yuDi7XIVNIkgrqMdd2tAWPX1O/V/HtZp9Y9Ak= +github.com/cloudquery/plugin-pb-go v1.16.8/go.mod h1:taeDcOU7nkiPerOmsUwwYzBoZpQpRNe6nyLWegi67Os= github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -84,8 +84,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.8+incompatible h1:lbGlhLzolo0tpp+paD0JzOYId072MQmQxZLPevQCFPU= +github.com/docker/docker v24.0.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index 8afbbe968d1ddc..0d2be8ce862604 100644 --- a/scaffold/cmd/templates/source/go.mod.tpl +++ b/scaffold/cmd/templates/source/go.mod.tpl @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 bcaeaa8c2d97 - github.com/cloudquery/plugin-pb-go v1.16.7 + github.com/cloudquery/plugin-pb-go v1.16.8 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.29.0 ) From d66dfeb43c6148427bd77f1ada607a0126965a2c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:30:50 +0200 Subject: [PATCH 26/78] chore: Update plugin `source-airtable` version to v2.0.2 (#16469) Updates the `source-airtable` plugin latest version to v2.0.2 --- website/versions/source-airtable.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-airtable.json b/website/versions/source-airtable.json index a8e5045e6a00ae..0a46dcfa63e599 100644 --- a/website/versions/source-airtable.json +++ b/website/versions/source-airtable.json @@ -1 +1 @@ -{ "latest": "plugins-source-airtable-v2.0.1" } +{ "latest": "plugins-source-airtable-v2.0.2" } From f080f485cf7308a43229238ba13fefe86dcef52e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:35:35 +0200 Subject: [PATCH 27/78] chore(main): Release plugins-source-square v1.1.3 (#16470) :robot: I have created a release *beep* *boop* --- ## [1.1.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-square-v1.1.2...plugins-source-square-v1.1.3) (2024-02-01) ### Bug Fixes * **deps:** Update dependency cloudquery-plugin-sdk to v0.1.13 ([#16462](https://github.com/cloudquery/cloudquery/issues/16462)) ([d76eef1](https://github.com/cloudquery/cloudquery/commit/d76eef19cd2e5aa76de6101d2d5ff00f0e54cedc)) --- 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/square/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index bb5ff2f91ebb7c..ac53c8f443d0f4 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -91,7 +91,7 @@ "plugins/source/firestore+FILLER": "0.0.0", "plugins/source/oracledb": "3.0.12", "plugins/source/oracledb+FILLER": "0.0.0", - "plugins/source/square": "1.1.2", + "plugins/source/square": "1.1.3", "plugins/source/square+FILLER": "0.0.0", "plugins/source/typeform": "1.2.2", "plugins/source/typeform+FILLER": "0.0.0", diff --git a/plugins/source/square/CHANGELOG.md b/plugins/source/square/CHANGELOG.md index 5d1c968ab4a9b1..dcd1470129757f 100644 --- a/plugins/source/square/CHANGELOG.md +++ b/plugins/source/square/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.1.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-square-v1.1.2...plugins-source-square-v1.1.3) (2024-02-01) + + +### Bug Fixes + +* **deps:** Update dependency cloudquery-plugin-sdk to v0.1.13 ([#16462](https://github.com/cloudquery/cloudquery/issues/16462)) ([d76eef1](https://github.com/cloudquery/cloudquery/commit/d76eef19cd2e5aa76de6101d2d5ff00f0e54cedc)) + ## [1.1.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-square-v1.1.1...plugins-source-square-v1.1.2) (2024-01-15) From cb0591d13a00b377c6502aa44c6d96f8a8631b27 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:40:32 +0200 Subject: [PATCH 28/78] chore(main): Release plugins-source-typeform v1.2.3 (#16471) :robot: I have created a release *beep* *boop* --- ## [1.2.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.2.2...plugins-source-typeform-v1.2.3) (2024-02-01) ### Bug Fixes * **deps:** Update dependency cloudquery-plugin-sdk to v0.1.13 ([#16462](https://github.com/cloudquery/cloudquery/issues/16462)) ([d76eef1](https://github.com/cloudquery/cloudquery/commit/d76eef19cd2e5aa76de6101d2d5ff00f0e54cedc)) --- 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/typeform/CHANGELOG.md | 7 +++++++ plugins/source/typeform/plugin/plugin.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index ac53c8f443d0f4..d110cc19c9c5cf 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -93,7 +93,7 @@ "plugins/source/oracledb+FILLER": "0.0.0", "plugins/source/square": "1.1.3", "plugins/source/square+FILLER": "0.0.0", - "plugins/source/typeform": "1.2.2", + "plugins/source/typeform": "1.2.3", "plugins/source/typeform+FILLER": "0.0.0", "plugins/source/jira": "1.0.10", "plugins/source/jira+FILLER": "0.0.0", diff --git a/plugins/source/typeform/CHANGELOG.md b/plugins/source/typeform/CHANGELOG.md index 47187f5ff2697d..def2abf853d7c4 100644 --- a/plugins/source/typeform/CHANGELOG.md +++ b/plugins/source/typeform/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.2.2...plugins-source-typeform-v1.2.3) (2024-02-01) + + +### Bug Fixes + +* **deps:** Update dependency cloudquery-plugin-sdk to v0.1.13 ([#16462](https://github.com/cloudquery/cloudquery/issues/16462)) ([d76eef1](https://github.com/cloudquery/cloudquery/commit/d76eef19cd2e5aa76de6101d2d5ff00f0e54cedc)) + ## [1.2.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.2.1...plugins-source-typeform-v1.2.2) (2024-01-15) diff --git a/plugins/source/typeform/plugin/plugin.py b/plugins/source/typeform/plugin/plugin.py index 506befa2b7d8b0..9816c1bbe2b951 100644 --- a/plugins/source/typeform/plugin/plugin.py +++ b/plugins/source/typeform/plugin/plugin.py @@ -11,7 +11,7 @@ from plugin.client import Client, Spec PLUGIN_NAME = "typeform" -PLUGIN_VERSION = "1.2.2" # {x-release-please-version} +PLUGIN_VERSION = "1.2.3" # {x-release-please-version} class TypeformPlugin(plugin.Plugin): From 3d05bd2c201bb57ba86ff03004b4ec4dff270c3a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:43:40 +0200 Subject: [PATCH 29/78] chore: Update plugin `destination-duckdb` version to v5.1.0 (#16472) Updates the `destination-duckdb` plugin latest version to v5.1.0 --- website/versions/destination-duckdb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-duckdb.json b/website/versions/destination-duckdb.json index 24ca265cde8e6f..7c6d69aa1da9b5 100644 --- a/website/versions/destination-duckdb.json +++ b/website/versions/destination-duckdb.json @@ -1 +1 @@ -{ "latest": "plugins-destination-duckdb-v5.0.12" } +{ "latest": "plugins-destination-duckdb-v5.1.0" } From cc89e922701be03bc07bd6fc0cc2190550f02adc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:47:04 +0200 Subject: [PATCH 30/78] chore: Update plugin `source-square` version to v1.1.3 (#16473) Updates the `source-square` plugin latest version to v1.1.3 --- website/versions/source-square.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-square.json b/website/versions/source-square.json index 2dcc2ba3bee1de..bd4ccba04e56e2 100644 --- a/website/versions/source-square.json +++ b/website/versions/source-square.json @@ -1 +1 @@ -{ "latest": "plugins-source-square-v1.1.2" } +{ "latest": "plugins-source-square-v1.1.3" } From b1a859827f766195e3dcbf7554477103a9d13427 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:12:29 +0200 Subject: [PATCH 31/78] fix(deps): Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 (#16475) 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/v4](https://togithub.com/cloudquery/plugin-sdk) | require | minor | `v4.28.0` -> `v4.29.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/plugin-sdk (github.com/cloudquery/plugin-sdk/v4) ### [`v4.29.1`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.29.1) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.29.0...v4.29.1) ##### Bug Fixes - **deps:** Update golang.org/x/exp digest to [`1b97071`](https://togithub.com/cloudquery/plugin-sdk/commit/1b97071) ([#​1505](https://togithub.com/cloudquery/plugin-sdk/issues/1505)) ([14d8545](https://togithub.com/cloudquery/plugin-sdk/commit/14d8545ac6c39d64f893c60d97dc19d2e144bdbc)) - **deps:** Update google.golang.org/genproto/googleapis/api digest to [`1f4bbc5`](https://togithub.com/cloudquery/plugin-sdk/commit/1f4bbc5) ([#​1506](https://togithub.com/cloudquery/plugin-sdk/issues/1506)) ([4021d65](https://togithub.com/cloudquery/plugin-sdk/commit/4021d65d966363f5efc37c16626c81f1e4b2f435)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`1f4bbc5`](https://togithub.com/cloudquery/plugin-sdk/commit/1f4bbc5) ([#​1507](https://togithub.com/cloudquery/plugin-sdk/issues/1507)) ([b1316a8](https://togithub.com/cloudquery/plugin-sdk/commit/b1316a8423902b454505bc67f0582df9282ae0c1)) - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.2 ([#​1501](https://togithub.com/cloudquery/plugin-sdk/issues/1501)) ([f5ecd8e](https://togithub.com/cloudquery/plugin-sdk/commit/f5ecd8e65e00a44b85cad183277d6cf448b721d2)) - **deps:** Update module github.com/kataras/iris/v12 to v12.2.10 ([#​1508](https://togithub.com/cloudquery/plugin-sdk/issues/1508)) ([611982b](https://togithub.com/cloudquery/plugin-sdk/commit/611982b154ddd56c4722c809422dc394b1be2bef)) - **deps:** Update module github.com/klauspost/compress to v1.17.5 ([#​1509](https://togithub.com/cloudquery/plugin-sdk/issues/1509)) ([e8d3c6b](https://togithub.com/cloudquery/plugin-sdk/commit/e8d3c6b2f4b518d05d5bf2f5b7a8415a064e79e0)) - **deps:** Update module github.com/pierrec/lz4/v4 to v4.1.21 ([#​1510](https://togithub.com/cloudquery/plugin-sdk/issues/1510)) ([8af0e4e](https://togithub.com/cloudquery/plugin-sdk/commit/8af0e4e47fcebb0ef888ecdc364a1df1467418d0)) - **deps:** Update module github.com/tdewolff/minify/v2 to v2.20.16 ([#​1511](https://togithub.com/cloudquery/plugin-sdk/issues/1511)) ([b1433cc](https://togithub.com/cloudquery/plugin-sdk/commit/b1433cc85889209d18c4c264a78b15d7bfd5c1dc)) - **deps:** Update module github.com/tdewolff/parse/v2 to v2.7.11 ([#​1512](https://togithub.com/cloudquery/plugin-sdk/issues/1512)) ([401fa4a](https://togithub.com/cloudquery/plugin-sdk/commit/401fa4a27048f61cb2cb659e8340866466f9acf3)) - Handle PrimaryKeyComponents in packaging ([#​1503](https://togithub.com/cloudquery/plugin-sdk/issues/1503)) ([8c8fdc9](https://togithub.com/cloudquery/plugin-sdk/commit/8c8fdc918569a04dbfb779f1134d273ffc1d9b1e)) ### [`v4.29.0`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.29.0) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.28.0...v4.29.0) ##### Features - Introduce `PrimaryKeyComponent` ([#​1491](https://togithub.com/cloudquery/plugin-sdk/issues/1491)) ([ae4a26e](https://togithub.com/cloudquery/plugin-sdk/commit/ae4a26e627f0d9d4df86eb93fee031753044f682)) ##### Bug Fixes - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.1 ([#​1499](https://togithub.com/cloudquery/plugin-sdk/issues/1499)) ([165be4d](https://togithub.com/cloudquery/plugin-sdk/commit/165be4dd7d22019c41546940f0b4913a2536f834)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.7 ([#​1500](https://togithub.com/cloudquery/plugin-sdk/issues/1500)) ([2b98dab](https://togithub.com/cloudquery/plugin-sdk/commit/2b98daba1af1b26bd917f419a788c3a54113dd41)) - Remove access to parent tests in test suite ([#​1497](https://togithub.com/cloudquery/plugin-sdk/issues/1497)) ([63e95e7](https://togithub.com/cloudquery/plugin-sdk/commit/63e95e7b36cfc9c277e03c4fc939868e7a377da6))
--- ### 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/test/go.mod | 36 ++++++++--------- plugins/source/test/go.sum | 83 +++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 59 deletions(-) diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index a29d1c5b240303..7589d91146edf0 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.28.0 + github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 ) @@ -16,7 +16,7 @@ require ( github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect @@ -26,8 +26,8 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/cloudquery/cloudquery-api-go v1.7.0 // indirect - github.com/cloudquery/plugin-pb-go v1.16.6 // indirect + github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect + github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect @@ -59,11 +59,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kataras/blocks v0.0.8 // indirect github.com/kataras/golog v0.1.11 // indirect - github.com/kataras/iris/v12 v12.2.8 // indirect + github.com/kataras/iris/v12 v12.2.10 // indirect github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect github.com/labstack/gommon v0.4.2 // indirect @@ -76,7 +76,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect @@ -85,8 +85,8 @@ require ( github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect - github.com/tdewolff/minify/v2 v2.20.10 // indirect - github.com/tdewolff/parse/v2 v2.7.7 // indirect + github.com/tdewolff/minify/v2 v2.20.16 // indirect + github.com/tdewolff/parse/v2 v2.7.11 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect @@ -105,20 +105,20 @@ require ( go.opentelemetry.io/otel/trace v1.20.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/arch v0.6.0 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.16.1 // indirect + golang.org/x/tools v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/grpc v1.60.1 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 1b105b4a69e8f3..dcb45026df1864 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -15,8 +15,8 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= @@ -45,18 +45,18 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.0 h1:9da/fBNcKnJGTKF3LFoKIMUwfnzhMCsp5RjIOSxCU7s= -github.com/cloudquery/cloudquery-api-go v1.7.0/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= +github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= -github.com/cloudquery/plugin-pb-go v1.16.6 h1:UcN7UK89EWxh9SRGCIPQ/Ao2YB5zVugvBtF8ii536ig= -github.com/cloudquery/plugin-pb-go v1.16.6/go.mod h1:/dnO/uBQGZlTvbYDPEvSt5J30ciN6DEDrQ8Jy4MKcIM= +github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= +github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v4 v4.28.0 h1:rX0VdS/qQCWBhaYC+b1LlaCQYZ1IKi/WsgDZt+SVBdM= -github.com/cloudquery/plugin-sdk/v4 v4.28.0/go.mod h1:LKyp3rdmidWzgf8dB9LWbz0e+03R3hXuaMzGY71vU9U= +github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= +github.com/cloudquery/plugin-sdk/v4 v4.29.1/go.mod h1:pM5EnbRX7apbgg1e5JC9TZkcJ22eyf4b4Uo1ekDb/GQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -121,8 +121,8 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= @@ -145,16 +145,16 @@ github.com/kataras/blocks v0.0.8 h1:MrpVhoFTCR2v1iOOfGng5VJSILKeZZI+7NGfxEh3SUM= github.com/kataras/blocks v0.0.8/go.mod h1:9Jm5zx6BB+06NwA+OhTbHW1xkMOYxahnqTN5DveZ2Yg= github.com/kataras/golog v0.1.11 h1:dGkcCVsIpqiAMWTlebn/ZULHxFvfG4K43LF1cNWSh20= github.com/kataras/golog v0.1.11/go.mod h1:mAkt1vbPowFUuUGvexyQ5NFW6djEgGyxQBIARJ0AH4A= -github.com/kataras/iris/v12 v12.2.8 h1:p+PcqyO45dSib8B4I8Wc0fz+6B/CVkOsikCpbeNOkuo= -github.com/kataras/iris/v12 v12.2.8/go.mod h1:on94BX0C5jhuxgWKDZVpcTqymksZDIxWFN+nL7axjRA= +github.com/kataras/iris/v12 v12.2.10 h1:rEJVM7qMoyhv8wpgkA1yGxibFcONE0jkJ70LFLibTAA= +github.com/kataras/iris/v12 v12.2.10/go.mod h1:z4+E+kLMqZ7U4WtDsYfFnG7BjMTXLkdzMAXLVMLnMNs= github.com/kataras/pio v0.0.13 h1:x0rXVX0fviDTXOOLOmr4MUxOabu1InVSTu5itF8CXCM= github.com/kataras/pio v0.0.13/go.mod h1:k3HNuSw+eJ8Pm2lA4lRhg3DiCjVgHlP8hmXApSej3oM= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -193,8 +193,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -237,12 +237,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= -github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= -github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= -github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= -github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= +github.com/tdewolff/minify/v2 v2.20.16 h1:/C8dtRkxLTIyUlKlBz46gDiktCrE8a6+c1gTrnPFz+U= +github.com/tdewolff/minify/v2 v2.20.16/go.mod h1:/FvxV9KaTrFu35J9I2FhRvWSBxcHj8sDSdwBFh5voxM= +github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIkBY8= +github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= 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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -297,10 +298,10 @@ golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4= -golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -308,12 +309,12 @@ golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -326,8 +327,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -339,8 +340,8 @@ golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= -golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -349,18 +350,18 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSm golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= -google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= -google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= -google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= -google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= +google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= +google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From 2896c4d6c9276d3355a5398bc8dcd60537cd92e5 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:37:07 +0200 Subject: [PATCH 32/78] chore(main): Release plugins-destination-snowflake v3.4.0 (#16364) :robot: I have created a release *beep* *boop* --- ## [3.4.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-snowflake-v3.3.12...plugins-destination-snowflake-v3.4.0) (2024-02-01) ### Features * Add JSON schema to snowflake destination plugin ([#16398](https://github.com/cloudquery/cloudquery/issues/16398)) ([8f1f253](https://github.com/cloudquery/cloudquery/commit/8f1f2535e607051518a620d2ef58c7b7b2913879)) ### Bug Fixes * **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) * **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) --- 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/snowflake/CHANGELOG.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d110cc19c9c5cf..5fd575a98f984b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -27,7 +27,7 @@ "plugins/destination/test+FILLER": "0.0.0", "plugins/destination/sqlite": "2.6.0", "plugins/destination/sqlite+FILLER": "0.0.0", - "plugins/destination/snowflake": "3.3.12", + "plugins/destination/snowflake": "3.4.0", "plugins/destination/snowflake+FILLER": "0.0.0", "plugins/source/datadog": "4.3.0", "plugins/source/datadog+FILLER": "0.0.0", diff --git a/plugins/destination/snowflake/CHANGELOG.md b/plugins/destination/snowflake/CHANGELOG.md index 6fa89258323f4c..b8a286690064c5 100644 --- a/plugins/destination/snowflake/CHANGELOG.md +++ b/plugins/destination/snowflake/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [3.4.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-snowflake-v3.3.12...plugins-destination-snowflake-v3.4.0) (2024-02-01) + + +### Features + +* Add JSON schema to snowflake destination plugin ([#16398](https://github.com/cloudquery/cloudquery/issues/16398)) ([8f1f253](https://github.com/cloudquery/cloudquery/commit/8f1f2535e607051518a620d2ef58c7b7b2913879)) + + +### Bug Fixes + +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) +* **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) + ## [3.3.12](https://github.com/cloudquery/cloudquery/compare/plugins-destination-snowflake-v3.3.11...plugins-destination-snowflake-v3.3.12) (2024-01-29) From c7a9dfe0ed376fb500e4a23bf73b37db68d43abb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:38:20 +0200 Subject: [PATCH 33/78] chore: Update plugin `source-typeform` version to v1.2.3 (#16474) Updates the `source-typeform` plugin latest version to v1.2.3 --- website/versions/source-typeform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-typeform.json b/website/versions/source-typeform.json index 386ec892d62382..95ee5a1602954b 100644 --- a/website/versions/source-typeform.json +++ b/website/versions/source-typeform.json @@ -1 +1 @@ -{ "latest": "plugins-source-typeform-v1.2.2" } +{ "latest": "plugins-source-typeform-v1.2.3" } From 1b9c32387a030fe59f755a10a9b81b223fde516c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:47:17 +0200 Subject: [PATCH 34/78] chore: Update plugin `destination-snowflake` version to v3.4.0 (#16476) Updates the `destination-snowflake` plugin latest version to v3.4.0 --- website/versions/destination-snowflake.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-snowflake.json b/website/versions/destination-snowflake.json index ca72bfc2b72fe2..ad34ed64e2ed92 100644 --- a/website/versions/destination-snowflake.json +++ b/website/versions/destination-snowflake.json @@ -1 +1 @@ -{ "latest": "plugins-destination-snowflake-v3.3.12" } +{ "latest": "plugins-destination-snowflake-v3.4.0" } From 11f424702f6604512ab01e42f157b6d37854da27 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:01:49 +0200 Subject: [PATCH 35/78] chore(main): Release plugins-destination-azblob v3.5.0 (#16262) :robot: I have created a release *beep* *boop* --- ## [3.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.19...plugins-destination-azblob-v3.5.0) (2024-02-01) ### Features * Add JSON schema to `azblob` destination plugin ([#16429](https://github.com/cloudquery/cloudquery/issues/16429)) ([e3c566c](https://github.com/cloudquery/cloudquery/commit/e3c566caffbb58c69e6966e23410af288b4ffe8d)) ### Bug Fixes * **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) * **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.10 ([#16445](https://github.com/cloudquery/cloudquery/issues/16445)) ([9933075](https://github.com/cloudquery/cloudquery/commit/9933075da8c26966c4cd119c30e7a4b5063be9ae)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.6 ([#16356](https://github.com/cloudquery/cloudquery/issues/16356)) ([72298db](https://github.com/cloudquery/cloudquery/commit/72298db12595f15bd432f3b836dc48beff4aacd5)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.7 ([#16366](https://github.com/cloudquery/cloudquery/issues/16366)) ([8459232](https://github.com/cloudquery/cloudquery/commit/8459232dc357ebbe372230c13cef3c678763bef3)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.8 ([#16373](https://github.com/cloudquery/cloudquery/issues/16373)) ([3d0d7f6](https://github.com/cloudquery/cloudquery/commit/3d0d7f69ffd57959d359768ffa4013a97f8499e4)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.9 ([#16424](https://github.com/cloudquery/cloudquery/issues/16424)) ([1b73a7e](https://github.com/cloudquery/cloudquery/commit/1b73a7e8065ad0d540550177ed0d4becd4a536d7)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.0 ([#16237](https://github.com/cloudquery/cloudquery/issues/16237)) ([3fcdab0](https://github.com/cloudquery/cloudquery/commit/3fcdab08816ad9de7bb4eecab59c7be1bda3d00c)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.1 ([#16296](https://github.com/cloudquery/cloudquery/issues/16296)) ([ab4a0da](https://github.com/cloudquery/cloudquery/commit/ab4a0dace0a870755fd22d92c6e9c999351f594e)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.2 ([#16342](https://github.com/cloudquery/cloudquery/issues/16342)) ([f3eb857](https://github.com/cloudquery/cloudquery/commit/f3eb85729e5db16c2530b31d6d276934866d5ef0)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) * Use JSON schema ([#16441](https://github.com/cloudquery/cloudquery/issues/16441)) ([967e4a7](https://github.com/cloudquery/cloudquery/commit/967e4a702a4aa360aa0706b990f63845e117a65b)) --- 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/azblob/CHANGELOG.md | 26 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 5fd575a98f984b..297edb9748b9db 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -45,7 +45,7 @@ "plugins/destination/s3+FILLER": "0.0.0", "plugins/destination/file": "3.4.17", "plugins/destination/file+FILLER": "0.0.0", - "plugins/destination/azblob": "3.4.19", + "plugins/destination/azblob": "3.5.0", "plugins/destination/azblob+FILLER": "0.0.0", "plugins/destination/neo4j": "5.0.6", "plugins/destination/neo4j+FILLER": "0.0.0", diff --git a/plugins/destination/azblob/CHANGELOG.md b/plugins/destination/azblob/CHANGELOG.md index cd3a043da0cf56..8a469a977cb269 100644 --- a/plugins/destination/azblob/CHANGELOG.md +++ b/plugins/destination/azblob/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +## [3.5.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.19...plugins-destination-azblob-v3.5.0) (2024-02-01) + + +### Features + +* Add JSON schema to `azblob` destination plugin ([#16429](https://github.com/cloudquery/cloudquery/issues/16429)) ([e3c566c](https://github.com/cloudquery/cloudquery/commit/e3c566caffbb58c69e6966e23410af288b4ffe8d)) + + +### Bug Fixes + +* **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) +* **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.10 ([#16445](https://github.com/cloudquery/cloudquery/issues/16445)) ([9933075](https://github.com/cloudquery/cloudquery/commit/9933075da8c26966c4cd119c30e7a4b5063be9ae)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.6 ([#16356](https://github.com/cloudquery/cloudquery/issues/16356)) ([72298db](https://github.com/cloudquery/cloudquery/commit/72298db12595f15bd432f3b836dc48beff4aacd5)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.7 ([#16366](https://github.com/cloudquery/cloudquery/issues/16366)) ([8459232](https://github.com/cloudquery/cloudquery/commit/8459232dc357ebbe372230c13cef3c678763bef3)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.8 ([#16373](https://github.com/cloudquery/cloudquery/issues/16373)) ([3d0d7f6](https://github.com/cloudquery/cloudquery/commit/3d0d7f69ffd57959d359768ffa4013a97f8499e4)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.9 ([#16424](https://github.com/cloudquery/cloudquery/issues/16424)) ([1b73a7e](https://github.com/cloudquery/cloudquery/commit/1b73a7e8065ad0d540550177ed0d4becd4a536d7)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.0 ([#16237](https://github.com/cloudquery/cloudquery/issues/16237)) ([3fcdab0](https://github.com/cloudquery/cloudquery/commit/3fcdab08816ad9de7bb4eecab59c7be1bda3d00c)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.1 ([#16296](https://github.com/cloudquery/cloudquery/issues/16296)) ([ab4a0da](https://github.com/cloudquery/cloudquery/commit/ab4a0dace0a870755fd22d92c6e9c999351f594e)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.2 ([#16342](https://github.com/cloudquery/cloudquery/issues/16342)) ([f3eb857](https://github.com/cloudquery/cloudquery/commit/f3eb85729e5db16c2530b31d6d276934866d5ef0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) +* Use JSON schema ([#16441](https://github.com/cloudquery/cloudquery/issues/16441)) ([967e4a7](https://github.com/cloudquery/cloudquery/commit/967e4a702a4aa360aa0706b990f63845e117a65b)) + ## [3.4.19](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.18...plugins-destination-azblob-v3.4.19) (2024-01-23) From d2844d3a3a28158848bfd8657def5f9c95e8efc1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:06:40 +0200 Subject: [PATCH 36/78] chore: Update plugin `destination-azblob` version to v3.5.0 (#16477) Updates the `destination-azblob` plugin latest version to v3.5.0 --- website/versions/destination-azblob.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-azblob.json b/website/versions/destination-azblob.json index 5af17914c6c3e3..ac8e51ce44d005 100644 --- a/website/versions/destination-azblob.json +++ b/website/versions/destination-azblob.json @@ -1 +1 @@ -{ "latest": "plugins-destination-azblob-v3.4.19" } +{ "latest": "plugins-destination-azblob-v3.5.0" } From 45a35db2f907e86183ae4eed19eaa78791bcbed6 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Thu, 1 Feb 2024 22:23:58 +0200 Subject: [PATCH 37/78] feat: Add JSON schema to `s3` destination plugin (#16465) Closes https://github.com/cloudquery/cloudquery/issues/14618 Basically, an adapted version of https://github.com/cloudquery/cloudquery/pull/16404 --- .github/workflows/dest_s3.yml | 6 + plugins/destination/s3/Makefile | 10 + plugins/destination/s3/client/client.go | 11 +- plugins/destination/s3/client/client_test.go | 19 +- plugins/destination/s3/client/read.go | 8 +- plugins/destination/s3/client/spec.go | 116 ------ .../destination/s3/client/spec/gen/main.go | 30 ++ plugins/destination/s3/client/spec/schema.go | 131 +++++++ .../destination/s3/client/spec/schema.json | 336 ++++++++++++++++++ .../destination/s3/client/spec/schema_test.go | 288 +++++++++++++++ plugins/destination/s3/client/spec/spec.go | 201 +++++++++++ .../destination/s3/client/spec/spec_test.go | 84 +++++ plugins/destination/s3/client/spec_test.go | 80 ----- plugins/destination/s3/client/write.go | 30 +- plugins/destination/s3/client/write_test.go | 11 +- plugins/destination/s3/docs/overview.md | 16 +- plugins/destination/s3/go.mod | 6 +- plugins/destination/s3/main.go | 2 + 18 files changed, 1126 insertions(+), 259 deletions(-) delete mode 100644 plugins/destination/s3/client/spec.go create mode 100644 plugins/destination/s3/client/spec/gen/main.go create mode 100644 plugins/destination/s3/client/spec/schema.go create mode 100644 plugins/destination/s3/client/spec/schema.json create mode 100644 plugins/destination/s3/client/spec/schema_test.go create mode 100644 plugins/destination/s3/client/spec/spec.go create mode 100644 plugins/destination/s3/client/spec/spec_test.go delete mode 100644 plugins/destination/s3/client/spec_test.go diff --git a/.github/workflows/dest_s3.yml b/.github/workflows/dest_s3.yml index 09a368359f7a06..c9c2af7cc88f14 100644 --- a/.github/workflows/dest_s3.yml +++ b/.github/workflows/dest_s3.yml @@ -52,6 +52,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test s3 plugin diff --git a/plugins/destination/s3/Makefile b/plugins/destination/s3/Makefile index f9ab6c2eac145b..0693013f2cba0d 100644 --- a/plugins/destination/s3/Makefile +++ b/plugins/destination/s3/Makefile @@ -5,3 +5,13 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + # required for loading comments from filetypes + go mod vendor + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/s3/client/client.go b/plugins/destination/s3/client/client.go index 57477084609cea..74b25f1e88e03c 100644 --- a/plugins/destination/s3/client/client.go +++ b/plugins/destination/s3/client/client.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/writers/streamingbatchwriter" @@ -28,7 +29,7 @@ type Client struct { streamingbatchwriter.UnimplementedDeleteRecords logger zerolog.Logger - spec *Spec + spec *spec.Spec *filetypes.Client writer *streamingbatchwriter.StreamingBatchWriter @@ -37,7 +38,7 @@ type Client struct { downloader *manager.Downloader } -func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.NewClientOptions) (plugin.Client, error) { +func New(ctx context.Context, logger zerolog.Logger, s []byte, opts plugin.NewClientOptions) (plugin.Client, error) { c := &Client{ logger: logger.With().Str("module", "s3").Logger(), } @@ -45,7 +46,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.Ne return c, nil } - if err := json.Unmarshal(spec, &c.spec); err != nil { + if err := json.Unmarshal(s, &c.spec); err != nil { return nil, fmt.Errorf("failed to unmarshal s3 spec: %w", err) } if err := c.spec.Validate(); err != nil { @@ -53,7 +54,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.Ne } c.spec.SetDefaults() - filetypesClient, err := filetypes.NewClient(c.spec.FileSpec) + filetypesClient, err := filetypes.NewClient(&c.spec.FileSpec) if err != nil { return nil, fmt.Errorf("failed to create filetypes client: %w", err) } @@ -87,7 +88,7 @@ func New(ctx context.Context, logger zerolog.Logger, spec []byte, opts plugin.Ne timeNow := time.Now().UTC() if _, err := c.uploader.Upload(ctx, &s3.PutObjectInput{ Bucket: aws.String(c.spec.Bucket), - Key: aws.String(c.replacePathVariables("TEST_TABLE", "TEST_UUID", timeNow)), + Key: aws.String(c.spec.ReplacePathVariables("TEST_TABLE", "TEST_UUID", timeNow)), Body: bytes.NewReader([]byte("")), }); err != nil { return nil, fmt.Errorf("failed to write test file to S3: %w", err) diff --git a/plugins/destination/s3/client/client_test.go b/plugins/destination/s3/client/client_test.go index f928e749f91d2a..dca453d221b685 100644 --- a/plugins/destination/s3/client/client_test.go +++ b/plugins/destination/s3/client/client_test.go @@ -10,6 +10,7 @@ import ( "github.com/apache/arrow/go/v15/arrow" "github.com/apache/arrow/go/v15/arrow/array" "github.com/apache/arrow/go/v15/arrow/memory" + "github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" @@ -30,32 +31,30 @@ func TestPlugin(t *testing.T) { filetypes.FormatTypeJSON, filetypes.FormatTypeParquet, } { - spec := Spec{ + s := spec.Spec{ Bucket: bucket, Region: region, Path: t.TempDir()[1:], NoRotate: true, BatchSizeBytes: &zero, BatchSize: &zero, - FileSpec: &filetypes.FileSpec{ - Format: ft, - }, + FileSpec: filetypes.FileSpec{Format: ft}, } t.Run("generic/"+string(ft), func(t *testing.T) { - testPlugin(t, &spec) + testPlugin(t, &s) }) t.Run("write/"+string(ft), func(t *testing.T) { - testPluginCustom(t, &spec) + testPluginCustom(t, &s) }) } } -func testPlugin(t *testing.T, spec *Spec) { +func testPlugin(t *testing.T, s *spec.Spec) { ctx := context.Background() p := plugin.NewPlugin("s3", "development", New) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } @@ -74,7 +73,7 @@ func testPlugin(t *testing.T, spec *Spec) { ) } -func testPluginCustom(t *testing.T, spec *Spec) { +func testPluginCustom(t *testing.T, s *spec.Spec) { ctx := context.Background() var client plugin.Client @@ -84,7 +83,7 @@ func testPluginCustom(t *testing.T, spec *Spec) { client, err = New(ctx, logger, spec, opts) return client, err }) - b, err := json.Marshal(spec) + b, err := json.Marshal(s) if err != nil { t.Fatal(err) } diff --git a/plugins/destination/s3/client/read.go b/plugins/destination/s3/client/read.go index 05f441fab3daa3..1dae3b3314013e 100644 --- a/plugins/destination/s3/client/read.go +++ b/plugins/destination/s3/client/read.go @@ -4,13 +4,14 @@ import ( "bytes" "context" "fmt" - "strings" + "time" "github.com/apache/arrow/go/v15/arrow" "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" "github.com/cloudquery/plugin-sdk/v4/schema" + "github.com/google/uuid" ) const maxFileSize = 1024 * 1024 * 20 @@ -19,10 +20,11 @@ func (c *Client) Read(ctx context.Context, table *schema.Table, res chan<- arrow if !c.spec.NoRotate { return fmt.Errorf("reading is not supported when no_rotate is false. Table: %q", table.Name) } - if strings.Contains(c.spec.Path, PathVarUUID) { + if c.spec.PathContainsUUID() { return fmt.Errorf("reading is not supported when path contains uuid variable. Table: %q", table.Name) } - name := strings.ReplaceAll(c.spec.Path, PathVarTable, table.Name) + + name := c.spec.ReplacePathVariables(table.Name, uuid.NewString(), time.Time{}) writerAtBuffer := manager.NewWriteAtBuffer(make([]byte, 0, maxFileSize)) _, err := c.downloader.Download(ctx, writerAtBuffer, diff --git a/plugins/destination/s3/client/spec.go b/plugins/destination/s3/client/spec.go deleted file mode 100644 index c7d07983d11504..00000000000000 --- a/plugins/destination/s3/client/spec.go +++ /dev/null @@ -1,116 +0,0 @@ -package client - -import ( - "fmt" - "path" - "strings" - "time" - - "github.com/cloudquery/filetypes/v4" - "github.com/cloudquery/plugin-sdk/v4/configtype" -) - -type Spec struct { - *filetypes.FileSpec - NoRotate bool `json:"no_rotate,omitempty"` - Bucket string `json:"bucket,omitempty"` - Region string `json:"region,omitempty"` - Path string `json:"path,omitempty"` - Athena bool `json:"athena,omitempty"` - TestWrite *bool `json:"test_write,omitempty"` - - Endpoint string `json:"endpoint,omitempty"` - UsePathStyle bool `json:"use_path_style,omitempty"` - EndpointSkipTLSVerify bool `json:"endpoint_skip_tls_verify,omitempty"` - BatchSize *int64 `json:"batch_size"` - BatchSizeBytes *int64 `json:"batch_size_bytes"` - BatchTimeout *configtype.Duration `json:"batch_timeout"` -} - -func (s *Spec) SetDefaults() { - if !strings.Contains(s.Path, PathVarTable) { - // for backwards-compatibility, default to given path plus /{{TABLE}}.[format].{{UUID}} if - // no {{TABLE}} value is found in the path string - s.Path += fmt.Sprintf("/%s.%s", PathVarTable, s.Format) - if !s.NoRotate { - s.Path += "." + PathVarUUID - } - } - if s.TestWrite == nil { - b := true - s.TestWrite = &b - } - if s.BatchSize == nil { - if s.NoRotate { - s.BatchSize = int64ptr(0) - } else { - s.BatchSize = int64ptr(10000) - } - } - if s.BatchSizeBytes == nil { - if s.NoRotate { - s.BatchSizeBytes = int64ptr(0) - } else { - s.BatchSizeBytes = int64ptr(50 * 1024 * 1024) // 50 MiB - } - } - if s.BatchTimeout == nil { - if s.NoRotate { - d := configtype.NewDuration(0) - s.BatchTimeout = &d - } else { - d := configtype.NewDuration(30 * time.Second) - s.BatchTimeout = &d - } - } -} - -func (s *Spec) Validate() error { - if s.Bucket == "" { - return fmt.Errorf("`bucket` is required") - } - if s.Path == "" { - return fmt.Errorf("`path` is required") - } - if s.Region == "" { - return fmt.Errorf("`region` is required") - } - if s.NoRotate && strings.Contains(s.Path, PathVarUUID) { - return fmt.Errorf("`path` should not contain %s when `no_rotate` = true", PathVarUUID) - } - if !strings.Contains(s.Path, PathVarUUID) && s.batchingEnabled() { - return fmt.Errorf("`path` should contain %s when using a non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`", PathVarUUID) - } - if path.IsAbs(s.Path) { - return fmt.Errorf("`path` should not start with a \"/\"") - } - if s.Path != path.Clean(s.Path) { - return fmt.Errorf("`path` should not contain relative paths or duplicate slashes") - } - if s.Format == "" { - return fmt.Errorf("`format` is required") - } - if s.NoRotate && ((s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0)) { - return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`") - } - - return nil -} - -func (s *Spec) batchingEnabled() bool { - switch { - case (s.BatchSize != nil && *s.BatchSize > 0) || - (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || - (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0) || - (!s.NoRotate && s.BatchSize == nil) || - (!s.NoRotate && s.BatchSizeBytes == nil) || - (!s.NoRotate && s.BatchTimeout == nil): - return true - default: - return false - } -} - -func int64ptr(i int64) *int64 { - return &i -} diff --git a/plugins/destination/s3/client/spec/gen/main.go b/plugins/destination/s3/client/spec/gen/main.go new file mode 100644 index 00000000000000..7649b43534f0fe --- /dev/null +++ b/plugins/destination/s3/client/spec/gen/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec" + "github.com/cloudquery/codegen/jsonschema" + "github.com/cloudquery/filetypes/v4" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + append(filetypes.FileSpec{}.JSONSchemaOptions(), + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec", path.Join(currDir(), "..")), + jsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), + )..., + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/s3/client/spec/schema.go b/plugins/destination/s3/client/spec/schema.go new file mode 100644 index 00000000000000..eca03e03c8b18a --- /dev/null +++ b/plugins/destination/s3/client/spec/schema.go @@ -0,0 +1,131 @@ +package spec + +import ( + _ "embed" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" +) + +func (s Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + s.FileSpec.JSONSchemaExtend(sc) // need to call manually + + batchTimeout := sc.Properties.Value("batch_timeout").OneOf[0] // 0 - val, 1 - null + batchTimeout.Default = "30s" + + // path patterns: should be a clean path + cleanPath := &jsonschema.Schema{ + Title: "`path` is a clean path value", + Not: &jsonschema.Schema{ + Title: "`path` is not a clean path value", + AnyOf: []*jsonschema.Schema{ + { + Title: "`path` contains `./`", + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("path", &jsonschema.Schema{ + Type: "string", + Pattern: `^.*\./.*$`, + }) + return properties + }(), + }, + { + Title: "`path` contains `//`", + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("path", &jsonschema.Schema{ + Type: "string", + Pattern: `^.*//.*$`, + }) + return properties + }(), + }, + }, + }, + } + + pathWithUUID := &jsonschema.Schema{ + Title: "Require {{UUID}} to be present in path", + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + // we make the non-zero requirement, so we want to allow only null here + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("path", &jsonschema.Schema{ + Type: "string", + Pattern: `^.*\{\{UUID\}\}.*$`, + }) + return properties + }(), + } + // no_rotate:true -> no {{UUID}} should be present in path + noRotateNoUUID := &jsonschema.Schema{ + Title: "Disallow {{UUID}} in path when using no_rotate", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + noRotate := *sc.Properties.Value("no_rotate") + noRotate.Default = nil + noRotate.Const = true + noRotate.Description = "" + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("no_rotate", &noRotate) + return properties + }(), + Required: []string{"no_rotate"}, + }, + Then: &jsonschema.Schema{ + Not: pathWithUUID, + }, + } + // no_rotate:true -> only nulls for batch options + noRotateNoBatch := &jsonschema.Schema{ + Title: "Disallow batching when using no_rotate", + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + noRotate := *sc.Properties.Value("no_rotate") + noRotate.Default = nil + noRotate.Const = true + noRotate.Description = "" + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("no_rotate", &noRotate) + return properties + }(), + Required: []string{"no_rotate"}, + }, + Then: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + // we make the non-zero requirement, so we want to allow only null here + null := &jsonschema.Schema{Type: "null"} + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("batch_size", null) + properties.Set("batch_size_bytes", null) + properties.Set("batch_timeout", null) + return properties + }(), + }, + } + + // batching enabled -> require {{UUID}} in path + uuidWhenBatching := &jsonschema.Schema{ + Title: "Require {{UUID}} in path when batching", + If: &jsonschema.Schema{ + // It's enough to disallow setting no_rotate to true + // As otherwise we're requiring the positive batch size (& bytes) values + Title: "Disallow setting no_rotate to true", + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + noRotate := *sc.Properties.Value("no_rotate") + noRotate.Default = nil + noRotate.Const = false + noRotate.Description = "" + properties := orderedmap.New[string, *jsonschema.Schema]() + properties.Set("no_rotate", &noRotate) + return properties + }(), + }, + Then: pathWithUUID, + } + + sc.AllOf = append(sc.AllOf, cleanPath, noRotateNoUUID, noRotateNoBatch, uuidWhenBatching) +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/s3/client/spec/schema.json b/plugins/destination/s3/client/spec/schema.json new file mode 100644 index 00000000000000..215cf0c32a5aca --- /dev/null +++ b/plugins/destination/s3/client/spec/schema.json @@ -0,0 +1,336 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "CSVSpec": { + "properties": { + "skip_header": { + "type": "boolean", + "description": "Specifies if the first line of a file should be the header.", + "default": false + }, + "delimiter": { + "type": "string", + "pattern": "^.$", + "description": "Character that will be used as the delimiter.", + "default": "," + } + }, + "additionalProperties": false, + "type": "object", + "description": "CloudQuery CSV file output spec." + }, + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "JSONSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery JSON file output spec." + }, + "ParquetSpec": { + "additionalProperties": false, + "type": "object", + "description": "CloudQuery Parquet file output spec." + }, + "Spec": { + "allOf": [ + { + "not": { + "anyOf": [ + { + "properties": { + "path": { + "type": "string", + "pattern": "^.*\\./.*$" + } + }, + "title": "`path` contains `./`" + }, + { + "properties": { + "path": { + "type": "string", + "pattern": "^.*//.*$" + } + }, + "title": "`path` contains `//`" + } + ], + "title": "`path` is not a clean path value" + }, + "title": "`path` is a clean path value" + }, + { + "if": { + "properties": { + "no_rotate": { + "type": "boolean", + "const": true + } + }, + "required": [ + "no_rotate" + ] + }, + "then": { + "not": { + "properties": { + "path": { + "type": "string", + "pattern": "^.*\\{\\{UUID\\}\\}.*$" + } + }, + "title": "Require {{UUID}} to be present in path" + } + }, + "title": "Disallow {{UUID}} in path when using no_rotate" + }, + { + "if": { + "properties": { + "no_rotate": { + "type": "boolean", + "const": true + } + }, + "required": [ + "no_rotate" + ] + }, + "then": { + "properties": { + "batch_size": { + "type": "null" + }, + "batch_size_bytes": { + "type": "null" + }, + "batch_timeout": { + "type": "null" + } + } + }, + "title": "Disallow batching when using no_rotate" + }, + { + "if": { + "properties": { + "no_rotate": { + "type": "boolean", + "const": false + } + }, + "title": "Disallow setting no_rotate to true" + }, + "then": { + "properties": { + "path": { + "type": "string", + "pattern": "^.*\\{\\{UUID\\}\\}.*$" + } + }, + "title": "Require {{UUID}} to be present in path" + }, + "title": "Require {{UUID}} in path when batching" + } + ], + "oneOf": [ + { + "properties": { + "format": { + "type": "string", + "const": "csv" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "json" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/JSONSpec" + }, + { + "type": "null" + } + ] + } + } + }, + { + "properties": { + "format": { + "type": "string", + "const": "parquet" + }, + "format_spec": { + "oneOf": [ + { + "$ref": "#/$defs/ParquetSpec" + }, + { + "type": "null" + } + ] + } + } + } + ], + "properties": { + "format": { + "type": "string", + "enum": [ + "csv", + "json", + "parquet" + ], + "description": "Output format." + }, + "format_spec": { + "oneOf": [ + { + "anyOf": [ + { + "$ref": "#/$defs/CSVSpec" + }, + { + "$ref": "#/$defs/JSONSpec" + }, + { + "$ref": "#/$defs/ParquetSpec" + } + ] + }, + { + "type": "null" + } + ] + }, + "compression": { + "type": "string", + "enum": [ + "", + "gzip" + ], + "description": "Compression type.\nEmpty or missing stands for no compression." + }, + "bucket": { + "type": "string", + "minLength": 1, + "description": "Bucket where to sync the files." + }, + "region": { + "type": "string", + "minLength": 1, + "description": "Region where bucket is located." + }, + "path": { + "type": "string", + "pattern": "^[^/].*$", + "description": "Path to where the files will be uploaded in the above bucket. The path supports the following placeholder variables:\n\n- `{{TABLE}}` will be replaced with the table name\n- `{{FORMAT}}` will be replaced with the file format, such as `csv`, `json` or `parquet`. If compression is enabled, the format will be `csv.gz`, `json.gz` etc.\n- `{{UUID}}` will be replaced with a random UUID to uniquely identify each file\n- `{{YEAR}}` will be replaced with the current year in `YYYY` format\n- `{{MONTH}}` will be replaced with the current month in `MM` format\n- `{{DAY}}` will be replaced with the current day in `DD` format\n- `{{HOUR}}` will be replaced with the current hour in `HH` format\n- `{{MINUTE}}` will be replaced with the current minute in `mm` format\n\n**Note** that timestamps are in `UTC` and will be the current time at the time the file is written, not when the sync started." + }, + "no_rotate": { + "type": "boolean", + "description": "If set to `true`, the plugin will write to one file per table.\nOtherwise, for every batch a new file will be created with a different `.\u003cUUID\u003e` suffix.", + "default": false + }, + "athena": { + "type": "boolean", + "description": "When `athena` is set to `true`, the S3 plugin will sanitize keys in JSON columns to be compatible with the Hive Metastore / Athena.\nThis allows tables to be created with a Glue Crawler and then queried via Athena, without changes to the table schema.", + "default": false + }, + "test_write": { + "oneOf": [ + { + "type": "boolean", + "description": "Ensure write access to the given bucket and path by writing a test object on each sync.\nIf you are sure that the bucket and path are writable, you can set this to `false` to skip the test.", + "default": true + }, + { + "type": "null" + } + ] + }, + "endpoint": { + "type": "string", + "description": "Endpoint to use for S3 API calls. This is useful for S3-compatible storage services such as MinIO.\n**Note**: if you want to use path-style addressing, i.e., `https://s3.amazonaws.com/BUCKET/KEY`, `use_path_style` should be enabled, too.", + "default": "" + }, + "use_path_style": { + "type": "boolean", + "description": "Allows to use path-style addressing in the `endpoint` option, i.e., `https://s3.amazonaws.com/BUCKET/KEY`.\nBy default, the S3 client will use virtual hosted bucket addressing when possible (`https://BUCKET.s3.amazonaws.com/KEY`).", + "default": false + }, + "endpoint_skip_tls_verify": { + "type": "boolean", + "description": "Disable TLS verification for requests to your S3 endpoint.\n\nThis option is intended to be used when using a custom endpoint using the `endpoint` option.", + "default": false + }, + "batch_size": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "Maximum number of items that may be grouped together to be written in a single write.\n\nDefaults to `10000` unless `no_rotate` is `true` (will be `0` then).", + "default": 10000 + }, + { + "type": "null" + } + ] + }, + "batch_size_bytes": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "Maximum size of items that may be grouped together to be written in a single write.\n\nDefaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then).", + "default": 52428800 + }, + { + "type": "null" + } + ] + }, + "batch_timeout": { + "oneOf": [ + { + "$ref": "#/$defs/Duration", + "description": "Maximum interval between batch writes.\n\nDefaults to `30s` unless `no_rotate` is `true` (will be `0s` then).", + "default": "30s" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "format", + "bucket", + "region", + "path" + ] + } + } +} diff --git a/plugins/destination/s3/client/spec/schema_test.go b/plugins/destination/s3/client/spec/schema_test.go new file mode 100644 index 00000000000000..5ac1748463a883 --- /dev/null +++ b/plugins/destination/s3/client/spec/schema_test.go @@ -0,0 +1,288 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpecJSONSchema(t *testing.T) { + // cases about embedded filetypes.FileSpec are tested in the corresponding package + // However, we add some tests to verify that it actually is properly working + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "csv file spec", + Spec: `{ + "format": "csv", + "format_spec": { + "skip_header": true, + "delimiter": "#" + }, + "path": "{{UUID}}", + "bucket": "b", + "region": "r" +}`, + }, + { + Name: "bad format value", // also a part of embedded FileSpec testing + Spec: `{"format": "cs22v", "path": "{{UUID}}", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "minimal", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r"}`, + }, + { + Name: "missing path", + Spec: `{"format": "csv", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "empty path", + Spec: `{"format": "csv", "path": ", ", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "null path", + Spec: `{"format": "csv", "path": null, "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "integer path", + Spec: `{"format": "csv", "path": 123}`, + Err: true, + }, + { + Name: "path starts with /", + Spec: `{"format": "csv", "path": "/{{UUID}}", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "path contains //", + Spec: `{"format": "csv", "path": "{{UUID}}//", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "path contains ./", + Spec: `{"format": "csv", "path": "{{UUID}}/./", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "path contains ../", + Spec: `{"format": "csv", "path": "{{UUID}}/../", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "missing bucket", + Spec: `{"format": "csv", "path": "{{UUID}}", "region": "r"}`, + Err: true, + }, + { + Name: "empty bucket", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "", "region": "r"}`, + Err: true, + }, + { + Name: "null bucket", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": null, "region": "r"}`, + Err: true, + }, + { + Name: "integer bucket", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": 123, "region": "r"}`, + Err: true, + }, + { + Name: "missing region", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b"}`, + Err: true, + }, + { + Name: "empty region", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": ""}`, + Err: true, + }, + { + Name: "null region", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": null}`, + Err: true, + }, + { + Name: "integer region", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": 123}`, + Err: true, + }, + { + Name: "null no_rotate", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate": null}`, + Err: true, + }, + { + Name: "bad no_rotate", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate": 123}`, + Err: true, + }, + { + Name: "no_rotate:true", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate": true}`, + }, + { + Name: "no_rotate:false", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate": false}`, + }, + { + Name: "zero batch_size", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size":0}`, + }, + { + Name: "float batch_size", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size":5.3}`, + }, + { + Name: "bad batch_size", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size":false}`, + }, + { + Name: "null batch_size", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size":null}`, + }, + { + Name: "proper batch_size", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size":123}`, + }, + { + Name: "zero batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size_bytes":0}`, + }, + { + Name: "float batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size_bytes":5.3}`, + }, + { + Name: "bad batch_size_bytes", + Err: true, + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size_bytes":false}`, + }, + { + Name: "null batch_size_bytes", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size_bytes":null}`, + }, + { + Name: "proper batch_size_bytes", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_size_bytes":123}`, + }, + // configtype.Duration is tested in plugin-sdk + // test only null here + { + Name: "null batch_timeout", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "batch_timeout":null}`, + }, + + // no_rotate + path({{UUID}}) + { + Name: "no_rotate:false & path:{{UUID}}", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false}`, + }, + { + Name: "no_rotate:true & path:{{UUID}}", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":true}`, + Err: true, + }, + { + Name: "no_rotate:false & path:abc", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":false}`, + Err: true, + }, + { + Name: "no_rotate:true & path:abc", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true}`, + }, + + // no_rotate + batching + { + Name: "no_rotate:false & batch_size:100", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_size":100}`, + }, + { + Name: "no_rotate:true & batch_size:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_size":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size:null", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_size":null}`, + }, + { + Name: "no_rotate:true & batch_size:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_size":null}`, + }, + { + Name: "no_rotate:false & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_size_bytes":100}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:100", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_size_bytes":100}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:true & batch_size_bytes:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_size_bytes":null}`, + }, + { + Name: "no_rotate:false & batch_timeout:100s", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_timeout":"100s"}`, + }, + { + Name: "no_rotate:true & batch_timeout:100s", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_timeout":"100s"}`, + Err: true, + }, + { + Name: "no_rotate:false & batch_timeout:null", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false, "batch_timeout":null}`, + }, + { + Name: "no_rotate:true & batch_timeout:null", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true, "batch_timeout":null}`, + }, + + // batching + path({{UUID}}) + { + Name: "batching (no_rotate:false) & path:{{UUID}}", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":false}`, + }, + { + Name: "batching (no_rotate:false) & path:abc", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":false}`, + Err: true, + }, + { + Name: "batching (missing no_rotate) & path:{{UUID}}", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r"}`, + }, + { + Name: "batching (missing no_rotate) & path:abc", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r"}`, + Err: true, + }, + { + Name: "no batching (no_rotate:true) & path:{{UUID}}", + Spec: `{"format": "csv", "path": "{{UUID}}", "bucket": "b", "region": "r", "no_rotate":true}`, + Err: true, + }, + { + Name: "no batching (no_rotate:true) & path:abc", + Spec: `{"format": "csv", "path": "abc", "bucket": "b", "region": "r", "no_rotate":true}`, + }, + }) +} diff --git a/plugins/destination/s3/client/spec/spec.go b/plugins/destination/s3/client/spec/spec.go new file mode 100644 index 00000000000000..84715a2119715c --- /dev/null +++ b/plugins/destination/s3/client/spec/spec.go @@ -0,0 +1,201 @@ +package spec + +import ( + "fmt" + "path" + "path/filepath" + "strings" + "time" + + "github.com/cloudquery/filetypes/v4" + "github.com/cloudquery/plugin-sdk/v4/configtype" +) + +const ( + varFormat = "{{FORMAT}}" + varTable = "{{TABLE}}" + varUUID = "{{UUID}}" + varYear = "{{YEAR}}" + varMonth = "{{MONTH}}" + varDay = "{{DAY}}" + varHour = "{{HOUR}}" + varMinute = "{{MINUTE}}" +) + +type Spec struct { + filetypes.FileSpec + + // Bucket where to sync the files. + Bucket string `json:"bucket,omitempty" jsonschema:"required,minLength=1"` + + // Region where bucket is located. + Region string `json:"region,omitempty" jsonschema:"required,minLength=1"` + + // Path to where the files will be uploaded in the above bucket. The path supports the following placeholder variables: + // + // - `{{TABLE}}` will be replaced with the table name + // - `{{FORMAT}}` will be replaced with the file format, such as `csv`, `json` or `parquet`. If compression is enabled, the format will be `csv.gz`, `json.gz` etc. + // - `{{UUID}}` will be replaced with a random UUID to uniquely identify each file + // - `{{YEAR}}` will be replaced with the current year in `YYYY` format + // - `{{MONTH}}` will be replaced with the current month in `MM` format + // - `{{DAY}}` will be replaced with the current day in `DD` format + // - `{{HOUR}}` will be replaced with the current hour in `HH` format + // - `{{MINUTE}}` will be replaced with the current minute in `mm` format + // + // **Note** that timestamps are in `UTC` and will be the current time at the time the file is written, not when the sync started. + Path string `json:"path,omitempty" jsonschema:"required,pattern=^[^/].*$"` // other cases (//, ./, ../) are covered in extended part + + // If set to `true`, the plugin will write to one file per table. + // Otherwise, for every batch a new file will be created with a different `.` suffix. + NoRotate bool `json:"no_rotate,omitempty" jsonschema:"default=false"` + + // When `athena` is set to `true`, the S3 plugin will sanitize keys in JSON columns to be compatible with the Hive Metastore / Athena. + // This allows tables to be created with a Glue Crawler and then queried via Athena, without changes to the table schema. + Athena bool `json:"athena,omitempty" jsonschema:"default=false"` + + // Ensure write access to the given bucket and path by writing a test object on each sync. + // If you are sure that the bucket and path are writable, you can set this to `false` to skip the test. + TestWrite *bool `json:"test_write,omitempty" jsonschema:"default=true"` + + // Endpoint to use for S3 API calls. This is useful for S3-compatible storage services such as MinIO. + // **Note**: if you want to use path-style addressing, i.e., `https://s3.amazonaws.com/BUCKET/KEY`, `use_path_style` should be enabled, too. + Endpoint string `json:"endpoint,omitempty" jsonschema:"default="` + + // Allows to use path-style addressing in the `endpoint` option, i.e., `https://s3.amazonaws.com/BUCKET/KEY`. + // By default, the S3 client will use virtual hosted bucket addressing when possible (`https://BUCKET.s3.amazonaws.com/KEY`). + UsePathStyle bool `json:"use_path_style,omitempty" jsonschema:"default=false"` + + // Disable TLS verification for requests to your S3 endpoint. + // + // This option is intended to be used when using a custom endpoint using the `endpoint` option. + EndpointSkipTLSVerify bool `json:"endpoint_skip_tls_verify,omitempty" jsonschema:"default=false"` + + // Maximum number of items that may be grouped together to be written in a single write. + // + // Defaults to `10000` unless `no_rotate` is `true` (will be `0` then). + BatchSize *int64 `json:"batch_size" jsonschema:"minimum=1,default=10000"` + + // Maximum size of items that may be grouped together to be written in a single write. + // + // Defaults to `52428800` (50 MiB) unless `no_rotate` is `true` (will be `0` then). + BatchSizeBytes *int64 `json:"batch_size_bytes" jsonschema:"minimum=1,default=52428800"` + + // Maximum interval between batch writes. + // + // Defaults to `30s` unless `no_rotate` is `true` (will be `0s` then). + BatchTimeout *configtype.Duration `json:"batch_timeout" jsonschema:"default=30s"` +} + +func (s *Spec) SetDefaults() { + if !strings.Contains(s.Path, varTable) { + // for backwards-compatibility, default to given path plus /{{TABLE}}.[format].{{UUID}} if + // no {{TABLE}} value is found in the path string + s.Path += fmt.Sprintf("/%s.%s", varTable, s.Format) + if !s.NoRotate { + s.Path += "." + varUUID + } + } + if s.TestWrite == nil { + b := true + s.TestWrite = &b + } + if s.BatchSize == nil { + if s.NoRotate { + s.BatchSize = ptr(int64(0)) + } else { + s.BatchSize = ptr(int64(10000)) + } + } + if s.BatchSizeBytes == nil { + if s.NoRotate { + s.BatchSizeBytes = ptr(int64(0)) + } else { + s.BatchSizeBytes = ptr(int64(50 * 1024 * 1024)) // 50 MiB + } + } + if s.BatchTimeout == nil { + if s.NoRotate { + d := configtype.NewDuration(0) + s.BatchTimeout = &d + } else { + d := configtype.NewDuration(30 * time.Second) + s.BatchTimeout = &d + } + } +} + +func (s *Spec) Validate() error { + if len(s.Bucket) == 0 { + return fmt.Errorf("`bucket` is required") + } + if len(s.Region) == 0 { + return fmt.Errorf("`region` is required") + } + + if len(s.Path) == 0 { + return fmt.Errorf("`path` is required") + } + if path.IsAbs(s.Path) { + return fmt.Errorf("`path` should not start with a \"/\"") + } + if s.Path != path.Clean(s.Path) { + return fmt.Errorf("`path` should not contain relative paths or duplicate slashes") + } + + if s.NoRotate { + if strings.Contains(s.Path, varUUID) { + return fmt.Errorf("`path` should not contain %s when `no_rotate` = true", varUUID) + } + + if (s.BatchSize != nil && *s.BatchSize > 0) || (s.BatchSizeBytes != nil && *s.BatchSizeBytes > 0) || (s.BatchTimeout != nil && s.BatchTimeout.Duration() > 0) { + return fmt.Errorf("`no_rotate` cannot be used with non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`") + } + } + + if !strings.Contains(s.Path, varUUID) && s.batchingEnabled() { + return fmt.Errorf("`path` should contain %s when using a non-zero `batch_size`, `batch_size_bytes` or `batch_timeout_ms`", varUUID) + } + + // required for s.FileSpec.Validate call + err := s.FileSpec.UnmarshalSpec() + if err != nil { + return err + } + s.FileSpec.SetDefaults() + + return s.FileSpec.Validate() +} + +func (s *Spec) ReplacePathVariables(table string, fileIdentifier string, t time.Time) string { + name := strings.ReplaceAll(s.Path, varTable, table) + if strings.Contains(name, varFormat) { + e := string(s.Format) + s.Compression.Extension() + name = strings.ReplaceAll(name, varFormat, e) + } + name = strings.ReplaceAll(name, varUUID, fileIdentifier) + name = strings.ReplaceAll(name, varYear, t.Format("2006")) + name = strings.ReplaceAll(name, varMonth, t.Format("01")) + name = strings.ReplaceAll(name, varDay, t.Format("02")) + name = strings.ReplaceAll(name, varHour, t.Format("15")) + name = strings.ReplaceAll(name, varMinute, t.Format("04")) + return filepath.Clean(name) +} + +func (s *Spec) PathContainsUUID() bool { + return strings.Contains(s.Path, varUUID) +} + +func (s *Spec) batchingEnabled() bool { + if s.NoRotate { + // if that's set we don't allow batching + return false + } + + return (s.BatchSize == nil || *s.BatchSize > 0) || + (s.BatchSizeBytes == nil || *s.BatchSizeBytes > 0) || + (s.BatchTimeout == nil || s.BatchTimeout.Duration() > 0) +} + +func ptr[A any](a A) *A { + return &a +} diff --git a/plugins/destination/s3/client/spec/spec_test.go b/plugins/destination/s3/client/spec/spec_test.go new file mode 100644 index 00000000000000..82028dfb2c1dab --- /dev/null +++ b/plugins/destination/s3/client/spec/spec_test.go @@ -0,0 +1,84 @@ +package spec + +import ( + "fmt" + "testing" + "time" + + "github.com/cloudquery/filetypes/v4" + "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" +) + +const ( + region = "us-east-1" +) + +func TestSpec_SetDefaults(t *testing.T) { + dur0, dur30 := configtype.NewDuration(0), configtype.NewDuration(30*time.Second) + + cases := []struct { + Give Spec + Want Spec + }{ + + { + Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}}, + Want: Spec{Path: "test/path/{{TABLE}}.json.{{UUID}}", FileSpec: filetypes.FileSpec{Format: "json"}, TestWrite: boolPtr(true), BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, + }, + { + Give: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: filetypes.FileSpec{Format: "json", FormatSpec: map[string]any{"delimiter": ","}}, TestWrite: boolPtr(false)}, + Want: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: filetypes.FileSpec{Format: "json", FormatSpec: map[string]any{"delimiter": ","}}, TestWrite: boolPtr(false), BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, + }, + { + Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true}, + Want: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: filetypes.FileSpec{Format: "json"}, TestWrite: boolPtr(true), NoRotate: true, BatchSize: int64Ptr(0), BatchSizeBytes: int64Ptr(0), BatchTimeout: &dur0}, + }, + } + for _, tc := range cases { + got := tc.Give + got.SetDefaults() + if diff := cmp.Diff(tc.Want, got, cmpopts.IgnoreUnexported(filetypes.FileSpec{}, configtype.Duration{})); diff != "" { + t.Errorf("SetDefaults() mismatch (-want +got):\n%s", diff) + } + require.Equal(t, tc.Want.BatchTimeout, got.BatchTimeout) + } +} + +func TestSpec_Validate(t *testing.T) { + zero, one, dur0 := int64(0), int64(1), configtype.NewDuration(0) + cases := []struct { + Give Spec + WantErr bool + }{ + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, + {Give: Spec{Path: "test/path", FileSpec: filetypes.FileSpec{Format: "json"}, Region: "region", BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // no bucket + {Give: Spec{Path: "test/path/{{TABLE}}.{{UUID}}", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: false, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, + {Give: Spec{Path: "test/path/{{TABLE}}.{{UUID}}", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // can't have no_rotate and {{UUID}} + {Give: Spec{Path: "test/path/{{TABLE}}", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: false, Bucket: "mybucket", Region: region, BatchSize: &one, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // can't have nonzero batch size and no {{UUID}} + {Give: Spec{Path: "/test/path/{{TABLE}}.{{UUID}}", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // begins with a slash + {Give: Spec{Path: "//test/path/{{TABLE}}.{{UUID}}", FileSpec: filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // duplicate slashes + {Give: Spec{Path: "test//path", FileSpec: filetypes.FileSpec{Format: "json"}, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // duplicate slashes + } + for i, tc := range cases { + tc := tc + t.Run(fmt.Sprintf("Case %d", i+1), func(t *testing.T) { + err := tc.Give.Validate() + if tc.WantErr { + require.Error(t, err) + } else { + require.NoError(t, err) + } + }) + } +} + +func boolPtr(b bool) *bool { + return &b +} + +func int64Ptr(i int64) *int64 { + return &i +} diff --git a/plugins/destination/s3/client/spec_test.go b/plugins/destination/s3/client/spec_test.go deleted file mode 100644 index daa6d1e129bc53..00000000000000 --- a/plugins/destination/s3/client/spec_test.go +++ /dev/null @@ -1,80 +0,0 @@ -package client - -import ( - "fmt" - "testing" - "time" - - "github.com/cloudquery/filetypes/v4" - "github.com/cloudquery/plugin-sdk/v4/configtype" - "github.com/google/go-cmp/cmp" - "github.com/google/go-cmp/cmp/cmpopts" - "github.com/stretchr/testify/require" -) - -func TestSpec_SetDefaults(t *testing.T) { - dur0, dur30 := configtype.NewDuration(0), configtype.NewDuration(30*time.Second) - - cases := []struct { - Give Spec - Want Spec - }{ - - { - Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}}, - Want: Spec{Path: "test/path/{{TABLE}}.json.{{UUID}}", FileSpec: &filetypes.FileSpec{Format: "json"}, TestWrite: boolPtr(true), BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, - }, - { - Give: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: &filetypes.FileSpec{Format: "json", FormatSpec: map[string]any{"delimiter": ","}}, TestWrite: boolPtr(false)}, - Want: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: &filetypes.FileSpec{Format: "json", FormatSpec: map[string]any{"delimiter": ","}}, TestWrite: boolPtr(false), BatchSize: int64Ptr(10000), BatchSizeBytes: int64Ptr(50 * 1024 * 1024), BatchTimeout: &dur30}, - }, - { - Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true}, - Want: Spec{Path: "test/path/{{TABLE}}.json", FileSpec: &filetypes.FileSpec{Format: "json"}, TestWrite: boolPtr(true), NoRotate: true, BatchSize: int64Ptr(0), BatchSizeBytes: int64Ptr(0), BatchTimeout: &dur0}, - }, - } - for _, tc := range cases { - got := tc.Give - got.SetDefaults() - if diff := cmp.Diff(tc.Want, got, cmpopts.IgnoreUnexported(filetypes.FileSpec{}, configtype.Duration{})); diff != "" { - t.Errorf("SetDefaults() mismatch (-want +got):\n%s", diff) - } - require.Equal(t, tc.Want.BatchTimeout, got.BatchTimeout) - } -} - -func TestSpec_Validate(t *testing.T) { - zero, one, dur0 := int64(0), int64(1), configtype.NewDuration(0) - cases := []struct { - Give Spec - WantErr bool - }{ - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, - {Give: Spec{Path: "test/path", FileSpec: &filetypes.FileSpec{Format: "json"}, Region: "region", BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // no bucket - {Give: Spec{Path: "test/path/{{TABLE}}.{{UUID}}", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: false, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: false}, - {Give: Spec{Path: "test/path/{{TABLE}}.{{UUID}}", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // can't have no_rotate and {{UUID}} - {Give: Spec{Path: "test/path/{{TABLE}}", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: false, Bucket: "mybucket", Region: region, BatchSize: &one, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // can't have nonzero batch size and no {{UUID}} - {Give: Spec{Path: "/test/path/{{TABLE}}.{{UUID}}", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // begins with a slash - {Give: Spec{Path: "//test/path/{{TABLE}}.{{UUID}}", FileSpec: &filetypes.FileSpec{Format: "json"}, NoRotate: true, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // duplicate slashes - {Give: Spec{Path: "test//path", FileSpec: &filetypes.FileSpec{Format: "json"}, Bucket: "mybucket", Region: region, BatchSize: &zero, BatchSizeBytes: &zero, BatchTimeout: &dur0}, WantErr: true}, // duplicate slashes - } - for i, tc := range cases { - tc := tc - t.Run(fmt.Sprintf("Case %d", i+1), func(t *testing.T) { - err := tc.Give.Validate() - if tc.WantErr { - require.Error(t, err) - } else { - require.NoError(t, err) - } - }) - } -} - -func boolPtr(b bool) *bool { - return &b -} - -func int64Ptr(i int64) *int64 { - return &i -} diff --git a/plugins/destination/s3/client/write.go b/plugins/destination/s3/client/write.go index 38d39e29315b22..615c5620814a13 100644 --- a/plugins/destination/s3/client/write.go +++ b/plugins/destination/s3/client/write.go @@ -4,10 +4,8 @@ import ( "context" "encoding/json" "io" - "path" "reflect" "regexp" - "strings" "time" "github.com/apache/arrow/go/v15/arrow" @@ -21,17 +19,6 @@ import ( "github.com/google/uuid" ) -const ( - PathVarFormat = "{{FORMAT}}" - PathVarTable = "{{TABLE}}" - PathVarUUID = "{{UUID}}" - YearVar = "{{YEAR}}" - MonthVar = "{{MONTH}}" - DayVar = "{{DAY}}" - HourVar = "{{HOUR}}" - MinuteVar = "{{MINUTE}}" -) - var reInvalidJSONKey = regexp.MustCompile(`\W`) func (c *Client) WriteTable(ctx context.Context, msgs <-chan *message.WriteInsert) error { @@ -41,7 +28,7 @@ func (c *Client) WriteTable(ctx context.Context, msgs <-chan *message.WriteInser if s == nil { table := msg.GetTable() - objKey := c.replacePathVariables(table.Name, uuid.NewString(), time.Now().UTC()) + objKey := c.spec.ReplacePathVariables(table.Name, uuid.NewString(), time.Now().UTC()) var err error s, err = c.Client.StartStream(table, func(r io.Reader) error { @@ -144,18 +131,3 @@ func sanitizeJSONKeysForObject(obj any) { } } } - -func (c *Client) replacePathVariables(table, fileIdentifier string, t time.Time) string { - name := strings.ReplaceAll(c.spec.Path, PathVarTable, table) - if strings.Contains(name, PathVarFormat) { - e := string(c.spec.Format) + c.spec.Compression.Extension() - name = strings.ReplaceAll(name, PathVarFormat, e) - } - name = strings.ReplaceAll(name, PathVarUUID, fileIdentifier) - name = strings.ReplaceAll(name, YearVar, t.Format("2006")) - name = strings.ReplaceAll(name, MonthVar, t.Format("01")) - name = strings.ReplaceAll(name, DayVar, t.Format("02")) - name = strings.ReplaceAll(name, HourVar, t.Format("15")) - name = strings.ReplaceAll(name, MinuteVar, t.Format("04")) - return path.Clean(name) -} diff --git a/plugins/destination/s3/client/write_test.go b/plugins/destination/s3/client/write_test.go index 7a46258a3b425a..a0f1f999b732bc 100644 --- a/plugins/destination/s3/client/write_test.go +++ b/plugins/destination/s3/client/write_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec" "github.com/cloudquery/filetypes/v4" "github.com/google/go-cmp/cmp" ) @@ -124,14 +125,12 @@ func TestReplacePathVariables(t *testing.T) { tm := time.Date(2021, 3, 5, 4, 1, 2, 3, time.UTC) for _, tc := range cases { c := &Client{ - spec: &Spec{ - Path: tc.inputPath, - FileSpec: &filetypes.FileSpec{ - Format: filetypes.FormatTypeJSON, - }, + spec: &spec.Spec{ + Path: tc.inputPath, + FileSpec: filetypes.FileSpec{Format: filetypes.FormatTypeJSON}, }, } - if diff := cmp.Diff(tc.expectedPath, c.replacePathVariables(tc.tableName, tc.uuid, tm)); diff != "" { + if diff := cmp.Diff(tc.expectedPath, c.spec.ReplacePathVariables(tc.tableName, tc.uuid, tm)); diff != "" { t.Errorf("unexpected Path Substitution (-want +got):\n%s", diff) } } diff --git a/plugins/destination/s3/docs/overview.md b/plugins/destination/s3/docs/overview.md index dd2e5f62a2ecd3..64c49f0f4efbe2 100644 --- a/plugins/destination/s3/docs/overview.md +++ b/plugins/destination/s3/docs/overview.md @@ -43,9 +43,9 @@ This is the (nested) spec used by the CSV destination Plugin. - `{{HOUR}}` will be replaced with the current hour in `HH` format - `{{MINUTE}}` will be replaced with the current minute in `mm` format - Note that timestamps are in UTC and will be the current time at the time the file is written, not when the sync started. + **Note** that timestamps are in `UTC` and will be the current time at the time the file is written, not when the sync started. -- `format` (string) (required) +- `format` (`string`) (required) Format of the output file. Supported values are `csv`, `json` and `parquet`. @@ -53,9 +53,9 @@ This is the (nested) spec used by the CSV destination Plugin. Optional parameters to change the format of the file. -- `compression` (`string`) (optional) (default: empty) +- `compression` (`string`) (optional) (default: `""`) - Compression algorithm to use. Supported values are empty or `gzip`. Not supported for `parquet` format. + Compression algorithm to use. Supported values are `""` or `gzip`. Not supported for `parquet` format. - `no_rotate` (`boolean`) (optional) (default: `false`) @@ -72,14 +72,16 @@ This is the (nested) spec used by the CSV destination Plugin. Ensure write access to the given bucket and path by writing a test object on each sync. If you are sure that the bucket and path are writable, you can set this to `false` to skip the test. -- `endpoint` (`string`) (optional) (default: empty) +- `endpoint` (`string`) (optional) (default: `""`) Endpoint to use for S3 API calls. This is useful for S3-compatible storage services such as MinIO. - Note: if you want to use path-style addressing, i.e., `https://s3.amazonaws.com/BUCKET/KEY`, `use_path_style` should be enabled, too. + **Note**: if you want to use path-style addressing, i.e., `https://s3.amazonaws.com/BUCKET/KEY`, `use_path_style` should be enabled, too. - `endpoint_skip_tls_verify` (`boolean`) (optional) (default: `false`) - Disable TLS verification for requests to your S3 endpoint. This option is intended to be used when using a custom endpoint using the `endpoint` option. + Disable TLS verification for requests to your S3 endpoint. + + This option is intended to be used when using a custom endpoint using the `endpoint` option. - `use_path_style` (`boolean`) (optional) (default: `false`) diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 0f1396ae6f82c0..b2e533f747a538 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -10,12 +10,15 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 + github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 + github.com/wk8/go-ordered-map/v2 v2.1.8 ) require ( @@ -53,7 +56,6 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/cloudquery/cloudquery-api-go v1.7.2 // indirect - github.com/cloudquery/codegen v0.3.12 // indirect github.com/cloudquery/plugin-pb-go v1.16.7 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -79,7 +81,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -123,7 +124,6 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect diff --git a/plugins/destination/s3/main.go b/plugins/destination/s3/main.go index e665924c5b925e..e4dc3f3c3b760a 100644 --- a/plugins/destination/s3/main.go +++ b/plugins/destination/s3/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/s3/client" + "github.com/cloudquery/cloudquery/plugins/destination/s3/client/spec" internalPlugin "github.com/cloudquery/cloudquery/plugins/destination/s3/resources/plugin" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -18,6 +19,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(spec.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatalf("failed to serve plugin: %v", err) From 44e31744601a4cce81316a0eefc15bc046ab194b Mon Sep 17 00:00:00 2001 From: Marcel <144216124+maaarcelino@users.noreply.github.com> Date: Fri, 2 Feb 2024 13:35:09 +0100 Subject: [PATCH 38/78] feat: Add JSON schema support to Digitalocean (#16371) fixes #16331 --- plugins/source/digitalocean/Makefile | 6 +- .../source/digitalocean/client/schema.json | 50 ++++++++++++++++ plugins/source/digitalocean/client/spec.go | 14 +++-- .../digitalocean/client/spec/gen/main.go | 26 ++++++++ .../source/digitalocean/client/spec_test.go | 60 +++++++++++++++++++ plugins/source/digitalocean/go.mod | 4 ++ plugins/source/digitalocean/go.sum | 6 +- .../digitalocean/resources/plugin/plugin.go | 2 + 8 files changed, 161 insertions(+), 7 deletions(-) create mode 100644 plugins/source/digitalocean/client/schema.json create mode 100644 plugins/source/digitalocean/client/spec/gen/main.go create mode 100644 plugins/source/digitalocean/client/spec_test.go diff --git a/plugins/source/digitalocean/Makefile b/plugins/source/digitalocean/Makefile index 1a0c158847bf56..bf6eb1f8bfc46b 100644 --- a/plugins/source/digitalocean/Makefile +++ b/plugins/source/digitalocean/Makefile @@ -28,6 +28,10 @@ gen-docs: build cloudquery tables --format markdown --output-dir docs test/config.yml mv docs/$(shell basename $(CURDIR)) docs/tables +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + # All gen targets .PHONY: gen -gen: generate-mocks gen-docs \ No newline at end of file +gen: generate-mocks gen-docs gen-spec-schema \ No newline at end of file diff --git a/plugins/source/digitalocean/client/schema.json b/plugins/source/digitalocean/client/schema.json new file mode 100644 index 00000000000000..18fc264000282c --- /dev/null +++ b/plugins/source/digitalocean/client/schema.json @@ -0,0 +1,50 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/source/digitalocean/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "token": { + "type": "string", + "description": "Token is the DigitalOcean API access token.\n\nIf left empty it must be provided via either `DIGITALOCEAN_TOKEN` or `DIGITALOCEAN_ACCESS_TOKEN` environment variable." + }, + "spaces_regions": { + "oneOf": [ + { + "items": { + "type": "string", + "minLength": 1 + }, + "type": "array", + "description": "SpacesRegions is a list of DO regions to fetch spaces from, if not given we execute on all regions" + }, + { + "type": "null" + } + ] + }, + "spaces_access_key": { + "type": "string", + "description": "SpacesAccessKey is the secret access token generated in DO control panel" + }, + "spaces_access_key_id": { + "type": "string", + "description": "SpacesAccessKeyId is the unique identifier of the access key generated in the DO control panel" + }, + "spaces_debug_logging": { + "type": "boolean", + "description": "SpacesDebugLogging allows enabling AWS S3 request logging on spaces requests" + }, + "concurrency": { + "type": "integer", + "minimum": 1, + "default": 10000 + } + }, + "additionalProperties": false, + "type": "object", + "description": "Spec defines DigitalOcean source plugin Spec" + } + } +} diff --git a/plugins/source/digitalocean/client/spec.go b/plugins/source/digitalocean/client/spec.go index 173f8c9f14f1ed..c1dc9de13720fd 100644 --- a/plugins/source/digitalocean/client/spec.go +++ b/plugins/source/digitalocean/client/spec.go @@ -1,16 +1,19 @@ package client import ( - "os" - + _ "embed" "github.com/pkg/errors" + "os" ) // Spec defines DigitalOcean source plugin Spec type Spec struct { + // Token is the DigitalOcean API access token. + // + // If left empty it must be provided via either `DIGITALOCEAN_TOKEN` or `DIGITALOCEAN_ACCESS_TOKEN` environment variable. Token string `json:"token,omitempty"` // SpacesRegions is a list of DO regions to fetch spaces from, if not given we execute on all regions - SpacesRegions []string `json:"spaces_regions,omitempty"` + SpacesRegions []string `json:"spaces_regions,omitempty" jsonschema:"minLength=1"` // SpacesAccessKey is the secret access token generated in DO control panel SpacesAccessKey string `json:"spaces_access_key,omitempty"` // SpacesAccessKeyId is the unique identifier of the access key generated in the DO control panel @@ -18,7 +21,7 @@ type Spec struct { // SpacesDebugLogging allows enabling AWS S3 request logging on spaces requests SpacesDebugLogging bool `json:"spaces_debug_logging,omitempty"` - Concurrency int `json:"concurrency,omitempty"` + Concurrency int `json:"concurrency,omitempty" jsonschema:"minimum=1,default=10000"` } func (s *Spec) SetDefaults() { @@ -65,3 +68,6 @@ func getSpacesTokenFromEnv() (string, string) { } return spacesAccessKey, spacesSecretKey } + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/source/digitalocean/client/spec/gen/main.go b/plugins/source/digitalocean/client/spec/gen/main.go new file mode 100644 index 00000000000000..fced606186a1ee --- /dev/null +++ b/plugins/source/digitalocean/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "github.com/cloudquery/cloudquery/plugins/source/digitalocean/client" + "log" + "path" + "runtime" + + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/source/digitalocean/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/source/digitalocean/client/spec_test.go b/plugins/source/digitalocean/client/spec_test.go new file mode 100644 index 00000000000000..acb346b8a3d387 --- /dev/null +++ b/plugins/source/digitalocean/client/spec_test.go @@ -0,0 +1,60 @@ +package client + +import ( + "github.com/cloudquery/codegen/jsonschema" + "testing" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + }, + { + Name: "spec with token", + Spec: `{"token": "abc"}`, + }, + { + Name: "spec with integer token", + Spec: `{"token": 123}`, + Err: true, + }, + { + Name: "spec with spaces_access_key", + Spec: `{"spaces_access_key": "abc"}`, + }, + { + Name: "spec with integer spaces_access_key", + Spec: `{"spaces_access_key": 123}`, + Err: true, + }, + { + Name: "spec with spaces_access_key_id", + Spec: `{"spaces_access_key_id": "abc"}`, + }, + { + Name: "spec with integer spaces_access_key_id", + Spec: `{"spaces_access_key_id": 123}`, + Err: true, + }, + { + Name: "spec with empty spaces_regions", + Spec: `{"spaces_regions":[]}`, + }, + { + Name: "spec with valid spaces_regions", + Spec: `{"spaces_regions":["abc"]}`, + }, + { + Name: "spec with blank spaces_regions", + Spec: `{"spaces_regions":[""]}`, + Err: true, + }, + { + Name: "spec with integer spaces_regions", + Spec: `{"spaces_regions":[123]}`, + Err: true, + }, + }) +} diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index 3c929a486c09f4..a0a99f7be403b6 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -9,6 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 github.com/aws/smithy-go v1.19.0 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/digitalocean/godo v1.99.0 github.com/golang/mock v1.6.0 @@ -147,3 +148,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index b181eba51e29a3..aaa849e25a0ba3 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -85,6 +85,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -172,8 +176,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/source/digitalocean/resources/plugin/plugin.go b/plugins/source/digitalocean/resources/plugin/plugin.go index 3357059a74631e..9d9886fa02a99a 100644 --- a/plugins/source/digitalocean/resources/plugin/plugin.go +++ b/plugins/source/digitalocean/resources/plugin/plugin.go @@ -1,6 +1,7 @@ package plugin import ( + "github.com/cloudquery/cloudquery/plugins/source/digitalocean/client" "github.com/cloudquery/plugin-sdk/v4/plugin" ) @@ -18,5 +19,6 @@ func Plugin() *plugin.Plugin { Configure, plugin.WithKind(Kind), plugin.WithTeam(Team), + plugin.WithJSONSchema(client.JSONSchema), ) } From dd8a3b6d844e3e182799c58a971e7168363f3311 Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Fri, 2 Feb 2024 07:54:58 -0600 Subject: [PATCH 39/78] fix: Update migration to skip unique constraint changes (#16481) #### Summary Update migration to skip unique constraint changes --- plugins/destination/sqlite/client/migrate.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/destination/sqlite/client/migrate.go b/plugins/destination/sqlite/client/migrate.go index bd702626b252ac..28d2e68cac8647 100644 --- a/plugins/destination/sqlite/client/migrate.go +++ b/plugins/destination/sqlite/client/migrate.go @@ -120,6 +120,8 @@ func (*Client) canAutoMigrate(changes []schema.TableColumnChange) bool { if change.Previous.PrimaryKey || change.Previous.NotNull { return false } + case schema.TableColumnChangeTypeRemoveUniqueConstraint: + continue default: return false } From 7b6582d6bab7394286f7852b693cefcbc7a7469b Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Fri, 2 Feb 2024 16:04:17 +0200 Subject: [PATCH 40/78] feat: Add JSON schema to `postgresql` destination plugin (#16479) Closes https://github.com/cloudquery/cloudquery/issues/14617 --- .github/workflows/dest_postgresql.yml | 6 + plugins/destination/postgresql/Makefile | 10 ++ .../destination/postgresql/client/client.go | 28 ++--- .../postgresql/client/client_test.go | 6 +- .../postgresql/client/pgx_log_level.go | 63 ---------- plugins/destination/postgresql/client/spec.go | 33 ------ .../postgresql/client/spec/gen/main.go | 30 +++++ .../postgresql/client/spec/pgx_log_level.go | 70 +++++++++++ .../client/spec/pgx_log_level_test.go | 30 +++++ .../postgresql/client/spec/schema.json | 62 ++++++++++ .../postgresql/client/spec/spec.go | 67 +++++++++++ .../postgresql/client/spec/spec_test.go | 111 ++++++++++++++++++ plugins/destination/postgresql/go.mod | 18 ++- plugins/destination/postgresql/go.sum | 23 +++- plugins/destination/postgresql/main.go | 2 + 15 files changed, 440 insertions(+), 119 deletions(-) delete mode 100644 plugins/destination/postgresql/client/pgx_log_level.go delete mode 100644 plugins/destination/postgresql/client/spec.go create mode 100644 plugins/destination/postgresql/client/spec/gen/main.go create mode 100644 plugins/destination/postgresql/client/spec/pgx_log_level.go create mode 100644 plugins/destination/postgresql/client/spec/pgx_log_level_test.go create mode 100644 plugins/destination/postgresql/client/spec/schema.json create mode 100644 plugins/destination/postgresql/client/spec/spec.go create mode 100644 plugins/destination/postgresql/client/spec/spec_test.go diff --git a/.github/workflows/dest_postgresql.yml b/.github/workflows/dest_postgresql.yml index df0c96b3b5ae55..49591969a5826d 100644 --- a/.github/workflows/dest_postgresql.yml +++ b/.github/workflows/dest_postgresql.yml @@ -58,6 +58,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test PG diff --git a/plugins/destination/postgresql/Makefile b/plugins/destination/postgresql/Makefile index c957b06653ed16..5c3df7adfed0c8 100644 --- a/plugins/destination/postgresql/Makefile +++ b/plugins/destination/postgresql/Makefile @@ -7,3 +7,13 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + # required for loading comments from filetypes + go mod vendor + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/postgresql/client/client.go b/plugins/destination/postgresql/client/client.go index 97a765ec70b02a..279f4f1b292056 100644 --- a/plugins/destination/postgresql/client/client.go +++ b/plugins/destination/postgresql/client/client.go @@ -6,6 +6,7 @@ import ( "fmt" "strings" + "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec" "github.com/cloudquery/plugin-sdk/v4/message" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/writers/mixedbatchwriter" @@ -49,19 +50,18 @@ func New(ctx context.Context, logger zerolog.Logger, specBytes []byte, opts plug return c, nil } - var spec Spec - err := json.Unmarshal(specBytes, &spec) - if err != nil { + var s spec.Spec + if err := json.Unmarshal(specBytes, &s); err != nil { return nil, err } - spec.SetDefaults() - c.batchSize = spec.BatchSize - logLevel, err := tracelog.LogLevelFromString(spec.PgxLogLevel.String()) - if err != nil { - return nil, fmt.Errorf("failed to parse pgx log level %s: %w", spec.PgxLogLevel.String(), err) + s.SetDefaults() + if err := s.Validate(); err != nil { + return nil, err } - c.logger.Info().Str("pgx_log_level", spec.PgxLogLevel.String()).Msg("Initializing postgresql destination") - pgxConfig, err := pgxpool.ParseConfig(spec.ConnectionString) + + c.batchSize = s.BatchSize + c.logger.Info().Str("pgx_log_level", s.PgxLogLevel.String()).Msg("Initializing postgresql destination") + pgxConfig, err := pgxpool.ParseConfig(s.ConnectionString) if err != nil { return nil, fmt.Errorf("failed to parse connection string %w", err) } @@ -71,7 +71,7 @@ func New(ctx context.Context, logger zerolog.Logger, specBytes []byte, opts plug pgxConfig.ConnConfig.Tracer = &tracelog.TraceLog{ Logger: pgx_zero_log.NewLogger(c.logger), - LogLevel: logLevel, + LogLevel: s.PgxLogLevel.LogLevel(), } // maybe expose this to the user? pgxConfig.ConnConfig.RuntimeParams["timezone"] = "UTC" @@ -94,9 +94,9 @@ func New(ctx context.Context, logger zerolog.Logger, specBytes []byte, opts plug } c.writer, err = mixedbatchwriter.New(c, mixedbatchwriter.WithLogger(c.logger), - mixedbatchwriter.WithBatchSize(spec.BatchSize), - mixedbatchwriter.WithBatchSizeBytes(spec.BatchSizeBytes), - mixedbatchwriter.WithBatchTimeout(spec.BatchTimeout.Duration()), + mixedbatchwriter.WithBatchSize(s.BatchSize), + mixedbatchwriter.WithBatchSizeBytes(s.BatchSizeBytes), + mixedbatchwriter.WithBatchTimeout(s.BatchTimeout.Duration()), ) if err != nil { return nil, err diff --git a/plugins/destination/postgresql/client/client_test.go b/plugins/destination/postgresql/client/client_test.go index 2c495d6d7e4f10..06fc74c1d89c96 100644 --- a/plugins/destination/postgresql/client/client_test.go +++ b/plugins/destination/postgresql/client/client_test.go @@ -7,8 +7,10 @@ import ( "testing" "time" + "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/schema" + "github.com/jackc/pgx/v5/tracelog" ) func getTestConnection() string { @@ -30,9 +32,9 @@ var safeMigrations = plugin.SafeMigrations{ func TestPgPlugin(t *testing.T) { ctx := context.Background() p := plugin.NewPlugin("postgresql", "development", New) - s := &Spec{ + s := &spec.Spec{ ConnectionString: getTestConnection(), - PgxLogLevel: LogLevelTrace, + PgxLogLevel: spec.LogLevel(tracelog.LogLevelTrace), } b, err := json.Marshal(s) if err != nil { diff --git a/plugins/destination/postgresql/client/pgx_log_level.go b/plugins/destination/postgresql/client/pgx_log_level.go deleted file mode 100644 index fc6158183af520..00000000000000 --- a/plugins/destination/postgresql/client/pgx_log_level.go +++ /dev/null @@ -1,63 +0,0 @@ -package client - -import ( - "bytes" - "encoding/json" - "fmt" - "strings" -) - -type LogLevel int - -const ( - LogLevelError LogLevel = iota - LogLevelWarn - LogLevelInfo - LogLevelDebug - LogLevelTrace -) - -var logLevels = [...]string{ - LogLevelError: "error", - LogLevelWarn: "warn", - LogLevelInfo: "info", - LogLevelDebug: "debug", - LogLevelTrace: "trace", -} - -func (r *LogLevel) String() string { - return logLevels[*r] -} -func (r *LogLevel) MarshalJSON() ([]byte, error) { - buffer := bytes.NewBufferString(`"`) - buffer.WriteString(r.String()) - buffer.WriteString(`"`) - return buffer.Bytes(), nil -} - -func (r *LogLevel) UnmarshalJSON(data []byte) (err error) { - var loglevel string - if err := json.Unmarshal(data, &loglevel); err != nil { - return err - } - if *r, err = logLevelFromString(loglevel); err != nil { - return err - } - return nil -} - -func logLevelFromString(s string) (LogLevel, error) { - if len(s) == 0 { - return LogLevelError, nil - } - - s = strings.ToLower(s) - - for i, level := range logLevels { - if level == s { - return LogLevel(i), nil - } - } - - return LogLevelError, fmt.Errorf("invalid level %s", s) -} diff --git a/plugins/destination/postgresql/client/spec.go b/plugins/destination/postgresql/client/spec.go deleted file mode 100644 index d7ed9e56b68880..00000000000000 --- a/plugins/destination/postgresql/client/spec.go +++ /dev/null @@ -1,33 +0,0 @@ -package client - -import ( - "time" - - "github.com/cloudquery/plugin-sdk/v4/configtype" -) - -const ( - defaultBatchSize = 10000 - defaultBatchSizeBytes = 100000000 - defaultBatchTimeout = 60 * time.Second -) - -type Spec struct { - ConnectionString string `json:"connection_string,omitempty"` - PgxLogLevel LogLevel `json:"pgx_log_level,omitempty"` - BatchSize int `json:"batch_size,omitempty"` - BatchSizeBytes int `json:"batch_size_bytes,omitempty"` - BatchTimeout configtype.Duration `json:"batch_timeout,omitempty"` -} - -func (s *Spec) SetDefaults() { - if s.BatchSize <= 0 { - s.BatchSize = defaultBatchSize - } - if s.BatchSizeBytes <= 0 { - s.BatchSizeBytes = defaultBatchSizeBytes - } - if s.BatchTimeout.Duration() <= 0 { - s.BatchTimeout = configtype.NewDuration(defaultBatchTimeout) - } -} diff --git a/plugins/destination/postgresql/client/spec/gen/main.go b/plugins/destination/postgresql/client/spec/gen/main.go new file mode 100644 index 00000000000000..6ed77f08e38b28 --- /dev/null +++ b/plugins/destination/postgresql/client/spec/gen/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec" + "github.com/cloudquery/codegen/jsonschema" + "github.com/cloudquery/filetypes/v4" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + append(filetypes.FileSpec{}.JSONSchemaOptions(), + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec", path.Join(currDir(), "..")), + jsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), + )..., + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/postgresql/client/spec/pgx_log_level.go b/plugins/destination/postgresql/client/spec/pgx_log_level.go new file mode 100644 index 00000000000000..975ef9434a591f --- /dev/null +++ b/plugins/destination/postgresql/client/spec/pgx_log_level.go @@ -0,0 +1,70 @@ +package spec + +import ( + "bytes" + "encoding/json" + "strings" + + "github.com/invopop/jsonschema" + "github.com/jackc/pgx/v5/tracelog" +) + +type LogLevel tracelog.LogLevel + +var logLevels = [...]string{ + tracelog.LogLevelTrace: tracelog.LogLevelTrace.String(), + tracelog.LogLevelDebug: tracelog.LogLevelDebug.String(), + tracelog.LogLevelInfo: tracelog.LogLevelInfo.String(), + tracelog.LogLevelWarn: tracelog.LogLevelWarn.String(), + tracelog.LogLevelError: tracelog.LogLevelError.String(), + tracelog.LogLevelNone: tracelog.LogLevelNone.String(), +} + +func (LogLevel) JSONSchema() *jsonschema.Schema { + levels := make([]any, len(logLevels)) + for i, lvl := range logLevels { + levels[i] = lvl + } + + return &jsonschema.Schema{ + Type: "string", + Enum: levels, + Title: "PostgreSQL driver log level", + Description: "Defines what [`pgx`](https://github.com/jackc/pgx) call events should be logged.", + Default: tracelog.LogLevelError.String(), + } +} + +func (r LogLevel) String() string { + return r.LogLevel().String() +} + +func (r LogLevel) LogLevel() tracelog.LogLevel { + return tracelog.LogLevel(r) +} + +func (r *LogLevel) MarshalJSON() ([]byte, error) { + buffer := bytes.NewBufferString(`"`) + buffer.WriteString(r.String()) + buffer.WriteString(`"`) + return buffer.Bytes(), nil +} + +func (r *LogLevel) UnmarshalJSON(data []byte) (err error) { + var loglevel string + if err := json.Unmarshal(data, &loglevel); err != nil { + return err + } + if *r, err = logLevelFromString(loglevel); err != nil { + return err + } + return nil +} + +func logLevelFromString(s string) (LogLevel, error) { + if len(s) == 0 { + return LogLevel(tracelog.LogLevelError), nil + } + res, err := tracelog.LogLevelFromString(strings.ToLower(s)) // we could use just the string value per enum in schema + return LogLevel(res), err +} diff --git a/plugins/destination/postgresql/client/spec/pgx_log_level_test.go b/plugins/destination/postgresql/client/spec/pgx_log_level_test.go new file mode 100644 index 00000000000000..2624d65d9f9610 --- /dev/null +++ b/plugins/destination/postgresql/client/spec/pgx_log_level_test.go @@ -0,0 +1,30 @@ +package spec + +import ( + "encoding/json" + "strconv" + "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" +) + +func TestLogLevel_JSONSchema(t *testing.T) { + sc := LogLevel(0).JSONSchema() + data, err := json.Marshal(sc) + require.NoError(t, err) + + cases := make([]jsonschema.TestCase, len(sc.Enum)) + for i, e := range sc.Enum { + val := strconv.Quote(e.(string)) + cases[i] = jsonschema.TestCase{Name: val, Spec: val} + } + + jsonschema.TestJSONSchema(t, string(data), + append(cases, + jsonschema.TestCase{Name: "null", Spec: `null`, Err: true}, + jsonschema.TestCase{Name: "integer", Spec: `123`, Err: true}, + jsonschema.TestCase{Name: "bad value", Spec: `"some_extra_value"`, Err: true}, + ), + ) +} diff --git a/plugins/destination/postgresql/client/spec/schema.json b/plugins/destination/postgresql/client/spec/schema.json new file mode 100644 index 00000000000000..a2c8236c349864 --- /dev/null +++ b/plugins/destination/postgresql/client/spec/schema.json @@ -0,0 +1,62 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "LogLevel": { + "type": "string", + "enum": [ + "", + "none", + "error", + "warn", + "info", + "debug", + "trace" + ], + "title": "PostgreSQL driver log level", + "description": "Defines what [`pgx`](https://github.com/jackc/pgx) call events should be logged.", + "default": "error" + }, + "Spec": { + "properties": { + "connection_string": { + "type": "string", + "minLength": 1, + "description": "Connection string to connect to the database. This can be a URL or a DSN, as per [`pgxpool`](https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig)\n\n- `\"postgres://jack:secret@localhost:5432/mydb?sslmode=prefer\"` _connect with tcp and prefer TLS_\n- `\"postgres://jack:secret@localhost:5432/mydb?sslmode=disable\u0026application_name=pgxtest\u0026search_path=myschema\u0026connect_timeout=5\"` _be explicit with all options_\n- `\"postgres://localhost:5432/mydb?sslmode=disable\"` _connect with os username cloudquery is being run as_\n- `\"postgres:///mydb?host=/tmp\"` _connect over unix socket_\n- `\"dbname=mydb\"` _unix domain socket, just specifying the db name - useful if you want to use peer authentication_\n- `\"user=jack password=jack\\\\'ssooper\\\\\\\\secret host=localhost port=5432 dbname=mydb sslmode=disable\"` _DSN with escaped backslash and single quote_" + }, + "pgx_log_level": { + "$ref": "#/$defs/LogLevel", + "description": "Available: `error`, `warn`, `info`, `debug`, `trace`.\nDefines what [`pgx`](https://github.com/jackc/pgx) call events should be logged." + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Maximum number of items that may be grouped together to be written in a single write.", + "default": 10000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Maximum size of items that may be grouped together to be written in a single write.", + "default": 100000000 + }, + "batch_timeout": { + "$ref": "#/$defs/Duration", + "description": "Maximum interval between batch writes.", + "default": "60s" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "connection_string" + ] + } + } +} diff --git a/plugins/destination/postgresql/client/spec/spec.go b/plugins/destination/postgresql/client/spec/spec.go new file mode 100644 index 00000000000000..8f2757ad469811 --- /dev/null +++ b/plugins/destination/postgresql/client/spec/spec.go @@ -0,0 +1,67 @@ +package spec + +import ( + _ "embed" + "errors" + "time" + + "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/invopop/jsonschema" +) + +const ( + defaultBatchSize = 10000 + defaultBatchSizeBytes = 100000000 + defaultBatchTimeout = 60 * time.Second +) + +type Spec struct { + // Connection string to connect to the database. This can be a URL or a DSN, as per [`pgxpool`](https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig) + // + // - `"postgres://jack:secret@localhost:5432/mydb?sslmode=prefer"` _connect with tcp and prefer TLS_ + // - `"postgres://jack:secret@localhost:5432/mydb?sslmode=disable&application_name=pgxtest&search_path=myschema&connect_timeout=5"` _be explicit with all options_ + // - `"postgres://localhost:5432/mydb?sslmode=disable"` _connect with os username cloudquery is being run as_ + // - `"postgres:///mydb?host=/tmp"` _connect over unix socket_ + // - `"dbname=mydb"` _unix domain socket, just specifying the db name - useful if you want to use peer authentication_ + // - `"user=jack password=jack\\'ssooper\\\\secret host=localhost port=5432 dbname=mydb sslmode=disable"` _DSN with escaped backslash and single quote_ + ConnectionString string `json:"connection_string,omitempty" jsonschema:"required,minLength=1"` + + // Available: `error`, `warn`, `info`, `debug`, `trace`. + // Defines what [`pgx`](https://github.com/jackc/pgx) call events should be logged. + PgxLogLevel LogLevel `json:"pgx_log_level,omitempty" jsonschema:"default=error"` + + // Maximum number of items that may be grouped together to be written in a single write. + BatchSize int `json:"batch_size,omitempty" jsonschema:"minimum=1,default=10000"` + + // Maximum size of items that may be grouped together to be written in a single write. + BatchSizeBytes int `json:"batch_size_bytes,omitempty" jsonschema:"minimum=1,default=100000000"` + + // Maximum interval between batch writes. + BatchTimeout configtype.Duration `json:"batch_timeout,omitempty"` +} + +func (s *Spec) SetDefaults() { + if s.BatchSize <= 0 { + s.BatchSize = defaultBatchSize + } + if s.BatchSizeBytes <= 0 { + s.BatchSizeBytes = defaultBatchSizeBytes + } + if s.BatchTimeout.Duration() <= 0 { + s.BatchTimeout = configtype.NewDuration(defaultBatchTimeout) + } +} + +func (s *Spec) Validate() error { + if len(s.ConnectionString) == 0 { + return errors.New("`connection_string` is required") + } + return nil +} + +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Properties.Value("batch_timeout").Default = "60s" +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/postgresql/client/spec/spec_test.go b/plugins/destination/postgresql/client/spec/spec_test.go new file mode 100644 index 00000000000000..0c86ee88e6d44f --- /dev/null +++ b/plugins/destination/postgresql/client/spec/spec_test.go @@ -0,0 +1,111 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpec_JSONSchemaExtend(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "missing connection_string", + Spec: `{}`, + Err: true, + }, + { + Name: "empty connection_string", + Spec: `{"connection_string": ""}`, + Err: true, + }, + { + Name: "null connection_string", + Spec: `{"connection_string": null}`, + Err: true, + }, + { + Name: "integer connection_string", + Spec: `{"connection_string": 123}`, + Err: true, + }, + { + Name: "non-empty connection_string", + Spec: `{"connection_string": "abc"}`, + }, + // pgx_log_level is tested separately, just test null here + { + Name: "null pgx_log_level", + Spec: `{"connection_string": "abc", "pgx_log_level": null}`, + Err: true, + }, + { + Name: "zero batch_size", + Spec: `{"connection_string": "abc", "batch_size": 0}`, + Err: true, + }, + { + Name: "negative batch_size", + Spec: `{"connection_string": "abc", "batch_size": -1}`, + Err: true, + }, + { + Name: "float batch_size", + Spec: `{"connection_string": "abc", "batch_size": 1.5}`, + Err: true, + }, + { + Name: "null batch_size", + Spec: `{"connection_string": "abc", "batch_size": null}`, + Err: true, + }, + { + Name: "string batch_size", + Spec: `{"connection_string": "abc", "batch_size": "123"}`, + Err: true, + }, + { + Name: "proper batch_size", + Spec: `{"connection_string": "abc", "batch_size": 123}`, + }, + { + Name: "zero batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": 0}`, + Err: true, + }, + { + Name: "negative batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": -1}`, + Err: true, + }, + { + Name: "float batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": 1.5}`, + Err: true, + }, + { + Name: "null batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": null}`, + Err: true, + }, + { + Name: "string batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": "123"}`, + Err: true, + }, + { + Name: "proper batch_size_bytes", + Spec: `{"connection_string": "abc", "batch_size_bytes": 123}`, + }, + // batch_timeout is tested in configtype package, test only null & empty here + { + Name: "empty batch_timeout", + Spec: `{"connection_string": "abc", "batch_timeout": ""}`, + Err: true, + }, + { + Name: "null batch_timeout", + Spec: `{"connection_string": "abc", "batch_timeout": null}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index d2d7c4d80d2dee..231969681ae2f4 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -1,11 +1,16 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql -go 1.21.4 +go 1.21.5 + +toolchain go1.21.6 require ( - github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 + github.com/cloudquery/codegen v0.3.12 + github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 + github.com/invopop/jsonschema v0.12.0 github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb github.com/jackc/pgx/v5 v5.3.1 github.com/rs/zerolog v1.31.0 @@ -16,11 +21,13 @@ require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet/v6 v6.2.0 // indirect + github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect + github.com/apache/thrift v0.19.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect @@ -56,7 +63,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect @@ -69,6 +75,7 @@ require ( github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect + github.com/klauspost/asmfmt v1.3.2 // indirect github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect @@ -79,6 +86,8 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/microcosm-cc/bluemonday v1.0.26 // indirect + github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect + github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect @@ -128,3 +137,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 69d9d9a6812f6f..4378e41f24af91 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -4,6 +4,8 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4s github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= +github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= @@ -19,8 +21,10 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 h1:iRgSd0hkAl8itNDxS4fbs681vr35taMkifcolb+AhCw= +github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= +github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -47,6 +51,12 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= +github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -128,8 +138,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= @@ -161,6 +169,8 @@ github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= +github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= +github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -191,6 +201,10 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= +github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= +github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -234,6 +248,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= 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 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= diff --git a/plugins/destination/postgresql/main.go b/plugins/destination/postgresql/main.go index 6e068c2f35ac20..ea44dc2e9d3f57 100644 --- a/plugins/destination/postgresql/main.go +++ b/plugins/destination/postgresql/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client" + "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec" "github.com/cloudquery/cloudquery/plugins/destination/postgresql/resources/plugin" pluginSDK "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -18,6 +19,7 @@ func main() { p := pluginSDK.NewPlugin(plugin.Name, plugin.Version, client.New, pluginSDK.WithKind(plugin.Kind), pluginSDK.WithTeam(plugin.Team), + pluginSDK.WithJSONSchema(spec.JSONSchema), ) server := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), From b9a81825ea6b745aa8d35d4458f6efd6cd977190 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:08:11 +0200 Subject: [PATCH 41/78] chore(main): Release plugins-destination-sqlite v2.6.1 (#16482) :robot: I have created a release *beep* *boop* --- ## [2.6.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.6.0...plugins-destination-sqlite-v2.6.1) (2024-02-02) ### Bug Fixes * Update migration to skip unique constraint changes ([#16481](https://github.com/cloudquery/cloudquery/issues/16481)) ([dd8a3b6](https://github.com/cloudquery/cloudquery/commit/dd8a3b6d844e3e182799c58a971e7168363f3311)) --- 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/sqlite/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 297edb9748b9db..5d27bb2c24060d 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -25,7 +25,7 @@ "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "2.2.19", "plugins/destination/test+FILLER": "0.0.0", - "plugins/destination/sqlite": "2.6.0", + "plugins/destination/sqlite": "2.6.1", "plugins/destination/sqlite+FILLER": "0.0.0", "plugins/destination/snowflake": "3.4.0", "plugins/destination/snowflake+FILLER": "0.0.0", diff --git a/plugins/destination/sqlite/CHANGELOG.md b/plugins/destination/sqlite/CHANGELOG.md index ac83fd989a6ec9..f739d9bfa98c6a 100644 --- a/plugins/destination/sqlite/CHANGELOG.md +++ b/plugins/destination/sqlite/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.6.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.6.0...plugins-destination-sqlite-v2.6.1) (2024-02-02) + + +### Bug Fixes + +* Update migration to skip unique constraint changes ([#16481](https://github.com/cloudquery/cloudquery/issues/16481)) ([dd8a3b6](https://github.com/cloudquery/cloudquery/commit/dd8a3b6d844e3e182799c58a971e7168363f3311)) + ## [2.6.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-sqlite-v2.5.1...plugins-destination-sqlite-v2.6.0) (2024-02-01) From dcaa9949df43919c0745e05308ce97bf409c4d77 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:19:37 +0200 Subject: [PATCH 42/78] fix(deps): Update github.com/cloudquery/jsonschema digest to d771afd (#16483) 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/jsonschema](https://togithub.com/cloudquery/jsonschema) | replace | digest | `6c617a2` -> `d771afd` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### 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 ++-- plugins/destination/clickhouse/go.mod | 2 +- plugins/destination/clickhouse/go.sum | 4 ++-- plugins/destination/duckdb/go.mod | 2 +- plugins/destination/duckdb/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/gremlin/go.mod | 2 +- plugins/destination/gremlin/go.sum | 4 ++-- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 ++-- plugins/destination/meilisearch/go.mod | 2 +- plugins/destination/meilisearch/go.sum | 4 ++-- plugins/destination/mongodb/go.mod | 2 +- plugins/destination/mongodb/go.sum | 4 ++-- plugins/destination/mssql/go.mod | 2 +- plugins/destination/mssql/go.sum | 4 ++-- plugins/destination/mysql/go.mod | 2 +- plugins/destination/mysql/go.sum | 4 ++-- plugins/destination/neo4j/go.mod | 2 +- plugins/destination/neo4j/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/alicloud/go.mod | 2 +- plugins/source/alicloud/go.sum | 4 ++-- plugins/source/cloudflare/go.mod | 2 +- plugins/source/cloudflare/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/firestore/go.mod | 2 +- plugins/source/firestore/go.sum | 4 ++-- plugins/source/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 ++-- plugins/source/oracle/go.mod | 2 +- plugins/source/oracle/go.sum | 4 ++-- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 ++-- 50 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 9e7a0a6030150c..dfb3f1615b3ce2 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -144,4 +144,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/cli/go.sum b/cli/go.sum index 86ab9f7c2847f7..d7a93fa7f2a56a 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -66,8 +66,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.8 h1:VKSii3yuDi7XIVNIkgrqMdd2tAWPX1O/V/HtZp9Y9Ak= github.com/cloudquery/plugin-pb-go v1.16.8/go.mod h1:taeDcOU7nkiPerOmsUwwYzBoZpQpRNe6nyLWegi67Os= github.com/cloudquery/plugin-sdk/v4 v4.29.1 h1:vBDrg/e6Zv5lR5DsKETBbVcjS0Q70lRTeUqCM5TzVrk= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index b0355b44011aba..258d31e89adb3e 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -142,4 +142,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 8893256c9dc39e..45e6ab5ba137a6 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -67,8 +67,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/clickhouse/go.mod b/plugins/destination/clickhouse/go.mod index 5e0c3f996829d6..6de0dfbb105e50 100644 --- a/plugins/destination/clickhouse/go.mod +++ b/plugins/destination/clickhouse/go.mod @@ -134,4 +134,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/clickhouse/go.sum b/plugins/destination/clickhouse/go.sum index 8f223f86fe2d0d..b97d2cd70044c7 100644 --- a/plugins/destination/clickhouse/go.sum +++ b/plugins/destination/clickhouse/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/duckdb/go.mod b/plugins/destination/duckdb/go.mod index 490bb26294a093..f5195c0731f118 100644 --- a/plugins/destination/duckdb/go.mod +++ b/plugins/destination/duckdb/go.mod @@ -132,4 +132,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/duckdb/go.sum b/plugins/destination/duckdb/go.sum index 8f8b3184219e6c..b26b1550febec8 100644 --- a/plugins/destination/duckdb/go.sum +++ b/plugins/destination/duckdb/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index ff5ebcaf9815a5..ef3708336e898c 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -134,4 +134,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index faff6507dad37b..7d34b5adda01dc 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -55,8 +55,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 3f32c313de480b..431ffc1e0ee80e 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -150,4 +150,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 73ef96bfb70b3b..9d82e713d90e91 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -69,8 +69,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index 9c0f22ec6a983d..c1cb3add4cc43b 100644 --- a/plugins/destination/gremlin/go.mod +++ b/plugins/destination/gremlin/go.mod @@ -141,4 +141,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index 0b55e2ba5ca7e1..1d772cf6bfb403 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -78,8 +78,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index c5af9e605d28d8..4277b753fae155 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -146,4 +146,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index dca0328f58bc66..ac8ad4ddb1148c 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -59,8 +59,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/meilisearch/go.mod b/plugins/destination/meilisearch/go.mod index 7ea71bc181743e..6623d2520b469a 100644 --- a/plugins/destination/meilisearch/go.mod +++ b/plugins/destination/meilisearch/go.mod @@ -128,4 +128,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index f80de3e286fa37..d04991424eda73 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -50,8 +50,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 8c9c2740e34506..0d169f57413634 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -131,4 +131,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 327ba85691c1c8..dcb4a6e49547ac 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index c6a76d348188d9..e8ffea581843a6 100644 --- a/plugins/destination/mssql/go.mod +++ b/plugins/destination/mssql/go.mod @@ -135,4 +135,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index e7801bfa88c854..6a82f62eaa97bb 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -61,8 +61,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/mysql/go.mod b/plugins/destination/mysql/go.mod index 36bef0d9f7ddc9..279cf365584907 100644 --- a/plugins/destination/mysql/go.mod +++ b/plugins/destination/mysql/go.mod @@ -126,4 +126,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index 6267805a958371..30551cbfa66da3 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index d9db29f940339f..56c7bcf809e071 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -126,4 +126,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index b3a77a343a3526..2e12604c9680cb 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index b2e533f747a538..a7e41bca3751f4 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -154,4 +154,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index c3d0bf98d73bcd..e094d56eb10679 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -93,8 +93,8 @@ github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1 github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index 1d89e68d7ed13b..991aab97fe086d 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -155,4 +155,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index f3a5c24885cd20..109fa9b6ddc015 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -107,8 +107,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 2a2d12caec33c2..014ca3c0e05f88 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -126,4 +126,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index cefb88b69121b5..ba7ffb543b5b1d 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index 2bb3423b804c68..3b64335e9a23f2 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -125,4 +125,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index dcb45026df1864..70cdea347b94a7 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index 2a291a79b883da..28d31be1a6ef02 100644 --- a/plugins/source/alicloud/go.mod +++ b/plugins/source/alicloud/go.mod @@ -132,4 +132,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index f8a21f3c7feadd..77c596d1498f68 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -63,8 +63,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 759b5c6b1b5a57..90e413048b1585 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -130,4 +130,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 4f9e0c496237a8..537aae908d73a6 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -51,8 +51,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index 4d73d0545a3df2..9538730208c611 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -131,4 +131,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 2c3d29de418348..989e3e9a914167 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index a0a99f7be403b6..a55e2f8c2b72d9 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -150,4 +150,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index aaa849e25a0ba3..439fdbabdcf355 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -87,8 +87,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/firestore/go.mod b/plugins/source/firestore/go.mod index 81395db6ee2ad5..29edced9c5f390 100644 --- a/plugins/source/firestore/go.mod +++ b/plugins/source/firestore/go.mod @@ -142,4 +142,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/firestore/go.sum b/plugins/source/firestore/go.sum index 04e0386878dd66..e9cabee2bf874a 100644 --- a/plugins/source/firestore/go.sum +++ b/plugins/source/firestore/go.sum @@ -63,8 +63,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 84a88633e4f951..d5683baa01bac7 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -151,4 +151,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index b9a3dec3477cf3..d349fb5adb52e2 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index aa7100277b0016..a5d13badf27d54 100644 --- a/plugins/source/oracle/go.mod +++ b/plugins/source/oracle/go.mod @@ -128,4 +128,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/oracle/go.sum b/plugins/source/oracle/go.sum index b8f126a8c3bd59..36c5d539110686 100644 --- a/plugins/source/oracle/go.sum +++ b/plugins/source/oracle/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 7589d91146edf0..31b4bf765afbd8 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -125,4 +125,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index dcb45026df1864..70cdea347b94a7 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= From 98ce6d4992a2d0e517a0e1fb7e523b40f6fdda86 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:23:08 +0200 Subject: [PATCH 43/78] chore: Update plugin `destination-sqlite` version to v2.6.1 (#16484) Updates the `destination-sqlite` plugin latest version to v2.6.1 --- website/versions/destination-sqlite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-sqlite.json b/website/versions/destination-sqlite.json index 39bbd8e6e7c7b2..ae6ce570245caf 100644 --- a/website/versions/destination-sqlite.json +++ b/website/versions/destination-sqlite.json @@ -1 +1 @@ -{ "latest": "plugins-destination-sqlite-v2.6.0" } +{ "latest": "plugins-destination-sqlite-v2.6.1" } From ab2efeeccb7417b75fb1eeb2da266e26adcf7e92 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Fri, 2 Feb 2024 15:46:37 +0100 Subject: [PATCH 44/78] fix: Use `write_mode` instead of `write-mode` in docs (#16480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary Fixes some typos in the docs --- plugins/destination/file/docs/_configuration.md | 3 ++- plugins/destination/gcs/docs/_configuration.md | 3 ++- plugins/destination/kafka/docs/_configuration.md | 3 ++- plugins/destination/s3/docs/_configuration.md | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/destination/file/docs/_configuration.md b/plugins/destination/file/docs/_configuration.md index 84ba1c24fd641b..537f7d8afffbc0 100644 --- a/plugins/destination/file/docs/_configuration.md +++ b/plugins/destination/file/docs/_configuration.md @@ -7,6 +7,7 @@ spec: path: "cloudquery/file" registry: "cloudquery" version: "VERSION_DESTINATION_FILE" + write_mode: "append" spec: path: "path/to/files/{{TABLE}}/{{UUID}}.{{FORMAT}}" format: "csv" # options: parquet, json, csv @@ -22,4 +23,4 @@ spec: # batch_timeout: 30s ``` -Note that the file plugin only supports `append` write-mode. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). +Note that the file plugin only supports `append` `write_mode`. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). diff --git a/plugins/destination/gcs/docs/_configuration.md b/plugins/destination/gcs/docs/_configuration.md index 63475fd280f105..6303f632f8d8ab 100644 --- a/plugins/destination/gcs/docs/_configuration.md +++ b/plugins/destination/gcs/docs/_configuration.md @@ -7,6 +7,7 @@ spec: path: "cloudquery/gcs" registry: "cloudquery" version: "VERSION_DESTINATION_GCS" + write_mode: "append" spec: bucket: "bucket_name" path: "path/to/files" @@ -24,4 +25,4 @@ spec: # batch_timeout: 30s ``` -Note that the GCS plugin only supports `append` write-mode. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). +Note that the GCS plugin only supports `append` `write_mode`. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). diff --git a/plugins/destination/kafka/docs/_configuration.md b/plugins/destination/kafka/docs/_configuration.md index bec6147a645ec3..2f7d7f55df52f4 100644 --- a/plugins/destination/kafka/docs/_configuration.md +++ b/plugins/destination/kafka/docs/_configuration.md @@ -9,6 +9,7 @@ spec: path: "cloudquery/kafka" registry: "cloudquery" version: "VERSION_DESTINATION_KAFKA" + write_mode: "append" spec: brokers: [":"] format: "csv" # options: parquet, json, csv @@ -26,4 +27,4 @@ spec: # batch_size: 1000 ``` -Note that the Kafka plugin only supports `append` write-mode. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). +Note that the Kafka plugin only supports `append` `write_mode`. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). diff --git a/plugins/destination/s3/docs/_configuration.md b/plugins/destination/s3/docs/_configuration.md index 7a449f73b0099b..ef32674ba434a3 100644 --- a/plugins/destination/s3/docs/_configuration.md +++ b/plugins/destination/s3/docs/_configuration.md @@ -41,4 +41,4 @@ path: "path/to/files/{{TABLE}}/dt={{YEAR}}-{{MONTH}}-{{DAY}}/{{UUID}}.parquet" Other supported formats are `json` and `csv`. -Note that the S3 plugin only supports `append` write-mode. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). +Note that the S3 plugin only supports `append` `write_mode`. The (top level) spec section is described in the [Destination Spec Reference](/docs/reference/destination-spec). From adee0d3f9c65d006528f396734fd7e0b95a3ede7 Mon Sep 17 00:00:00 2001 From: Martin Norbury Date: Fri, 2 Feb 2024 16:20:48 +0000 Subject: [PATCH 45/78] feat: Add JSON schema support for GitLab (#16492) fixes: https://github.com/cloudquery/cloudquery/issues/16361 --- plugins/source/gitlab/Makefile | 6 ++- plugins/source/gitlab/client/schema.json | 32 ++++++++++++++ plugins/source/gitlab/client/spec.go | 19 +++++++-- plugins/source/gitlab/client/spec/gen/main.go | 26 ++++++++++++ plugins/source/gitlab/client/spec_test.go | 42 +++++++++++++++++++ plugins/source/gitlab/go.mod | 6 ++- plugins/source/gitlab/go.sum | 6 ++- .../source/gitlab/resources/plugin/plugin.go | 1 + 8 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 plugins/source/gitlab/client/schema.json create mode 100644 plugins/source/gitlab/client/spec/gen/main.go create mode 100644 plugins/source/gitlab/client/spec_test.go diff --git a/plugins/source/gitlab/Makefile b/plugins/source/gitlab/Makefile index 53fdcdea45bc5a..933aa265dd272b 100644 --- a/plugins/source/gitlab/Makefile +++ b/plugins/source/gitlab/Makefile @@ -22,6 +22,10 @@ gen-docs: build cloudquery tables --format markdown --output-dir docs test/config.yml mv docs/$(shell basename $(CURDIR)) docs/tables +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + # All gen targets .PHONY: gen -gen: gen-docs +gen: gen-docs gen-spec-schema diff --git a/plugins/source/gitlab/client/schema.json b/plugins/source/gitlab/client/schema.json new file mode 100644 index 00000000000000..65e3c36c8bf0aa --- /dev/null +++ b/plugins/source/gitlab/client/schema.json @@ -0,0 +1,32 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/source/gitlab/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "access_token": { + "type": "string", + "minLength": 1, + "description": "An access token for your GitLab server. Instructions on how to generate an access token here." + }, + "base_url": { + "type": "string", + "description": "URL for your self hosted GitLab server. Leave empty for GitLab SaaS. Not all tables are supported for GitLab SaaS." + }, + "concurrency": { + "type": "integer", + "minimum": 1, + "description": "A best effort maximum number of Go routines to use. Lower this number to reduce memory usage.", + "default": 10000 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "access_token" + ], + "description": "Spec is the (nested) spec used by the GitLab source plugin:" + } + } +} diff --git a/plugins/source/gitlab/client/spec.go b/plugins/source/gitlab/client/spec.go index d9c73603519198..40675b6fbf37ec 100644 --- a/plugins/source/gitlab/client/spec.go +++ b/plugins/source/gitlab/client/spec.go @@ -1,15 +1,23 @@ package client -import "errors" +import ( + _ "embed" + + "errors" +) const ( defaultConcurrency = 10000 ) +// Spec is the (nested) spec used by the GitLab source plugin: type Spec struct { - Token string `json:"access_token,omitempty"` - BaseURL string `json:"base_url,omitempty"` - Concurrency int `json:"concurrency,omitempty"` + // An access token for your GitLab server. Instructions on how to generate an access token here. + Token string `json:"access_token,omitempty" jsonschema:"required,minLength=1"` + // URL for your self hosted GitLab server. Leave empty for GitLab SaaS. Not all tables are supported for GitLab SaaS. + BaseURL string `json:"base_url,omitempty"` + // A best effort maximum number of Go routines to use. Lower this number to reduce memory usage. + Concurrency int `json:"concurrency,omitempty" jsonschema:"minimum=1,default=10000"` } func (s *Spec) Validate() error { @@ -25,3 +33,6 @@ func (s *Spec) SetDefaults() { s.Concurrency = defaultConcurrency } } + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/source/gitlab/client/spec/gen/main.go b/plugins/source/gitlab/client/spec/gen/main.go new file mode 100644 index 00000000000000..152746ff7f7d7e --- /dev/null +++ b/plugins/source/gitlab/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/source/gitlab/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/source/gitlab/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/source/gitlab/client/spec_test.go b/plugins/source/gitlab/client/spec_test.go new file mode 100644 index 00000000000000..48ba399b7e5692 --- /dev/null +++ b/plugins/source/gitlab/client/spec_test.go @@ -0,0 +1,42 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "valid", + Spec: `{"access_token":"token"}`, + Err: false, + }, + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "missing token", + Spec: `{"access_token":""}`, + Err: true, + }, + { + Name: "base url", + Spec: `{"access_token":"token","base_url":"https://gitlab.com"}`, + Err: false, + }, + { + Name: "concurrency", + Spec: `{"access_token":"token","concurrency":100}`, + Err: false, + }, + { + Name: "invalid field", + Spec: `{"access_token":"token", "unknown_field":"value"}`, + Err: true, + }, + }) +} diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index 90370f674eaf2b..55ed3f52a5ce24 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -4,7 +4,9 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 + github.com/invopop/jsonschema v0.12.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 github.com/xanzy/go-gitlab v0.83.0 @@ -58,7 +60,6 @@ require ( github.com/hashicorp/go-hclog v1.2.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -130,3 +131,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 49b35c785eaab8..bbb0959bae2141 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -47,6 +47,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -138,8 +142,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/source/gitlab/resources/plugin/plugin.go b/plugins/source/gitlab/resources/plugin/plugin.go index a5cf42ab3821e0..bb3d0fed43ec9c 100644 --- a/plugins/source/gitlab/resources/plugin/plugin.go +++ b/plugins/source/gitlab/resources/plugin/plugin.go @@ -87,6 +87,7 @@ func Plugin() *plugin.Plugin { Name, Version, newClient, + plugin.WithJSONSchema(client.JSONSchema), plugin.WithKind(Kind), plugin.WithTeam(Team), ) From 501f275c57bd811649729b2081276fd92784c178 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 19:11:46 +0200 Subject: [PATCH 46/78] fix(deps): Update github.com/cloudquery/jsonschema digest to d771afd (#16495) 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/jsonschema](https://togithub.com/cloudquery/jsonschema) | replace | digest | `6c617a2` -> `d771afd` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### 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/gitlab/go.mod | 4 ++-- plugins/source/gitlab/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index 55ed3f52a5ce24..52f931ef4c23cc 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -6,7 +6,6 @@ require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 - github.com/invopop/jsonschema v0.12.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 github.com/xanzy/go-gitlab v0.83.0 @@ -60,6 +59,7 @@ require ( github.com/hashicorp/go-hclog v1.2.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -133,4 +133,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index bbb0959bae2141..af6fa69aaced91 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -49,8 +49,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= From ed26da55b56341e17525293843ec96afd88d88ac Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:16:21 -0800 Subject: [PATCH 47/78] feat: Add JSON schema to `elasticsearch` destination (#16489) Closes https://github.com/cloudquery/cloudquery/issues/16448 --- .github/workflows/dest_elasticsearch.yml | 6 ++ plugins/destination/elasticsearch/Makefile | 8 ++ .../elasticsearch/client/schema.json | 75 +++++++++++++++++++ .../destination/elasticsearch/client/spec.go | 45 ++++++++--- .../elasticsearch/client/spec/gen/main.go | 26 +++++++ .../elasticsearch/client/spec_test.go | 50 +++++++++++++ plugins/destination/elasticsearch/go.mod | 8 ++ plugins/destination/elasticsearch/go.sum | 10 +++ plugins/destination/elasticsearch/main.go | 1 + 9 files changed, 218 insertions(+), 11 deletions(-) create mode 100644 plugins/destination/elasticsearch/client/schema.json create mode 100644 plugins/destination/elasticsearch/client/spec/gen/main.go create mode 100644 plugins/destination/elasticsearch/client/spec_test.go diff --git a/.github/workflows/dest_elasticsearch.yml b/.github/workflows/dest_elasticsearch.yml index 32a2e0c9a1c81b..7869241577e6c6 100644 --- a/.github/workflows/dest_elasticsearch.yml +++ b/.github/workflows/dest_elasticsearch.yml @@ -56,6 +56,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . - name: Test diff --git a/plugins/destination/elasticsearch/Makefile b/plugins/destination/elasticsearch/Makefile index 8f6efd386d94ce..10ee9b92bd8133 100644 --- a/plugins/destination/elasticsearch/Makefile +++ b/plugins/destination/elasticsearch/Makefile @@ -10,3 +10,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/elasticsearch/client/schema.json b/plugins/destination/elasticsearch/client/schema.json new file mode 100644 index 00000000000000..ff65e11922260c --- /dev/null +++ b/plugins/destination/elasticsearch/client/schema.json @@ -0,0 +1,75 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/elasticsearch/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "addresses": { + "oneOf": [ + { + "items": { + "type": "string" + }, + "type": "array", + "description": "A list of Elasticsearch nodes to use.", + "default": [ + "http://localhost:9200" + ] + }, + { + "type": "null" + } + ] + }, + "username": { + "type": "string", + "description": "Username for HTTP Basic Authentication." + }, + "password": { + "type": "string", + "description": "Password for HTTP Basic Authentication." + }, + "cloud_id": { + "type": "string", + "description": "Endpoint for the Elastic Service (https://elastic.co/cloud)." + }, + "api_key": { + "type": "string", + "description": "Base64-encoded token for authorization; if set, overrides username/password and service token." + }, + "service_token": { + "type": "string", + "description": "Service token for authorization; if set, overrides username/password." + }, + "certificate_fingerprint": { + "type": "string", + "description": "SHA256 hex fingerprint given by Elasticsearch on first launch." + }, + "ca_cert": { + "type": "string", + "description": "PEM-encoded certificate authorities.\nWhen set, an empty certificate pool will be created, and the certificates will be appended to it." + }, + "concurrency": { + "type": "integer", + "minimum": 1, + "description": "Number of concurrent worker goroutines to use for indexing. (Default: number of CPUs)" + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Number of documents to batch together per request.", + "default": 1000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Number of bytes to batch together per request.", + "default": 5242880 + } + }, + "additionalProperties": false, + "type": "object" + } + } +} diff --git a/plugins/destination/elasticsearch/client/spec.go b/plugins/destination/elasticsearch/client/spec.go index 34f718179cf33d..116a8d9027a308 100644 --- a/plugins/destination/elasticsearch/client/spec.go +++ b/plugins/destination/elasticsearch/client/spec.go @@ -1,6 +1,9 @@ package client -import "runtime" +import ( + _ "embed" + "runtime" +) const ( defaultBatchSize = 1000 @@ -8,24 +11,44 @@ const ( ) type Spec struct { - Addresses []string `json:"addresses"` // A list of Elasticsearch nodes to use. - Username string `json:"username"` // Username for HTTP Basic Authentication. - Password string `json:"password"` // Password for HTTP Basic Authentication. + // A list of Elasticsearch nodes to use. + Addresses []string `json:"addresses" jsonschema:"default=http://localhost:9200"` + + // Username for HTTP Basic Authentication. + Username string `json:"username"` + + // Password for HTTP Basic Authentication. + Password string `json:"password"` + + // Endpoint for the Elastic Service (https://elastic.co/cloud). + CloudID string `json:"cloud_id"` + + // Base64-encoded token for authorization; if set, overrides username/password and service token. + APIKey string `json:"api_key"` - CloudID string `json:"cloud_id"` // Endpoint for the Elastic Service (https://elastic.co/cloud). - APIKey string `json:"api_key"` // Base64-encoded token for authorization; if set, overrides username/password and service token. - ServiceToken string `json:"service_token"` // Service token for authorization; if set, overrides username/password. - CertificateFingerprint string `json:"certificate_fingerprint"` // SHA256 hex fingerprint given by Elasticsearch on first launch. + // Service token for authorization; if set, overrides username/password. + ServiceToken string `json:"service_token"` + + // SHA256 hex fingerprint given by Elasticsearch on first launch. + CertificateFingerprint string `json:"certificate_fingerprint"` // PEM-encoded certificate authorities. // When set, an empty certificate pool will be created, and the certificates will be appended to it. CACert string `json:"ca_cert"` - Concurrency int `json:"concurrency"` // Number of concurrent worker goroutines to use for indexing. (Default: number of CPUs) - BatchSize int `json:"batch_size"` // Number of documents to batch together per request. (Default: 1000) - BatchSizeBytes int `json:"batch_size_bytes"` // Number of bytes to batch together per request. (Default: 5 MiB) + // Number of concurrent worker goroutines to use for indexing. (Default: number of CPUs) + Concurrency int `json:"concurrency" jsonschema:"minimum=1"` + + // Number of documents to batch together per request. + BatchSize int `json:"batch_size" jsonschema:"minimum=1,default=1000"` + + // Number of bytes to batch together per request. + BatchSizeBytes int `json:"batch_size_bytes" jsonschema:"minimum=1,default=5242880"` } +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults() { if len(s.Addresses) == 0 { s.Addresses = []string{"http://localhost:9200"} diff --git a/plugins/destination/elasticsearch/client/spec/gen/main.go b/plugins/destination/elasticsearch/client/spec/gen/main.go new file mode 100644 index 00000000000000..e05f1e856ea4b3 --- /dev/null +++ b/plugins/destination/elasticsearch/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/elasticsearch/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/elasticsearch/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/elasticsearch/client/spec_test.go b/plugins/destination/elasticsearch/client/spec_test.go new file mode 100644 index 00000000000000..a8b82a6f054b36 --- /dev/null +++ b/plugins/destination/elasticsearch/client/spec_test.go @@ -0,0 +1,50 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + }, + { + Name: "spec with str addresses", + Spec: `{"addresses": "address"}`, + Err: true, + }, + { + Name: "spec with valid addresses", + Spec: `{"addresses": ["address"]}`, + }, + { + Name: "spec with bool batch_size", + Spec: `{"batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/elasticsearch/go.mod b/plugins/destination/elasticsearch/go.mod index e051377d1d125b..51384809bc1aff 100644 --- a/plugins/destination/elasticsearch/go.mod +++ b/plugins/destination/elasticsearch/go.mod @@ -5,6 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/cenkalti/backoff/v4 v4.2.1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/elastic/go-elasticsearch/v8 v8.6.0 github.com/goccy/go-json v0.10.2 @@ -25,6 +26,8 @@ require ( github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect @@ -55,6 +58,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/invopop/jsonschema v0.11.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -95,6 +99,7 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect @@ -121,3 +126,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/elasticsearch/go.sum b/plugins/destination/elasticsearch/go.sum index 094e18171eedc2..3eb3a53213ea6a 100644 --- a/plugins/destination/elasticsearch/go.sum +++ b/plugins/destination/elasticsearch/go.sum @@ -25,9 +25,13 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7D github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -43,6 +47,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -256,6 +264,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= diff --git a/plugins/destination/elasticsearch/main.go b/plugins/destination/elasticsearch/main.go index 82248ba5bd6bc0..a6532bef433e1d 100644 --- a/plugins/destination/elasticsearch/main.go +++ b/plugins/destination/elasticsearch/main.go @@ -18,6 +18,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), serve.WithDestinationV0V1Server()).Serve(context.Background()); err != nil { log.Fatal(err) From 25303df6f8aeda463c35043c17abe37e6611bc68 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Sat, 3 Feb 2024 10:18:08 +0200 Subject: [PATCH 48/78] fix!: Remove support for deprecated `OKTA_API_TOKEN` environment variable (#16498) Should be merged prior to https://github.com/cloudquery/cloudquery/pull/16493 --- plugins/source/okta/README.md | 9 ++++----- plugins/source/okta/client/spec.go | 16 +++------------- plugins/source/okta/docs/_authentication.md | 2 +- plugins/source/okta/docs/_configuration.md | 9 +++------ plugins/source/okta/docs/overview.md | 19 +++++++------------ 5 files changed, 18 insertions(+), 37 deletions(-) diff --git a/plugins/source/okta/README.md b/plugins/source/okta/README.md index 33c00c0455e002..aef753f8acfecb 100644 --- a/plugins/source/okta/README.md +++ b/plugins/source/okta/README.md @@ -8,7 +8,7 @@ The CloudQuery Okta plugin extracts Okta resources configurations and loads them ## Authentication -To [authenticate](https://developer.okta.com/docs/guides/create-an-api-token/overview/) CloudQuery with your Okta account you need to set an `OKTA_API_TOKEN` environment variable or add it the configuration. +To [authenticate](https://developer.okta.com/docs/guides/create-an-api-token/overview/) CloudQuery with your Okta account you need to add Okta API token to the configuration. ## Configuration @@ -29,10 +29,9 @@ spec: # Required. Your Okta domain name domain: "https://.okta.com/" - # Optional. Okta Token to access API, you can set this with OKTA_API_TOKEN environment variable - # ⚠️ Warning - Your token should be kept secret and not committed to source control - # token: "" + # Optional. Okta Token to access API + token: "" ``` - `domain` (Required) - Specify the Okta domain you are fetching from. [Visit this link](https://developer.okta.com/docs/guides/find-your-domain/findorg/) to find your Okta domain -- `token` (Optional) - Okta Token to access the API. You can set this with an `OKTA_API_TOKEN` environment variable +- `token` (Required) - Okta Token to access the API. diff --git a/plugins/source/okta/client/spec.go b/plugins/source/okta/client/spec.go index 1c31391da692cc..3d97a48bcf76aa 100644 --- a/plugins/source/okta/client/spec.go +++ b/plugins/source/okta/client/spec.go @@ -1,8 +1,7 @@ package client import ( - "fmt" - "os" + "errors" "time" "github.com/rs/zerolog" @@ -22,10 +21,6 @@ type ( } ) -const ( - OktaAPIToken = "OKTA_API_TOKEN" -) - func (s *Spec) SetDefaults(logger *zerolog.Logger) { const ( minRetries = int32(2) @@ -44,11 +39,6 @@ func (s *Spec) SetDefaults(logger *zerolog.Logger) { s.RateLimit.MaxBackoff = minBackOff } - if len(s.Token) == 0 { - logger.Warn().Msgf("usage of %q environment variable value is deprecated and will be dropped in a future release", OktaAPIToken) - s.Token = os.Getenv(OktaAPIToken) - } - if s.Concurrency < 1 { s.Concurrency = 10000 } @@ -56,13 +46,13 @@ func (s *Spec) SetDefaults(logger *zerolog.Logger) { func (s Spec) Validate() error { if len(s.Token) == 0 { - return fmt.Errorf("missing API token (should be set in the configuration or as %q environment variable)", OktaAPIToken) + return errors.New("missing \"token\" in plugin configuration") } const exampleDomain = "https://.okta.com" switch s.Domain { case "", exampleDomain: - return fmt.Errorf("missing \"domain\" in plugin configuration") + return errors.New("missing \"domain\" in plugin configuration") } return nil diff --git a/plugins/source/okta/docs/_authentication.md b/plugins/source/okta/docs/_authentication.md index 7b8cccdd92ab8e..448b06cfdcdcc5 100644 --- a/plugins/source/okta/docs/_authentication.md +++ b/plugins/source/okta/docs/_authentication.md @@ -1 +1 @@ -To [authenticate](https://developer.okta.com/docs/guides/create-an-api-token/overview/) CloudQuery with your Okta account you need to set an `OKTA_API_TOKEN` environment variable or add it the configuration. +To [authenticate](https://developer.okta.com/docs/guides/create-an-api-token/overview/) CloudQuery with your Okta account you need to add Okta API token to the configuration. diff --git a/plugins/source/okta/docs/_configuration.md b/plugins/source/okta/docs/_configuration.md index a8bfde14d17956..7027a1c2de3755 100644 --- a/plugins/source/okta/docs/_configuration.md +++ b/plugins/source/okta/docs/_configuration.md @@ -9,13 +9,10 @@ spec: tables: ["*"] destinations: ["DESTINATION_NAME"] spec: - # Required. Your Okta domain name + # Okta domain name domain: "https://.okta.com/" - - # Optional. Okta Token to access API - # ⚠️ Warning - Your token should be kept secret and not committed to source control. - # ⚠️ Warning - In the future versions token parameter will become required. - # token: "" + # Okta Token to access API + token: "" # Optional. Rate limiter settings # rate_limit: diff --git a/plugins/source/okta/docs/overview.md b/plugins/source/okta/docs/overview.md index e6d7bb4e718eaf..011751d3dddfa4 100644 --- a/plugins/source/okta/docs/overview.md +++ b/plugins/source/okta/docs/overview.md @@ -24,43 +24,38 @@ The following example sets up the Okta plugin, and connects it to a postgresql d Make sure you use [environment variable expansion](/docs/advanced-topics/environment-variable-substitution) in production instead of committing the credentials to the configuration file directly. ::: -- `domain` (`string`, required) +- `domain` (`string`) (required) Specify the Okta domain you are fetching from. [Visit this link](https://developer.okta.com/docs/guides/find-your-domain/findorg/) to find your Okta domain. -- `token` (`string`, optional) +- `token` (`string`) (required) Token for Okta API access. - You can set this with an `OKTA_API_TOKEN` environment variable. - :::callout{type="warning"} - Using `OKTA_API_TOKEN` environment variable will be deprecated in the future versions. - You can use [environment variable expansion](/docs/advanced-topics/environment-variable-substitution) and `"${OKTA_API_TOKEN}"` value in the configuration instead. - ::: -- `debug` (`bool`, optional. Default: `false`) +- `debug` (`bool`) (optional) (default: `false`) Enables debug logs within the Okta SDK. :::callout{type="warning"} This feature will result in sensitive information being logged! ::: -- `concurrency` (`integer`, optional. default: `10000`) +- `concurrency` (`integer`) (optional) (default: `10000`) Number of concurrent requests to be made to Okta API. -- `rate_limit` ([Rate limit](#rate-limit-spec) spec, optional. Default: see [rate limit](#rate-limit-spec) spec defaults) +- `rate_limit` ([Rate limit](#rate-limit-spec) spec) (optional) (default: see [rate limit](#rate-limit-spec) spec defaults) Rate limit configuration. ### Rate limit spec -- `max_backoff` (`duration`, optional. Default: `5s`) +- `max_backoff` (`duration`) (optional) (default: `5s`) Max backoff interval to be used. If the value specified is less than the default one, the default one is used. -- `max_retries` (`int32`, optional. Default: `3`) +- `max_retries` (`integer`) (optional) (default: `3`) Max retries to be performed. If the value specified is less than the default one, the default one is used. From 1c28a053be83745728397c8981d96665b13c915c Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:29:10 -0800 Subject: [PATCH 49/78] feat: Add JSON schema to bigquery destination (#16490) Closes https://github.com/cloudquery/cloudquery/issues/16447 --- .github/workflows/dest_bigquery.yml | 16 ++-- plugins/destination/bigquery/Makefile | 8 ++ .../destination/bigquery/client/schema.json | 71 ++++++++++++++++++ plugins/destination/bigquery/client/spec.go | 63 +++++++++++++--- .../bigquery/client/spec/gen/main.go | 26 +++++++ .../destination/bigquery/client/spec_test.go | 75 +++++++++++++++++++ plugins/destination/bigquery/go.mod | 4 + plugins/destination/bigquery/go.sum | 6 +- plugins/destination/bigquery/main.go | 6 +- 9 files changed, 255 insertions(+), 20 deletions(-) create mode 100644 plugins/destination/bigquery/client/schema.json create mode 100644 plugins/destination/bigquery/client/spec/gen/main.go create mode 100644 plugins/destination/bigquery/client/spec_test.go diff --git a/.github/workflows/dest_bigquery.yml b/.github/workflows/dest_bigquery.yml index e40bb8244040fa..564c7c581725dc 100644 --- a/.github/workflows/dest_bigquery.yml +++ b/.github/workflows/dest_bigquery.yml @@ -32,11 +32,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 2 - - name: Authenticate to Google Cloud - uses: 'google-github-actions/auth@v1' - with: - workload_identity_provider: 'projects/151868820337/locations/global/workloadIdentityPools/integration-test-pool/providers/integration-test-provider' - service_account: 'integration-service-account@cq-integration-tests.iam.gserviceaccount.com' - name: Set up Cloud SDK uses: 'google-github-actions/setup-gcloud@v0.7.0' - name: Set up Go 1.x @@ -53,6 +48,17 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) + - name: Authenticate to Google Cloud + uses: 'google-github-actions/auth@v1' + with: + workload_identity_provider: 'projects/151868820337/locations/global/workloadIdentityPools/integration-test-pool/providers/integration-test-provider' + service_account: 'integration-service-account@cq-integration-tests.iam.gserviceaccount.com' - name: Build run: go build . - name: Test diff --git a/plugins/destination/bigquery/Makefile b/plugins/destination/bigquery/Makefile index e24f6293cc7a04..c9c3cdf0d8b550 100644 --- a/plugins/destination/bigquery/Makefile +++ b/plugins/destination/bigquery/Makefile @@ -9,3 +9,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/bigquery/client/schema.json b/plugins/destination/bigquery/client/schema.json new file mode 100644 index 00000000000000..7b54d8172d3e39 --- /dev/null +++ b/plugins/destination/bigquery/client/schema.json @@ -0,0 +1,71 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/bigquery/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "Spec": { + "properties": { + "project_id": { + "type": "string", + "minLength": 1, + "description": "The id of the project where the destination BigQuery database resides." + }, + "dataset_id": { + "type": "string", + "minLength": 1, + "description": "The name of the BigQuery dataset within the project, e.g. `my_dataset`.\n This dataset needs to be created before running a sync or migration." + }, + "dataset_location": { + "type": "string", + "description": "The data location of the BigQuery dataset. If set, will be used as the default location for job operations.\nPro-tip: this can solve \"dataset not found\" issues for newly created datasets." + }, + "time_partitioning": { + "type": "string", + "enum": [ + "none", + "hour", + "day" + ], + "description": "The time partitioning to use when creating tables. The partition time column used will always be `_cq_sync_time` so that all rows for a sync run will be partitioned on the hour/day the sync started.", + "default": "none" + }, + "service_account_key_json": { + "type": "string", + "description": "GCP service account key content.\nThis allows for using different service accounts for the GCP source and BigQuery destination.\nIf using service account keys, it is best to use [environment or file variable substitution](/docs/advanced-topics/environment-variable-substitution)." + }, + "endpoint": { + "type": "string", + "description": "The BigQuery API endpoint to use. This is useful for testing against a local emulator." + }, + "batch_size": { + "type": "integer", + "minimum": 1, + "description": "Number of records to write before starting a new object.", + "default": 10000 + }, + "batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Number of bytes (as Arrow buffer size) to write before starting a new object.", + "default": 5242880 + }, + "batch_timeout": { + "$ref": "#/$defs/Duration", + "description": "Maximum interval between batch writes.", + "default": "10s" + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "project_id", + "dataset_id" + ] + } + } +} diff --git a/plugins/destination/bigquery/client/spec.go b/plugins/destination/bigquery/client/spec.go index d256c6db45ed28..04a31b41b94094 100644 --- a/plugins/destination/bigquery/client/spec.go +++ b/plugins/destination/bigquery/client/spec.go @@ -1,11 +1,13 @@ package client import ( + _ "embed" "encoding/json" "fmt" "time" "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/invopop/jsonschema" ) const ( @@ -18,9 +20,9 @@ const ( type TimePartitioningOption string const ( - TimePartitioningOptionNone = "none" - TimePartitioningOptionHour = "hour" - TimePartitioningOptionDay = "day" + TimePartitioningOptionNone = TimePartitioningOption("none") + TimePartitioningOptionHour = TimePartitioningOption("hour") + TimePartitioningOptionDay = TimePartitioningOption("day") ) var TimePartitioningOptions = []TimePartitioningOption{ @@ -39,17 +41,41 @@ func (t TimePartitioningOption) Validate() error { } type Spec struct { - ProjectID string `json:"project_id"` - DatasetID string `json:"dataset_id"` - DatasetLocation string `json:"dataset_location"` - TimePartitioning TimePartitioningOption `json:"time_partitioning"` - ServiceAccountKeyJSON string `json:"service_account_key_json"` - BatchSize int `json:"batch_size"` - BatchSizeBytes int `json:"batch_size_bytes"` - BatchTimeout configtype.Duration `json:"batch_timeout"` - Endpoint string `json:"endpoint"` + // The id of the project where the destination BigQuery database resides. + ProjectID string `json:"project_id" jsonschema:"required,minLength=1"` + + // The name of the BigQuery dataset within the project, e.g. `my_dataset`. + // This dataset needs to be created before running a sync or migration. + DatasetID string `json:"dataset_id" jsonschema:"required,minLength=1"` + + // The data location of the BigQuery dataset. If set, will be used as the default location for job operations. + // Pro-tip: this can solve "dataset not found" issues for newly created datasets. + DatasetLocation string `json:"dataset_location"` + + // The time partitioning to use when creating tables. The partition time column used will always be `_cq_sync_time` so that all rows for a sync run will be partitioned on the hour/day the sync started. + TimePartitioning TimePartitioningOption `json:"time_partitioning"` + + // GCP service account key content. + // This allows for using different service accounts for the GCP source and BigQuery destination. + // If using service account keys, it is best to use [environment or file variable substitution](/docs/advanced-topics/environment-variable-substitution). + ServiceAccountKeyJSON string `json:"service_account_key_json"` + + // The BigQuery API endpoint to use. This is useful for testing against a local emulator. + Endpoint string `json:"endpoint"` + + // Number of records to write before starting a new object. + BatchSize int `json:"batch_size" jsonschema:"minimum=1,default=10000"` + + // Number of bytes (as Arrow buffer size) to write before starting a new object. + BatchSizeBytes int `json:"batch_size_bytes" jsonschema:"minimum=1,default=5242880"` + + // Maximum interval between batch writes. + BatchTimeout configtype.Duration `json:"batch_timeout"` } +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults() { if s.TimePartitioning == "" { s.TimePartitioning = TimePartitioningOptionNone @@ -91,3 +117,16 @@ func isValidJson(content string) error { } return nil } + +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Properties.Value("batch_timeout").Default = "10s" +} + +func (TimePartitioningOption) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Default = TimePartitioningOptionNone + sc.Enum = make([]any, len(TimePartitioningOptions)) + for i := range TimePartitioningOptions { + sc.Enum[i] = TimePartitioningOptions[i] + } +} diff --git a/plugins/destination/bigquery/client/spec/gen/main.go b/plugins/destination/bigquery/client/spec/gen/main.go new file mode 100644 index 00000000000000..23274916911405 --- /dev/null +++ b/plugins/destination/bigquery/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/bigquery/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/bigquery/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/bigquery/client/spec_test.go b/plugins/destination/bigquery/client/spec_test.go new file mode 100644 index 00000000000000..943b30824b45b3 --- /dev/null +++ b/plugins/destination/bigquery/client/spec_test.go @@ -0,0 +1,75 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with project_id", + Spec: `{"project_id": "value"}`, + Err: true, + }, + { + Name: "spec with dataset_id", + Spec: `{"dataset_id": "value"}`, + Err: true, + }, + { + Name: "spec with project_id and dataset_id", + Spec: `{"project_id": "foo", "dataset_id": "bar"}`, + }, + { + Name: "spec with bool project_id", + Spec: `{"project_id": true, "dataset_id": "bar"}`, + Err: true, + }, + { + Name: "spec with null project_id", + Spec: `{"project_id": null, "dataset_id": "bar"}`, + Err: true, + }, + { + Name: "spec with int project_id", + Spec: `{"project_id": 123, "dataset_id": "bar"}`, + Err: true, + }, + { + Name: "spec with bool batch_size", + Spec: `{"project_id": "foo", "dataset_id": "bar", "batch_size":false}`, + Err: true, + }, + { + Name: "spec with null batch_size", + Spec: `{"project_id": "foo", "dataset_id": "bar", "batch_size":null}`, + Err: true, + }, + { + Name: "spec with string batch_size", + Spec: `{"project_id": "foo", "dataset_id": "bar", "batch_size":"str"}`, + Err: true, + }, + { + Name: "spec with array batch_size", + Spec: `{"project_id": "foo", "dataset_id": "bar", "batch_size":["abc"]}`, + Err: true, + }, + { + Name: "spec with proper batch_size", + Spec: `{"project_id": "foo", "dataset_id": "bar", "batch_size": 7}`, + }, + { + Name: "spec with unknown field", + Spec: `{"project_id": "foo", "dataset_id": "bar", "unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index 62358cde9fc464..a05c7e4e238da0 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -5,6 +5,7 @@ go 1.21.4 require ( cloud.google.com/go/bigquery v1.58.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 @@ -149,3 +150,6 @@ require ( google.golang.org/protobuf v1.32.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 9333600366ff72..63ec6da6a31117 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -73,6 +73,10 @@ github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -195,8 +199,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/destination/bigquery/main.go b/plugins/destination/bigquery/main.go index 5c527fd0d2c5b2..d20ca2d4811a8c 100644 --- a/plugins/destination/bigquery/main.go +++ b/plugins/destination/bigquery/main.go @@ -15,7 +15,11 @@ const ( ) func main() { - p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team)) + p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, + plugin.WithKind(internalPlugin.Kind), + plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(client.JSONSchema), + ) if err := serve.Plugin(p, serve.WithDestinationV0V1Server(), serve.WithPluginSentryDSN(sentryDSN)).Serve(context.Background()); err != nil { log.Fatal(err) } From c7b4dae193d875336e3126d7a9cc44872fe7b769 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Sat, 3 Feb 2024 11:13:31 +0200 Subject: [PATCH 50/78] chore(ci): Remove unnecessary vendor step (#16499) --- plugins/destination/postgresql/Makefile | 2 -- plugins/destination/postgresql/client/spec/gen/main.go | 6 +----- plugins/destination/postgresql/go.mod | 1 - plugins/destination/postgresql/go.sum | 2 -- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/destination/postgresql/Makefile b/plugins/destination/postgresql/Makefile index 5c3df7adfed0c8..a803c132c3b248 100644 --- a/plugins/destination/postgresql/Makefile +++ b/plugins/destination/postgresql/Makefile @@ -10,8 +10,6 @@ lint: .PHONY: gen-spec-schema gen-spec-schema: - # required for loading comments from filetypes - go mod vendor go run client/spec/gen/main.go # All gen targets diff --git a/plugins/destination/postgresql/client/spec/gen/main.go b/plugins/destination/postgresql/client/spec/gen/main.go index 6ed77f08e38b28..7da90e0f557ece 100644 --- a/plugins/destination/postgresql/client/spec/gen/main.go +++ b/plugins/destination/postgresql/client/spec/gen/main.go @@ -8,16 +8,12 @@ import ( "github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec" "github.com/cloudquery/codegen/jsonschema" - "github.com/cloudquery/filetypes/v4" ) func main() { fmt.Println("Generating JSON schema for plugin spec") jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), - append(filetypes.FileSpec{}.JSONSchemaOptions(), - jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec", path.Join(currDir(), "..")), - jsonschema.WithAddGoComments("github.com/cloudquery/filetypes/v4", path.Join(currDir(), "..", "..", "..", "vendor", "github.com/cloudquery/filetypes/v4")), - )..., + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/postgresql/client/spec", path.Join(currDir(), "..")), ) } diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 231969681ae2f4..bd22a8315bce1f 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -7,7 +7,6 @@ toolchain go1.21.6 require ( github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/filetypes/v4 v4.2.10 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/google/go-cmp v0.6.0 github.com/invopop/jsonschema v0.12.0 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 4378e41f24af91..6930af9ffef5e4 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -53,8 +53,6 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/filetypes/v4 v4.2.10 h1:udShjKPGA5UxopPABR9sTS97w6fQBCJamKg8z0i4/qI= -github.com/cloudquery/filetypes/v4 v4.2.10/go.mod h1:bTycZwt3th5JbMn6rSlifUxa5WBnzimMy3iBlhUKDjI= github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= From e7b380e7361d062bca54bf2e9362b143e0ab0769 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Sat, 3 Feb 2024 11:34:22 +0200 Subject: [PATCH 51/78] feat: Add JSON schema to `firehose` destination plugin (#16500) Closes https://github.com/cloudquery/cloudquery/issues/16449 See [AWS docs](https://docs.aws.amazon.com/service-authorization/latest/reference/list_amazonkinesisfirehose.html#amazonkinesisfirehose-resources-for-iam-policies) for ARN reference --- .github/workflows/dest_firehose.yml | 6 + plugins/destination/firehose/Makefile | 8 + plugins/destination/firehose/client/client.go | 15 +- .../firehose/client/client_test.go | 3 +- plugins/destination/firehose/client/spec.go | 53 ------ .../firehose/client/spec/gen/main.go | 26 +++ .../firehose/client/spec/schema.json | 46 +++++ .../destination/firehose/client/spec/spec.go | 62 +++++++ .../firehose/client/spec/spec_test.go | 172 ++++++++++++++++++ plugins/destination/firehose/client/write.go | 2 +- plugins/destination/firehose/docs/overview.md | 4 +- plugins/destination/firehose/go.mod | 14 +- plugins/destination/firehose/go.sum | 14 +- plugins/destination/firehose/main.go | 2 + 14 files changed, 360 insertions(+), 67 deletions(-) delete mode 100644 plugins/destination/firehose/client/spec.go create mode 100644 plugins/destination/firehose/client/spec/gen/main.go create mode 100644 plugins/destination/firehose/client/spec/schema.json create mode 100644 plugins/destination/firehose/client/spec/spec.go create mode 100644 plugins/destination/firehose/client/spec/spec_test.go diff --git a/.github/workflows/dest_firehose.yml b/.github/workflows/dest_firehose.yml index a93cc611b8c15d..e52b0771faa9d1 100644 --- a/.github/workflows/dest_firehose.yml +++ b/.github/workflows/dest_firehose.yml @@ -46,6 +46,12 @@ jobs: args: "--config ../../.golangci.yml" skip-pkg-cache: true skip-build-cache: true + - name: gen + if: github.event_name == 'pull_request' + run: make gen + - name: Fail if generation updated files + if: github.event_name == 'pull_request' + run: test "$(git status -s | wc -l)" -eq 0 || (git status -s; exit 1) - name: Build run: go build . # - name: Configure AWS credentials diff --git a/plugins/destination/firehose/Makefile b/plugins/destination/firehose/Makefile index f9ab6c2eac145b..3932df6651dc66 100644 --- a/plugins/destination/firehose/Makefile +++ b/plugins/destination/firehose/Makefile @@ -5,3 +5,11 @@ test: .PHONY: lint lint: golangci-lint run --config ../../.golangci.yml + +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + +# All gen targets +.PHONY: gen +gen: gen-spec-schema diff --git a/plugins/destination/firehose/client/client.go b/plugins/destination/firehose/client/client.go index bdb04fa7706853..17aba07d7ebb3e 100644 --- a/plugins/destination/firehose/client/client.go +++ b/plugins/destination/firehose/client/client.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/firehose" + "github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/goccy/go-json" @@ -17,7 +18,7 @@ import ( type Client struct { firehoseClient *firehose.Client - spec Spec + spec spec.Spec logger zerolog.Logger plugin.UnimplementedSource @@ -26,16 +27,16 @@ type Client struct { var _ plugin.Client = (*Client)(nil) func New(ctx context.Context, logger zerolog.Logger, specBytes []byte, _ plugin.NewClientOptions) (plugin.Client, error) { - var spec Spec - if err := json.Unmarshal(specBytes, &spec); err != nil { + var s spec.Spec + if err := json.Unmarshal(specBytes, &s); err != nil { return nil, fmt.Errorf("failed to unmarshal spec: %w", err) } - spec.SetDefaults() - if err := spec.Validate(); err != nil { + s.SetDefaults() + if err := s.Validate(); err != nil { return nil, err } - parsedARN, err := arn.Parse(spec.StreamARN) + parsedARN, err := arn.Parse(s.StreamARN) if err != nil { return nil, fmt.Errorf("failed to parse firehose stream ARN: %w", err) } @@ -46,7 +47,7 @@ func New(ctx context.Context, logger zerolog.Logger, specBytes []byte, _ plugin. return &Client{ logger: logger.With().Str("module", "firehose").Logger(), - spec: spec, + spec: s, firehoseClient: firehose.NewFromConfig(cfg), }, nil } diff --git a/plugins/destination/firehose/client/client_test.go b/plugins/destination/firehose/client/client_test.go index edcf34b4d3a7be..02973bef54e3b0 100644 --- a/plugins/destination/firehose/client/client_test.go +++ b/plugins/destination/firehose/client/client_test.go @@ -4,6 +4,7 @@ import ( "context" "testing" + "github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/goccy/go-json" "github.com/stretchr/testify/require" @@ -14,7 +15,7 @@ func TestPluginJSON(t *testing.T) { ctx := context.Background() p := plugin.NewPlugin("firehose", "development", New) const streamARN = "cq-playground-test" - s := &Spec{NoRotate: true, StreamARN: streamARN} + s := &spec.Spec{StreamARN: streamARN} b, err := json.Marshal(s) require.NoError(t, err) require.NoError(t, p.Init(ctx, b, plugin.NewClientOptions{})) diff --git a/plugins/destination/firehose/client/spec.go b/plugins/destination/firehose/client/spec.go deleted file mode 100644 index c92621d19e1885..00000000000000 --- a/plugins/destination/firehose/client/spec.go +++ /dev/null @@ -1,53 +0,0 @@ -package client - -import ( - "fmt" - - "github.com/aws/aws-sdk-go-v2/aws/arn" -) - -type Spec struct { - StreamARN string `json:"stream_arn"` - NoRotate bool `json:"no_rotate,omitempty"` - MaxRetries *int `json:"max_retries,omitempty"` - - MaxRecordSizeBytes int `json:"max_record_size_bytes,omitempty"` - MaxBatchRecords int `json:"max_batch_records,omitempty"` - MaxBatchSizeBytes int `json:"max_batch_size_bytes,omitempty"` -} - -const ( - defaultMaxRecordSizeBytes = 1024000 - defaultMaxBatchRecords = 500 - defaultMaxBatchSizeBytes = 4194000 -) - -func (s *Spec) SetDefaults() { - if s.MaxRetries == nil { - s.MaxRetries = new(int) - *s.MaxRetries = 5 - } - if s.MaxRecordSizeBytes < 1 { - s.MaxRecordSizeBytes = defaultMaxRecordSizeBytes - } - if s.MaxBatchRecords < 1 { - s.MaxBatchRecords = defaultMaxBatchRecords - } - if s.MaxBatchSizeBytes < 1 { - s.MaxBatchSizeBytes = defaultMaxBatchSizeBytes - } -} - -func (s *Spec) Validate() error { - if s.StreamARN == "" { - return fmt.Errorf("kinesis firehose Stream ARN is required") - } - parsedARN, err := arn.Parse(s.StreamARN) - if err != nil { - return fmt.Errorf("kinesis firehose Stream ARN is invalid") - } - if parsedARN.Service != "firehose" { - return fmt.Errorf("kinesis firehose Stream ARN is invalid") - } - return nil -} diff --git a/plugins/destination/firehose/client/spec/gen/main.go b/plugins/destination/firehose/client/spec/gen/main.go new file mode 100644 index 00000000000000..be51fea4b626a9 --- /dev/null +++ b/plugins/destination/firehose/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec" + "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + jsonschema.GenerateIntoFile(new(spec.Spec), path.Join(currDir(), "..", "schema.json"), + jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec", path.Join(currDir(), "..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/destination/firehose/client/spec/schema.json b/plugins/destination/firehose/client/spec/schema.json new file mode 100644 index 00000000000000..2f0a42a3ba1afd --- /dev/null +++ b/plugins/destination/firehose/client/spec/schema.json @@ -0,0 +1,46 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "stream_arn": { + "type": "string", + "pattern": "^arn:[^:]+:firehose:[^:]+:[^:]+:deliverystream/[^:]+$", + "description": "Kinesis Firehose delivery stream ARN where data will be sent to.\nFormat: `arn:${Partition}:firehose:${Region}:${Account}:deliverystream/${DeliveryStreamName}`." + }, + "max_retries": { + "type": "integer", + "minimum": 1, + "description": "Amount of retries to perform when writing a batch.", + "default": 5 + }, + "max_record_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Number of bytes (as Arrow buffer size) to write before starting a new record.", + "default": 1024000 + }, + "max_batch_records": { + "type": "integer", + "minimum": 1, + "description": "Number of records allowed in a single batch.", + "default": 500 + }, + "max_batch_size_bytes": { + "type": "integer", + "minimum": 1, + "description": "Number of bytes allowed in a single batch.", + "default": 4194000 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "stream_arn" + ], + "description": "Amazon Kinesis Firehose destination plugin spec." + } + } +} diff --git a/plugins/destination/firehose/client/spec/spec.go b/plugins/destination/firehose/client/spec/spec.go new file mode 100644 index 00000000000000..f7221204cdaec9 --- /dev/null +++ b/plugins/destination/firehose/client/spec/spec.go @@ -0,0 +1,62 @@ +package spec + +import ( + _ "embed" + "fmt" + + "github.com/aws/aws-sdk-go-v2/aws/arn" +) + +// Amazon Kinesis Firehose destination plugin spec. +type Spec struct { + // Kinesis Firehose delivery stream ARN where data will be sent to. + // Format: `arn:${Partition}:firehose:${Region}:${Account}:deliverystream/${DeliveryStreamName}`. + StreamARN string `json:"stream_arn" jsonschema:"required,pattern=^arn:[^:]+:firehose:[^:]+:[^:]+:deliverystream/[^:]+$"` + + // Amount of retries to perform when writing a batch. + MaxRetries int `json:"max_retries,omitempty" jsonschema:"minimum=1,default=5"` + + // Number of bytes (as Arrow buffer size) to write before starting a new record. + MaxRecordSizeBytes int `json:"max_record_size_bytes,omitempty" jsonschema:"minimum=1,default=1024000"` + + // Number of records allowed in a single batch. + MaxBatchRecords int `json:"max_batch_records,omitempty" jsonschema:"minimum=1,default=500"` + + // Number of bytes allowed in a single batch. + MaxBatchSizeBytes int `json:"max_batch_size_bytes,omitempty" jsonschema:"minimum=1,default=4194000"` +} + +func (s *Spec) SetDefaults() { + if s.MaxRetries < 0 { + s.MaxRetries = 5 + } + if s.MaxRecordSizeBytes < 1 { + const defaultMaxRecordSizeBytes = 1024000 + s.MaxRecordSizeBytes = defaultMaxRecordSizeBytes + } + if s.MaxBatchRecords < 1 { + const defaultMaxBatchRecords = 500 + s.MaxBatchRecords = defaultMaxBatchRecords + } + if s.MaxBatchSizeBytes < 1 { + const defaultMaxBatchSizeBytes = 4194000 + s.MaxBatchSizeBytes = defaultMaxBatchSizeBytes + } +} + +func (s *Spec) Validate() error { + if len(s.StreamARN) == 0 { + return fmt.Errorf("kinesis firehose Stream ARN is required") + } + parsedARN, err := arn.Parse(s.StreamARN) + if err != nil { + return fmt.Errorf("kinesis firehose Stream ARN is invalid") + } + if parsedARN.Service != "firehose" { + return fmt.Errorf("kinesis firehose Stream ARN is invalid") + } + return nil +} + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/destination/firehose/client/spec/spec_test.go b/plugins/destination/firehose/client/spec/spec_test.go new file mode 100644 index 00000000000000..8a857acb1927ad --- /dev/null +++ b/plugins/destination/firehose/client/spec/spec_test.go @@ -0,0 +1,172 @@ +package spec + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestSpec_JSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "missing stream_arn", + Spec: `{}`, + Err: true, + }, + { + Name: "empty stream_arn", + Spec: `{"stream_arn": ""}`, + Err: true, + }, + { + Name: "null stream_arn", + Spec: `{"stream_arn": null}`, + Err: true, + }, + { + Name: "int stream_arn", + Spec: `{"stream_arn": 123}`, + Err: true, + }, + { + Name: "bad stream_arn", + Spec: `{"stream_arn": "abc"}`, + Err: true, + }, + { + Name: "bad stream_arn service", + Spec: `{"stream_arn": "arn:aws:kinesis:us-east-1:01234:stream/name"}`, + Err: true, + }, + { + Name: "missing stream name in stream_arn", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream"}`, + Err: true, + }, + { + Name: "proper stream_arn", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name"}`, + }, + { + Name: "zero max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": 0}`, + Err: true, + }, + { + Name: "negative max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": -1}`, + Err: true, + }, + { + Name: "float max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": 1.5}`, + Err: true, + }, + { + Name: "null max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": null}`, + Err: true, + }, + { + Name: "string max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": "123"}`, + Err: true, + }, + { + Name: "proper max_retries", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_retries": 123}`, + }, + { + Name: "zero max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": 0}`, + Err: true, + }, + { + Name: "negative max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": -1}`, + Err: true, + }, + { + Name: "float max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": 1.5}`, + Err: true, + }, + { + Name: "null max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": null}`, + Err: true, + }, + { + Name: "string max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": "123"}`, + Err: true, + }, + { + Name: "proper max_record_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_record_size_bytes": 123}`, + }, + { + Name: "zero max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": 0}`, + Err: true, + }, + { + Name: "negative max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": -1}`, + Err: true, + }, + { + Name: "float max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": 1.5}`, + Err: true, + }, + { + Name: "null max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": null}`, + Err: true, + }, + { + Name: "string max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": "123"}`, + Err: true, + }, + { + Name: "proper max_batch_records", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_records": 123}`, + }, + { + Name: "zero max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": 0}`, + Err: true, + }, + { + Name: "negative max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": -1}`, + Err: true, + }, + { + Name: "float max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": 1.5}`, + Err: true, + }, + { + Name: "null max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": null}`, + Err: true, + }, + { + Name: "string max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": "123"}`, + Err: true, + }, + { + Name: "proper max_batch_size_bytes", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "max_batch_size_bytes": 123}`, + }, + { + Name: "extra key", + Spec: `{"stream_arn": "arn:aws:firehose:us-east-1:01234:deliverystream/name", "extra": true}`, + Err: true, + }, + }) +} diff --git a/plugins/destination/firehose/client/write.go b/plugins/destination/firehose/client/write.go index 0f07d44157dab4..058e82bb76bab2 100644 --- a/plugins/destination/firehose/client/write.go +++ b/plugins/destination/firehose/client/write.go @@ -105,7 +105,7 @@ func (c *Client) Write(ctx context.Context, messages <-chan message.WriteMessage } func (c *Client) sendBatch(ctx context.Context, recordsBatchInput *firehose.PutRecordBatchInput, count int) error { - if count == *c.spec.MaxRetries { + if count >= c.spec.MaxRetries { return fmt.Errorf("max retries reached") } if recordsBatchInput == nil || len(recordsBatchInput.Records) == 0 { diff --git a/plugins/destination/firehose/docs/overview.md b/plugins/destination/firehose/docs/overview.md index 9fbc750d7e7df5..3eef4c653d3457 100644 --- a/plugins/destination/firehose/docs/overview.md +++ b/plugins/destination/firehose/docs/overview.md @@ -30,7 +30,9 @@ It is important to note that Amazon Kinesis Firehose has the following limitatio - `stream_arn` (`string`) (required) - Kinesis Firehose delivery stream where data will be sent. + Kinesis Firehose delivery stream ARN where data will be sent to. + + Format: `arn:${Partition}:firehose:${Region}:${Account}:deliverystream/${DeliveryStreamName}`. - `max_retries` (`integer`) (optional) (default: `5`) diff --git a/plugins/destination/firehose/go.mod b/plugins/destination/firehose/go.mod index 0b0af0a54df492..d27ae47d486264 100644 --- a/plugins/destination/firehose/go.mod +++ b/plugins/destination/firehose/go.mod @@ -1,12 +1,15 @@ module github.com/cloudquery/cloudquery/plugins/destination/firehose -go 1.21.4 +go 1.21.5 + +toolchain go1.21.6 require ( - github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/firehose v1.24.0 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 @@ -35,6 +38,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect github.com/aws/smithy-go v1.19.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect @@ -65,6 +70,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -104,6 +110,7 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yosssi/ace v0.0.5 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel v1.20.0 // indirect @@ -132,3 +139,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index 476c841785224d..8cb4d170d45dcb 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9yndPvxScp7RpcOpdSHaqcgBWO7sDlx4S8= github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 h1:T1NToVz08rfgcfb1dkK5K3YV1Wh0d5z4/9r/ME+S//k= -github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 h1:iRgSd0hkAl8itNDxS4fbs681vr35taMkifcolb+AhCw= +github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= @@ -53,9 +53,13 @@ github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -71,6 +75,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -278,6 +286,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= diff --git a/plugins/destination/firehose/main.go b/plugins/destination/firehose/main.go index a28fc588a79739..b216ceab031cf1 100644 --- a/plugins/destination/firehose/main.go +++ b/plugins/destination/firehose/main.go @@ -5,6 +5,7 @@ import ( "log" "github.com/cloudquery/cloudquery/plugins/destination/firehose/client" + "github.com/cloudquery/cloudquery/plugins/destination/firehose/client/spec" internalPlugin "github.com/cloudquery/cloudquery/plugins/destination/firehose/resources/plugin" "github.com/cloudquery/plugin-sdk/v4/plugin" "github.com/cloudquery/plugin-sdk/v4/serve" @@ -18,6 +19,7 @@ func main() { p := plugin.NewPlugin(internalPlugin.Name, internalPlugin.Version, client.New, plugin.WithKind(internalPlugin.Kind), plugin.WithTeam(internalPlugin.Team), + plugin.WithJSONSchema(spec.JSONSchema), ) if err := serve.Plugin(p, serve.WithPluginSentryDSN(sentryDSN), From 8a8f31f40ccc720358e04d0435185109881ac483 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Sat, 3 Feb 2024 11:37:08 +0200 Subject: [PATCH 52/78] chore: Tidy vendor in pg dst (#16501) Follow-up for https://github.com/cloudquery/cloudquery/pull/16499 --- plugins/destination/postgresql/go.mod | 5 ----- plugins/destination/postgresql/go.sum | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index bd22a8315bce1f..a6e6a62bd3cd0b 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -20,13 +20,11 @@ require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet/v6 v6.2.0 // indirect - github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Joker/jade v1.1.3 // indirect github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect github.com/adrg/xdg v0.4.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 // indirect - github.com/apache/thrift v0.19.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect @@ -74,7 +72,6 @@ require ( github.com/kataras/pio v0.0.13 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/asmfmt v1.3.2 // indirect github.com/klauspost/compress v1.17.5 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/labstack/echo/v4 v4.11.4 // indirect @@ -85,8 +82,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/microcosm-cc/bluemonday v1.0.26 // indirect - github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect - github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 6930af9ffef5e4..67eb7362e343e9 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -4,8 +4,6 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4s github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= @@ -23,8 +21,6 @@ github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 h1:mFDZW1FQk9 github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61 h1:iRgSd0hkAl8itNDxS4fbs681vr35taMkifcolb+AhCw= github.com/apache/arrow/go/v15 v15.0.0-20240115115805-d7bc55542e61/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= -github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= -github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -167,8 +163,6 @@ github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= -github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -199,10 +193,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= -github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= -github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= -github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= -github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -246,7 +236,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= 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 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= From 475304f8ab85948ce583e4495755427260e959cc Mon Sep 17 00:00:00 2001 From: Yevgeny Pats Date: Sun, 4 Feb 2024 16:51:17 +0200 Subject: [PATCH 53/78] fix: Update rate-limiting.md (#16506) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary ⚠️ **If you're contributing to a plugin please read this section of the [contribution guidelines](https://github.com/cloudquery/cloudquery/blob/main/CONTRIBUTING.md#open-core-vs-open-source) 🧑‍🎓 before submitting this PR** ⚠️ If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- .../hubspot/docs/tables/hubspot_crm_companies.md | 8 ++++---- .../source/hubspot/docs/tables/hubspot_crm_contacts.md | 8 ++++---- .../source/hubspot/docs/tables/hubspot_crm_deals.md | 8 ++++---- .../hubspot/docs/tables/hubspot_crm_line_items.md | 8 ++++---- .../source/hubspot/docs/tables/hubspot_crm_owners.md | 8 ++++---- .../hubspot/docs/tables/hubspot_crm_pipelines.md | 10 +++++----- .../source/hubspot/docs/tables/hubspot_crm_products.md | 8 ++++---- .../source/hubspot/docs/tables/hubspot_crm_quotes.md | 8 ++++---- .../source/hubspot/docs/tables/hubspot_crm_tickets.md | 8 ++++---- plugins/source/hubspot/go.mod | 2 +- plugins/source/hubspot/go.sum | 4 ++-- .../hubspot/resources/services/crm/line_items_fetch.go | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_companies.md b/plugins/source/hubspot/docs/tables/hubspot_crm_companies.md index 7725043928a79c..0fa43f732ebd57 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_companies.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_companies.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_contacts.md b/plugins/source/hubspot/docs/tables/hubspot_crm_contacts.md index 212d9e17f77496..69f762f4039475 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_contacts.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_contacts.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_deals.md b/plugins/source/hubspot/docs/tables/hubspot_crm_deals.md index 169e0ae5aaabff..2c76ffa38800b7 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_deals.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_deals.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_line_items.md b/plugins/source/hubspot/docs/tables/hubspot_crm_line_items.md index 6bcfa3570145d3..8dde3b7de20073 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_line_items.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_line_items.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_owners.md b/plugins/source/hubspot/docs/tables/hubspot_crm_owners.md index 5da2caf10027a7..21c1bc4c912f9c 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_owners.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_owners.md @@ -13,11 +13,11 @@ The primary key for this table is **id**. |_cq_id|`uuid`| |_cq_parent_id|`uuid`| |id (PK)|`utf8`| -|email|`utf8`| |first_name|`utf8`| |last_name|`utf8`| -|user_id|`int64`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| -|teams|`json`| \ No newline at end of file +|teams|`json`| +|user_id|`int64`| +|email|`utf8`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_pipelines.md b/plugins/source/hubspot/docs/tables/hubspot_crm_pipelines.md index c5857dd0e5d559..50c4a6dde78f18 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_pipelines.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_pipelines.md @@ -14,10 +14,10 @@ The composite primary key for this table is (**object_type**, **id**). |_cq_parent_id|`uuid`| |object_type (PK)|`utf8`| |id (PK)|`utf8`| -|label|`utf8`| -|display_order|`int64`| -|stages|`json`| |created_at|`timestamp[us, tz=UTC]`| |archived_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| -|archived|`bool`| \ No newline at end of file +|archived|`bool`| +|display_order|`int64`| +|stages|`json`| +|label|`utf8`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_products.md b/plugins/source/hubspot/docs/tables/hubspot_crm_products.md index 08c6e3cf528af5..6f83dd212568ca 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_products.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_products.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_quotes.md b/plugins/source/hubspot/docs/tables/hubspot_crm_quotes.md index 10b2fc051af9c9..b5ce9167bc390d 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_quotes.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_quotes.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/docs/tables/hubspot_crm_tickets.md b/plugins/source/hubspot/docs/tables/hubspot_crm_tickets.md index 5827156ded56bb..22a7a2e4485328 100644 --- a/plugins/source/hubspot/docs/tables/hubspot_crm_tickets.md +++ b/plugins/source/hubspot/docs/tables/hubspot_crm_tickets.md @@ -12,10 +12,10 @@ The primary key for this table is **id**. | ------------- | ------------- | |_cq_id|`uuid`| |_cq_parent_id|`uuid`| -|id (PK)|`utf8`| -|properties|`json`| +|associations|`json`| |created_at|`timestamp[us, tz=UTC]`| -|updated_at|`timestamp[us, tz=UTC]`| |archived|`bool`| |archived_at|`timestamp[us, tz=UTC]`| -|associations|`json`| \ No newline at end of file +|id (PK)|`utf8`| +|properties|`json`| +|updated_at|`timestamp[us, tz=UTC]`| \ No newline at end of file diff --git a/plugins/source/hubspot/go.mod b/plugins/source/hubspot/go.mod index 905fb9105d6913..d9dcc9b3c7e957 100644 --- a/plugins/source/hubspot/go.mod +++ b/plugins/source/hubspot/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 - github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 + github.com/clarkmcc/go-hubspot v0.0.0-20240203002710-abe38a19e3dd github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum index e5f70233ecf7f8..25abb803acf9c8 100644 --- a/plugins/source/hubspot/go.sum +++ b/plugins/source/hubspot/go.sum @@ -45,8 +45,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 h1:pjhz1KktkBAqkDsEucv4vbJicT6V5yGbFsStfR3seio= -github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126/go.mod h1:hedWyunNqr3OeTCQPjIMBjrJq/RImLOkIj37puh6oIE= +github.com/clarkmcc/go-hubspot v0.0.0-20240203002710-abe38a19e3dd h1:qO3mLZfePPkEJNluivZskSortGnepEktp8INgd3AYVY= +github.com/clarkmcc/go-hubspot v0.0.0-20240203002710-abe38a19e3dd/go.mod h1:hedWyunNqr3OeTCQPjIMBjrJq/RImLOkIj37puh6oIE= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= diff --git a/plugins/source/hubspot/resources/services/crm/line_items_fetch.go b/plugins/source/hubspot/resources/services/crm/line_items_fetch.go index 716fc8fe8a4f0d..32ef2aac88bbca 100644 --- a/plugins/source/hubspot/resources/services/crm/line_items_fetch.go +++ b/plugins/source/hubspot/resources/services/crm/line_items_fetch.go @@ -20,7 +20,7 @@ func fetchLineItems(ctx context.Context, meta schema.ClientMeta, parent *schema. } req := hubspotClient.BasicApi. - GetPage(hubspot.WithAuthorizer(ctx, cqClient.Authorizer)). + GetCrmV3ObjectsLineItemsGetPage(hubspot.WithAuthorizer(ctx, cqClient.Authorizer)). Properties(cqClient.Spec.TableOptions.ForTable("hubspot_crm_line_items").GetProperties()). Associations(cqClient.Spec.TableOptions.ForTable("hubspot_crm_line_items").GetAssociations()). Limit(client.DefaultPageSize) From e6716aa3f2445959f76344f8f8c48027fe7ad45e Mon Sep 17 00:00:00 2001 From: Martin Norbury Date: Mon, 5 Feb 2024 09:38:21 +0000 Subject: [PATCH 55/78] feat: Add JSON schema for pagerduty source plugin (#16494) fixes: https://github.com/cloudquery/cloudquery/issues/16455 --- plugins/source/pagerduty/Makefile | 6 ++- plugins/source/pagerduty/client/schema.json | 46 ++++++++++++++++++ plugins/source/pagerduty/client/spec.go | 14 +++++- .../source/pagerduty/client/spec/gen/main.go | 26 ++++++++++ plugins/source/pagerduty/client/spec_test.go | 47 +++++++++++++++++++ plugins/source/pagerduty/go.mod | 4 ++ plugins/source/pagerduty/go.sum | 6 ++- .../pagerduty/resources/plugin/plugin.go | 2 + 8 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 plugins/source/pagerduty/client/schema.json create mode 100644 plugins/source/pagerduty/client/spec/gen/main.go create mode 100644 plugins/source/pagerduty/client/spec_test.go diff --git a/plugins/source/pagerduty/Makefile b/plugins/source/pagerduty/Makefile index 9a13c2d8d598d8..72cd188875160b 100644 --- a/plugins/source/pagerduty/Makefile +++ b/plugins/source/pagerduty/Makefile @@ -28,6 +28,10 @@ gen-docs: build cloudquery tables --format markdown --output-dir docs test/config.yml mv docs/$(shell basename $(CURDIR)) docs/tables +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + # All gen targets .PHONY: gen -gen: gen-mocks gen-docs +gen: gen-mocks gen-docs gen-spec-schema diff --git a/plugins/source/pagerduty/client/schema.json b/plugins/source/pagerduty/client/schema.json new file mode 100644 index 00000000000000..189cfa98a5ba10 --- /dev/null +++ b/plugins/source/pagerduty/client/schema.json @@ -0,0 +1,46 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/source/pagerduty/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Spec": { + "properties": { + "team_ids": { + "oneOf": [ + { + "items": { + "type": "string" + }, + "type": "array", + "description": "Used in API requests to filter only resources related to these team ids.\nUsed in the tables: [\"escalation_policies\", \"incidents\", \"maintenance_windows\", \"services\", \"users\"]" + }, + { + "type": "null" + } + ] + }, + "max_requests_per_second": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "description": "PagerDuty API is heavily rate-limited (900 requests/min = 15 requests/sec, across the entire organization).\nThis option allows you to control the rate at which the plugin will make requests to the API.\nYou can reduce this parameter in case you are still seeing rate limit errors (status code 429), or increase\nit if your PagerDuty API quota is higher. See https://developer.pagerduty.com/docs/ZG9jOjExMDI5NTUz-rate-limiting#what-are-our-limits for more info.", + "default": 10 + }, + { + "type": "null" + } + ] + }, + "concurrency": { + "type": "integer", + "minimum": 1, + "description": "A best effort maximum number of Go routines to use. Lower this number to reduce memory usage.", + "default": 1000 + } + }, + "additionalProperties": false, + "type": "object" + } + } +} diff --git a/plugins/source/pagerduty/client/spec.go b/plugins/source/pagerduty/client/spec.go index 32926b50314e94..e8af48b6b2d110 100644 --- a/plugins/source/pagerduty/client/spec.go +++ b/plugins/source/pagerduty/client/spec.go @@ -1,5 +1,7 @@ package client +import _ "embed" + const defaultConcurrency = 1000 type Spec struct { @@ -7,9 +9,14 @@ type Spec struct { // Used in the tables: ["escalation_policies", "incidents", "maintenance_windows", "services", "users"] TeamIds []string `json:"team_ids"` - MaxRequestsPerSecond *int `json:"max_requests_per_second"` + // PagerDuty API is heavily rate-limited (900 requests/min = 15 requests/sec, across the entire organization). + // This option allows you to control the rate at which the plugin will make requests to the API. + // You can reduce this parameter in case you are still seeing rate limit errors (status code 429), or increase + // it if your PagerDuty API quota is higher. See https://developer.pagerduty.com/docs/ZG9jOjExMDI5NTUz-rate-limiting#what-are-our-limits for more info. + MaxRequestsPerSecond *int `json:"max_requests_per_second" jsonschema:"minimum=1,default=10"` - Concurrency int `json:"concurrency"` + // A best effort maximum number of Go routines to use. Lower this number to reduce memory usage. + Concurrency int `json:"concurrency" jsonschema:"minimum=1,default=1000"` } func (spec *Spec) SetDefaults() { @@ -31,3 +38,6 @@ func (spec *Spec) SetDefaults() { func (*Spec) Validate() error { return nil } + +//go:embed schema.json +var JSONSchema string diff --git a/plugins/source/pagerduty/client/spec/gen/main.go b/plugins/source/pagerduty/client/spec/gen/main.go new file mode 100644 index 00000000000000..f14587ec8c6ea7 --- /dev/null +++ b/plugins/source/pagerduty/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/source/pagerduty/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/source/pagerduty/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/source/pagerduty/client/spec_test.go b/plugins/source/pagerduty/client/spec_test.go new file mode 100644 index 00000000000000..eee885c732c71b --- /dev/null +++ b/plugins/source/pagerduty/client/spec_test.go @@ -0,0 +1,47 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + }, + { + Name: "spec with unknown field", + Spec: `{"unknown": "field"}`, + Err: true, + }, + { + Name: "spec with team_ids", + Spec: `{"team_ids": ["team1", "team2"]}`, + }, + { + Name: "spec with max_requests_per_second", + Spec: `{"max_requests_per_second": 5}`, + }, + { + Name: "spec with negative max_requests_per_second", + Spec: `{"max_requests_per_second": -5}`, + Err: true, + }, + { + Name: "spec with concurrency", + Spec: `{"concurrency": 5}`, + }, + { + Name: "spec with negative concurrency", + Spec: `{"concurrency": -5}`, + Err: true, + }, + { + Name: "spec with all fields", + Spec: `{"team_ids": ["team1", "team2"], "max_requests_per_second": 5, "concurrency": 5}`, + }, + }) +} diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index d680f4d331ab08..bc0dfd2cc83b76 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -5,6 +5,7 @@ go 1.21.4 require ( github.com/PagerDuty/go-pagerduty v1.6.0 github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/rs/zerolog v1.31.0 golang.org/x/time v0.5.0 @@ -124,3 +125,6 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 94d31dfc00b25b..350a51d856436a 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -51,6 +51,10 @@ github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= +github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -138,8 +142,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/source/pagerduty/resources/plugin/plugin.go b/plugins/source/pagerduty/resources/plugin/plugin.go index 72c38bdaf54ed7..a7a032207d0937 100644 --- a/plugins/source/pagerduty/resources/plugin/plugin.go +++ b/plugins/source/pagerduty/resources/plugin/plugin.go @@ -1,6 +1,7 @@ package plugin import ( + "github.com/cloudquery/cloudquery/plugins/source/pagerduty/client" "github.com/cloudquery/plugin-sdk/v4/plugin" ) @@ -16,6 +17,7 @@ func Plugin() *plugin.Plugin { Name, Version, Configure, + plugin.WithJSONSchema(client.JSONSchema), plugin.WithKind(Kind), plugin.WithTeam(Team), ) From d374ba88fcc339e992ed9cd298e301acf0fff108 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:12:49 +0200 Subject: [PATCH 56/78] fix(deps): Update github.com/cloudquery/jsonschema digest to d771afd (#16511) 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/jsonschema](https://togithub.com/cloudquery/jsonschema) | replace | digest | `6c617a2` -> `d771afd` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### 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/pagerduty/go.mod | 2 +- plugins/source/pagerduty/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index bc0dfd2cc83b76..4142f23deead0a 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -127,4 +127,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 350a51d856436a..8968a7da0455c4 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= From 75ce0abd90080dd537342dba17b03a60bc4c2b8a Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Mon, 5 Feb 2024 02:51:07 -0800 Subject: [PATCH 57/78] feat: Add JSON Schema to Okta source plugin (#16493) Closes https://github.com/cloudquery/cloudquery/issues/16453 --- plugins/source/okta/Makefile | 6 +- plugins/source/okta/client/schema.json | 70 +++++++++++ plugins/source/okta/client/spec.go | 40 +++++-- plugins/source/okta/client/spec/gen/main.go | 26 +++++ plugins/source/okta/client/spec_test.go | 109 ++++++++++++++++++ plugins/source/okta/docs/overview.md | 4 +- plugins/source/okta/go.mod | 6 +- plugins/source/okta/go.sum | 6 +- .../source/okta/resources/plugin/client.go | 2 +- .../source/okta/resources/plugin/plugin.go | 2 + 10 files changed, 255 insertions(+), 16 deletions(-) create mode 100644 plugins/source/okta/client/schema.json create mode 100644 plugins/source/okta/client/spec/gen/main.go create mode 100644 plugins/source/okta/client/spec_test.go diff --git a/plugins/source/okta/Makefile b/plugins/source/okta/Makefile index e305c36ab8133b..f0b35e06335727 100644 --- a/plugins/source/okta/Makefile +++ b/plugins/source/okta/Makefile @@ -22,6 +22,10 @@ gen-docs: build cloudquery tables --format markdown --output-dir docs test/config.yml mv docs/$(shell basename $(CURDIR)) docs/tables +.PHONY: gen-spec-schema +gen-spec-schema: + go run client/spec/gen/main.go + # All gen targets .PHONY: gen -gen: gen-docs +gen: gen-spec-schema gen-docs diff --git a/plugins/source/okta/client/schema.json b/plugins/source/okta/client/schema.json new file mode 100644 index 00000000000000..52b89638a137a7 --- /dev/null +++ b/plugins/source/okta/client/schema.json @@ -0,0 +1,70 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/plugins/source/okta/client/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "Duration": { + "type": "string", + "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$", + "title": "CloudQuery configtype.Duration" + }, + "RateLimit": { + "properties": { + "max_backoff": { + "$ref": "#/$defs/Duration", + "description": "Max backoff interval to be used.\nIf the value specified is less than the default one, the default one is used.", + "default": "30s" + }, + "max_retries": { + "type": "integer", + "minimum": 2, + "description": "Max retries to be performed.", + "default": 2 + } + }, + "additionalProperties": false, + "type": "object" + }, + "Spec": { + "properties": { + "token": { + "type": "string", + "minLength": 1, + "description": "Token for Okta API access." + }, + "domain": { + "type": "string", + "pattern": "^https?://[^\n\u003c\u003e]+\\.okta\\.com$", + "description": "Specify the Okta domain you are fetching from.\n[Visit this link](https://developer.okta.com/docs/guides/find-your-domain/findorg/) to find your Okta domain." + }, + "rate_limit": { + "oneOf": [ + { + "$ref": "#/$defs/RateLimit" + }, + { + "type": "null" + } + ] + }, + "debug": { + "type": "boolean", + "description": "Enables debug logs within the Okta SDK.", + "default": false + }, + "concurrency": { + "type": "integer", + "minimum": 1, + "description": "Number of concurrent requests to be made to Okta API.", + "default": 10000 + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "token", + "domain" + ] + } + } +} diff --git a/plugins/source/okta/client/spec.go b/plugins/source/okta/client/spec.go index 3d97a48bcf76aa..91e13ebf35d674 100644 --- a/plugins/source/okta/client/spec.go +++ b/plugins/source/okta/client/spec.go @@ -1,26 +1,44 @@ package client import ( + _ "embed" "errors" "time" + "github.com/cloudquery/plugin-sdk/v4/configtype" + "github.com/invopop/jsonschema" "github.com/rs/zerolog" ) type ( Spec struct { - Token string `json:"token,omitempty"` - Domain string `json:"domain,omitempty"` - RateLimit *RateLimit `json:"rate_limit,omitempty"` - Debug bool `json:"debug,omitempty"` - Concurrency int `json:"concurrency,omitempty"` + // Token for Okta API access. + Token string `json:"token" jsonschema:"required,minLength=1"` + + // Specify the Okta domain you are fetching from. + // [Visit this link](https://developer.okta.com/docs/guides/find-your-domain/findorg/) to find your Okta domain. + Domain string `json:"domain" jsonschema:"required,pattern=^https?://[^\n<>]+\\.okta\\.com$"` + RateLimit *RateLimit `json:"rate_limit"` + + // Enables debug logs within the Okta SDK. + Debug bool `json:"debug,omitempty" jsonschema:"default=false"` + + // Number of concurrent requests to be made to Okta API. + Concurrency int `json:"concurrency" jsonschema:"minimum=1,default=10000"` } RateLimit struct { - MaxBackoff time.Duration `json:"max_backoff,omitempty"` - MaxRetries int32 `json:"max_retries,omitempty"` + // Max backoff interval to be used. + // If the value specified is less than the default one, the default one is used. + MaxBackoff configtype.Duration `json:"max_backoff,omitempty"` + + // Max retries to be performed. + MaxRetries int32 `json:"max_retries,omitempty" jsonschema:"minimum=2,default=2"` } ) +//go:embed schema.json +var JSONSchema string + func (s *Spec) SetDefaults(logger *zerolog.Logger) { const ( minRetries = int32(2) @@ -35,8 +53,8 @@ func (s *Spec) SetDefaults(logger *zerolog.Logger) { s.RateLimit.MaxRetries = minRetries } - if s.RateLimit.MaxBackoff < minBackOff { - s.RateLimit.MaxBackoff = minBackOff + if s.RateLimit.MaxBackoff.Duration() < minBackOff { + s.RateLimit.MaxBackoff = configtype.NewDuration(minBackOff) } if s.Concurrency < 1 { @@ -57,3 +75,7 @@ func (s Spec) Validate() error { return nil } + +func (RateLimit) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Properties.Value("max_backoff").Default = "30s" +} diff --git a/plugins/source/okta/client/spec/gen/main.go b/plugins/source/okta/client/spec/gen/main.go new file mode 100644 index 00000000000000..dda208b24a06c9 --- /dev/null +++ b/plugins/source/okta/client/spec/gen/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "fmt" + "log" + "path" + "runtime" + + "github.com/cloudquery/cloudquery/plugins/source/okta/client" + cqjsonschema "github.com/cloudquery/codegen/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for plugin spec") + cqjsonschema.GenerateIntoFile(new(client.Spec), path.Join(currDir(), "../..", "schema.json"), + cqjsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/plugins/source/okta/client", path.Join(currDir(), "../..")), + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/plugins/source/okta/client/spec_test.go b/plugins/source/okta/client/spec_test.go new file mode 100644 index 00000000000000..295c4116052549 --- /dev/null +++ b/plugins/source/okta/client/spec_test.go @@ -0,0 +1,109 @@ +package client + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" +) + +func TestJSONSchema(t *testing.T) { + jsonschema.TestJSONSchema(t, JSONSchema, []jsonschema.TestCase{ + { + Name: "empty spec", + Spec: `{}`, + Err: true, + }, + { + Name: "spec with token", + Spec: `{"token": "tok"}`, + Err: true, + }, + { + Name: "spec with domain", + Spec: `{"domain": "https://domain.okta.com"}`, + Err: true, + }, + { + Name: "spec with token and domain", + Spec: `{"token": "tok", "domain": "https://domain.okta.com"}`, + }, + { + Name: "spec with token and invalid domain", + Spec: `{"token": "tok", "domain": "https://.okta.com"}`, + Err: true, + }, + { + Name: "spec with token and domain and empty rate limit", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "rate_limit": {}}`, + }, + { + Name: "spec with token and domain and null rate limit", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "rate_limit": null}`, + }, + { + Name: "spec with token and domain and valid rate limit", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "rate_limit": {"max_backoff": "60s"}}`, + }, + { + Name: "spec with bool concurrency", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "concurrency":false}`, + Err: true, + }, + { + Name: "spec with null concurrency", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "concurrency":null}`, + Err: true, + }, + { + Name: "spec with string concurrency", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "concurrency":"str"}`, + Err: true, + }, + { + Name: "spec with proper concurrency", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "concurrency": 7}`, + }, + { + Name: "spec with array concurrency", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "concurrency":["abc"]}`, + Err: true, + }, + { + Name: "spec with unknown field", + Spec: `{"token": "tok", "domain": "https://domain.okta.com", "unknown": "test"}`, + Err: true, + }, + }) +} + +func TestRateLimitJSONSchema(t *testing.T) { + data, err := jsonschema.Generate(RateLimit{}) + require.NoError(t, err) + + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Spec: `{}`, + }, + { + Name: "valid max_backoff", + Spec: `{"max_backoff": "60s"}`, + }, + { + Name: "invalid max_backoff", + Spec: `{"max_backoff": true}`, + Err: true, + }, + { + Name: "zero max_backoff", + Spec: `{"max_backoff": 0}`, + Err: true, + }, + { + Name: "unknown field", + Spec: `{"unknown": "test"}`, + Err: true, + }, + }) +} diff --git a/plugins/source/okta/docs/overview.md b/plugins/source/okta/docs/overview.md index 011751d3dddfa4..6e619d3fc12546 100644 --- a/plugins/source/okta/docs/overview.md +++ b/plugins/source/okta/docs/overview.md @@ -50,12 +50,12 @@ Make sure you use [environment variable expansion](/docs/advanced-topics/environ ### Rate limit spec -- `max_backoff` (`duration`) (optional) (default: `5s`) +- `max_backoff` (`duration`) (optional) (default: `30s`) Max backoff interval to be used. If the value specified is less than the default one, the default one is used. -- `max_retries` (`integer`) (optional) (default: `3`) +- `max_retries` (`integer`) (optional) (default: `2`) Max retries to be performed. If the value specified is less than the default one, the default one is used. diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 064cba10f7e4bf..788f7374e8c139 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -4,8 +4,10 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.29.1 github.com/gorilla/mux v1.8.0 + github.com/invopop/jsonschema v0.12.0 github.com/okta/okta-sdk-golang/v3 v3.0.2 github.com/rs/zerolog v1.31.0 github.com/thoas/go-funk v0.9.3 @@ -55,7 +57,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -129,3 +130,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +// github.com/cloudquery/jsonschema @ cqmain +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index edd8daf2c68a82..07446f1736c207 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -88,6 +88,10 @@ 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/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= +github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= @@ -228,8 +232,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C 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/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI= -github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= github.com/iris-contrib/httpexpect/v2 v2.15.2 h1:T9THsdP1woyAqKHwjkEsbCnMefsAFvk8iJJKokcJ3Go= github.com/iris-contrib/httpexpect/v2 v2.15.2/go.mod h1:JLDgIqnFy5loDSUv1OA2j0mb6p/rDhiCqigP22Uq9xE= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= diff --git a/plugins/source/okta/resources/plugin/client.go b/plugins/source/okta/resources/plugin/client.go index 8df4ca61eb7033..f6d291f9f9c516 100644 --- a/plugins/source/okta/resources/plugin/client.go +++ b/plugins/source/okta/resources/plugin/client.go @@ -81,7 +81,7 @@ func Configure(_ context.Context, logger zerolog.Logger, specBytes []byte, opts okta.WithOrgUrl(config.Domain), okta.WithToken(config.Token), okta.WithCache(true), - okta.WithRateLimitMaxBackOff(int64(config.RateLimit.MaxBackoff/time.Second)), // this param takes int64 of seconds + okta.WithRateLimitMaxBackOff(int64(config.RateLimit.MaxBackoff.Duration()/time.Second)), // this param takes int64 of seconds okta.WithRateLimitMaxRetries(config.RateLimit.MaxRetries), ) cf.Debug = config.Debug diff --git a/plugins/source/okta/resources/plugin/plugin.go b/plugins/source/okta/resources/plugin/plugin.go index 82af0be4829b24..d011788c1547b9 100644 --- a/plugins/source/okta/resources/plugin/plugin.go +++ b/plugins/source/okta/resources/plugin/plugin.go @@ -1,6 +1,7 @@ package plugin import ( + "github.com/cloudquery/cloudquery/plugins/source/okta/client" "github.com/cloudquery/plugin-sdk/v4/plugin" ) @@ -18,5 +19,6 @@ func Plugin() *plugin.Plugin { Configure, plugin.WithKind(Kind), plugin.WithTeam(Team), + plugin.WithJSONSchema(client.JSONSchema), ) } From c03ad7722c5db1812b9fbbf812b5b7fb075645db Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Mon, 5 Feb 2024 14:44:08 +0200 Subject: [PATCH 58/78] fix: Proper JSON marshaling for `LogLevel` (#16512) Follow-up for https://github.com/cloudquery/cloudquery/pull/16479 --- .../postgresql/client/spec/pgx_log_level.go | 2 +- .../client/spec/pgx_log_level_test.go | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/plugins/destination/postgresql/client/spec/pgx_log_level.go b/plugins/destination/postgresql/client/spec/pgx_log_level.go index 975ef9434a591f..e61457668357e4 100644 --- a/plugins/destination/postgresql/client/spec/pgx_log_level.go +++ b/plugins/destination/postgresql/client/spec/pgx_log_level.go @@ -43,7 +43,7 @@ func (r LogLevel) LogLevel() tracelog.LogLevel { return tracelog.LogLevel(r) } -func (r *LogLevel) MarshalJSON() ([]byte, error) { +func (r LogLevel) MarshalJSON() ([]byte, error) { buffer := bytes.NewBufferString(`"`) buffer.WriteString(r.String()) buffer.WriteString(`"`) diff --git a/plugins/destination/postgresql/client/spec/pgx_log_level_test.go b/plugins/destination/postgresql/client/spec/pgx_log_level_test.go index 2624d65d9f9610..c96bacce92e511 100644 --- a/plugins/destination/postgresql/client/spec/pgx_log_level_test.go +++ b/plugins/destination/postgresql/client/spec/pgx_log_level_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/cloudquery/codegen/jsonschema" + "github.com/jackc/pgx/v5/tracelog" "github.com/stretchr/testify/require" ) @@ -28,3 +29,32 @@ func TestLogLevel_JSONSchema(t *testing.T) { ), ) } + +func TestLogLevel_MarshalJSON(t *testing.T) { + type spec struct { + LogLevel LogLevel `json:"log_level"` + } + for l := tracelog.LogLevelNone; l <= tracelog.LogLevelTrace; l++ { + level := LogLevel(l) + t.Run(level.String(), func(t *testing.T) { + data, err := json.Marshal(spec{LogLevel: level}) + require.NoError(t, err) + require.Exactly(t, `{"log_level":"`+level.String()+`"}`, string(data)) + }) + } +} + +func TestLogLevel_UnmarshalJSON(t *testing.T) { + type spec struct { + LogLevel LogLevel `json:"log_level"` + } + for l := tracelog.LogLevelNone; l <= tracelog.LogLevelTrace; l++ { + level := LogLevel(l) + t.Run(level.String(), func(t *testing.T) { + var s spec + err := json.Unmarshal([]byte(`{"log_level":"`+level.String()+`"}`), &s) + require.NoError(t, err) + require.Exactly(t, level, s.LogLevel) + }) + } +} From 94636769f67a4c41893742ea1e53b98f3c1614e4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:56:41 +0200 Subject: [PATCH 59/78] fix(deps): Update module github.com/cloudquery/cloudquery-api-go to v1.7.3 (#16513) 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/cloudquery-api-go](https://togithub.com/cloudquery/cloudquery-api-go) | require | patch | `v1.7.2` -> `v1.7.3` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/cloudquery-api-go (github.com/cloudquery/cloudquery-api-go) ### [`v1.7.3`](https://togithub.com/cloudquery/cloudquery-api-go/releases/tag/v1.7.3) [Compare Source](https://togithub.com/cloudquery/cloudquery-api-go/compare/v1.7.2...v1.7.3) ##### Bug Fixes - Generate CloudQuery Go API Client from `spec.json` ([#​118](https://togithub.com/cloudquery/cloudquery-api-go/issues/118)) ([c545ec6](https://togithub.com/cloudquery/cloudquery-api-go/commit/c545ec69b9fd356b28516979d439d2b4f75e8a9f)) - Generate CloudQuery Go API Client from `spec.json` ([#​120](https://togithub.com/cloudquery/cloudquery-api-go/issues/120)) ([140f2fe](https://togithub.com/cloudquery/cloudquery-api-go/commit/140f2fe262e80c9c915dce3726d8b5978c437805))
--- ### 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 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index dfb3f1615b3ce2..88a1a61b69bffa 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -6,7 +6,7 @@ require ( github.com/apache/arrow/go/v15 v15.0.0-20240114144300-7e703aae55c1 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/cloudquery-api-go v1.7.2 + github.com/cloudquery/cloudquery-api-go v1.7.3 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-pb-go v1.16.8 github.com/cloudquery/plugin-sdk/v4 v4.29.1 diff --git a/cli/go.sum b/cli/go.sum index d7a93fa7f2a56a..06335f0592b749 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -62,8 +62,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpV github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= -github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC/Y8fOj+tQxLm4= -github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/cloudquery-api-go v1.7.3 h1:n2dIqEYMmRKpFdFHWxO/f2kythc20shgEHMsqIpua4I= +github.com/cloudquery/cloudquery-api-go v1.7.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= From 1c2a76bc83f25c93e9661f813db2ec0f7b63d137 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Mon, 5 Feb 2024 13:36:05 +0000 Subject: [PATCH 60/78] doc: Add login step to publish instructions (#16510) --- website/components/mdx/_publish-go.mdx | 5 +++-- website/components/mdx/_publish-javascript.mdx | 5 +++-- website/components/mdx/_publish-python.mdx | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/website/components/mdx/_publish-go.mdx b/website/components/mdx/_publish-go.mdx index 683de871a6e1a6..5b8f4eec5e936b 100644 --- a/website/components/mdx/_publish-go.mdx +++ b/website/components/mdx/_publish-go.mdx @@ -2,5 +2,6 @@ 1. (Optional, recommended) In the root directory of your plugin repository run `git tag v1.0.0` to tag the version you're about to publish (replace `v1.0.0` with the version you'd like to publish). 2. (Optional, recommended) Run `git push origin v1.0.0` to push the tag. 3. Run `go run main.go package --docs-dir docs -m 'feat: Initial release' v1.0.0 .` to package the plugin. `v1.0.0` should match the tag you created in step 1. The `-m` specifies the changelog message that will be used in the release notes and it supports markdown. See example [here](https://hub.cloudquery.io/plugins/source/cloudquery/alicloud/v4.0.14/versions). `docs` should be a directory containing markdown files that serve as documentation for the plugin. Read more about the documentation format [here](#documentation-format). -4. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. -5. Once you're ready run `cloudquery plugin publish -f` to publish a non draft version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/). Allow up to 1 hour for the Hub to reflect the changes. +4. Run `cloudquery login` to authenticate your CLI with CloudQuery. +5. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. +6. Once you're ready run `cloudquery plugin publish -f` to publish a finalized version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/) if the plugin is marked as public. Allow up to 1 hour for the Hub to reflect the changes. diff --git a/website/components/mdx/_publish-javascript.mdx b/website/components/mdx/_publish-javascript.mdx index 465464e7e898d5..b9cda4993410c6 100644 --- a/website/components/mdx/_publish-javascript.mdx +++ b/website/components/mdx/_publish-javascript.mdx @@ -11,5 +11,6 @@ pluginClient.plugin = newPlugin("cq-js-sample", version, newClient, { 3. (Optional, recommended) In the root directory of your plugin repository run `git tag v1.0.0` to tag the version you're about to publish (replace `v1.0.0` with the version you'd like to publish). 4. (Optional, recommended) Run `git push origin v1.0.0` to push the tag. 5. Run `node dist/main.js package v0.0.1 . -m "test packaging"` to package the plugin. `v1.0.0` should match the tag you created in step 3. The `-m` specifies the changelog message that will be used in the release notes and it supports markdown. See example [here](https://hub.cloudquery.io/plugins/source/cloudquery/alicloud/v4.0.14/versions). `docs` should be a directory containing markdown files that serve as documentation for the plugin. Read more about the documentation format [here](#documentation-format). -6. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. -7. Once you're ready run `cloudquery plugin publish -f` to publish a non draft version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/). Allow up to 1 hour for the Hub to reflect the changes. +6. Run `cloudquery login` to authenticate your CLI with CloudQuery. +7. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. +8. Once you're ready run `cloudquery plugin publish -f` to publish a finalized version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/) if the plugin is marked as public. Allow up to 1 hour for the Hub to reflect the changes. diff --git a/website/components/mdx/_publish-python.mdx b/website/components/mdx/_publish-python.mdx index dfb9b765b0fc83..45b78c5ac5771b 100644 --- a/website/components/mdx/_publish-python.mdx +++ b/website/components/mdx/_publish-python.mdx @@ -15,5 +15,6 @@ class BitlyPlugin(plugin.Plugin): 3. (Optional, recommended) In the root directory of your plugin repository run `git tag v1.0.0` to tag the version you're about to publish (replace `v1.0.0` with the version you'd like to publish). 4. (Optional, recommended) Run `git push origin v1.0.0` to push the tag. 5. Run `python3 main.py package --docs-dir docs -m 'feat: Initial release' v1.0.0 .` to package the plugin. `v1.0.0` should match the tag you created in step 3. The `-m` specifies the changelog message that will be used in the release notes and it supports markdown. See example [here](https://hub.cloudquery.io/plugins/source/cloudquery/alicloud/v4.0.14/versions). `docs` should be a directory containing markdown files that serve as documentation for the plugin. Read more about the documentation format [here](#documentation-format). -6. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. -7. Once you're ready run `cloudquery plugin publish -f` to publish a non draft version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/). Allow up to 1 hour for the Hub to reflect the changes. +6. Run `cloudquery login` to authenticate your CLI with CloudQuery. +7. Run `cloudquery plugin publish` to publish a draft version of the plugin. The version will show up under the versions tab of your plugin in [CloudQuery Cloud](https://cloud.cloudquery.io). As long as the version is in draft it's mutable and you can re-package the plugin and publish it again. +8. Once you're ready run `cloudquery plugin publish -f` to publish a finalized version of the plugin. This version will be immutable and will show up in [Hub](https://hub.cloudquery.io/) if the plugin is marked as public. Allow up to 1 hour for the Hub to reflect the changes. From b9c0baa2a625976d6bde78fa4724e1faf469cacb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:25:56 +0200 Subject: [PATCH 61/78] chore(main): Release plugins-destination-postgresql v7.3.0 (#16276) :robot: I have created a release *beep* *boop* --- ## [7.3.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.2.0...plugins-destination-postgresql-v7.3.0) (2024-02-05) ### Features * Add Auto Migrate Functionality for migrating to using a `_cq_id` as the only Primary Key ([#16226](https://github.com/cloudquery/cloudquery/issues/16226)) ([78045f5](https://github.com/cloudquery/cloudquery/commit/78045f586b9d0c3d36c17b0a7478e69ccaca09b2)) * Add JSON schema to `postgresql` destination plugin ([#16479](https://github.com/cloudquery/cloudquery/issues/16479)) ([7b6582d](https://github.com/cloudquery/cloudquery/commit/7b6582d6bab7394286f7852b693cefcbc7a7469b)) ### Bug Fixes * **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) * **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.0 ([#16237](https://github.com/cloudquery/cloudquery/issues/16237)) ([3fcdab0](https://github.com/cloudquery/cloudquery/commit/3fcdab08816ad9de7bb4eecab59c7be1bda3d00c)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.1 ([#16296](https://github.com/cloudquery/cloudquery/issues/16296)) ([ab4a0da](https://github.com/cloudquery/cloudquery/commit/ab4a0dace0a870755fd22d92c6e9c999351f594e)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.2 ([#16342](https://github.com/cloudquery/cloudquery/issues/16342)) ([f3eb857](https://github.com/cloudquery/cloudquery/commit/f3eb85729e5db16c2530b31d6d276934866d5ef0)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) * Proper JSON marshaling for `LogLevel` ([#16512](https://github.com/cloudquery/cloudquery/issues/16512)) ([c03ad77](https://github.com/cloudquery/cloudquery/commit/c03ad7722c5db1812b9fbbf812b5b7fb075645db)) --- 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 | 22 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 5d27bb2c24060d..e887d3a8bf5a83 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -21,7 +21,7 @@ "plugins/source/terraform+FILLER": "0.0.0", "plugins/source/test": "4.0.7", "plugins/source/test+FILLER": "0.0.0", - "plugins/destination/postgresql": "7.2.0", + "plugins/destination/postgresql": "7.3.0", "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "2.2.19", "plugins/destination/test+FILLER": "0.0.0", diff --git a/plugins/destination/postgresql/CHANGELOG.md b/plugins/destination/postgresql/CHANGELOG.md index ff3541b8a53796..14312affeb160e 100644 --- a/plugins/destination/postgresql/CHANGELOG.md +++ b/plugins/destination/postgresql/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [7.3.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.2.0...plugins-destination-postgresql-v7.3.0) (2024-02-05) + + +### Features + +* Add Auto Migrate Functionality for migrating to using a `_cq_id` as the only Primary Key ([#16226](https://github.com/cloudquery/cloudquery/issues/16226)) ([78045f5](https://github.com/cloudquery/cloudquery/commit/78045f586b9d0c3d36c17b0a7478e69ccaca09b2)) +* Add JSON schema to `postgresql` destination plugin ([#16479](https://github.com/cloudquery/cloudquery/issues/16479)) ([7b6582d](https://github.com/cloudquery/cloudquery/commit/7b6582d6bab7394286f7852b693cefcbc7a7469b)) + + +### Bug Fixes + +* **deps:** Update golang.org/x/exp digest to 1b97071 ([#16419](https://github.com/cloudquery/cloudquery/issues/16419)) ([6d77cd1](https://github.com/cloudquery/cloudquery/commit/6d77cd19b6fc648a4ddb12025c22127e960036a4)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 1f4bbc5 ([#16421](https://github.com/cloudquery/cloudquery/issues/16421)) ([9489931](https://github.com/cloudquery/cloudquery/commit/9489931c1b64bf1f7d5da51997944ee54370215b)) +* **deps:** Update google.golang.org/genproto/googleapis/rpc digest to 1f4bbc5 ([#16422](https://github.com/cloudquery/cloudquery/issues/16422)) ([74e98fc](https://github.com/cloudquery/cloudquery/commit/74e98fcbde6c6e11baf98284aef0341c597d4817)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.0 ([#16237](https://github.com/cloudquery/cloudquery/issues/16237)) ([3fcdab0](https://github.com/cloudquery/cloudquery/commit/3fcdab08816ad9de7bb4eecab59c7be1bda3d00c)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.1 ([#16296](https://github.com/cloudquery/cloudquery/issues/16296)) ([ab4a0da](https://github.com/cloudquery/cloudquery/commit/ab4a0dace0a870755fd22d92c6e9c999351f594e)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.27.2 ([#16342](https://github.com/cloudquery/cloudquery/issues/16342)) ([f3eb857](https://github.com/cloudquery/cloudquery/commit/f3eb85729e5db16c2530b31d6d276934866d5ef0)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.28.0 ([#16362](https://github.com/cloudquery/cloudquery/issues/16362)) ([9166b6b](https://github.com/cloudquery/cloudquery/commit/9166b6b603d0d56a30c2e5072c4f2da5c0c837b5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.0 ([#16395](https://github.com/cloudquery/cloudquery/issues/16395)) ([fb1102e](https://github.com/cloudquery/cloudquery/commit/fb1102eac8af4b3722b82b882187fdf322546513)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) +* Proper JSON marshaling for `LogLevel` ([#16512](https://github.com/cloudquery/cloudquery/issues/16512)) ([c03ad77](https://github.com/cloudquery/cloudquery/commit/c03ad7722c5db1812b9fbbf812b5b7fb075645db)) + ## [7.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.1.6...plugins-destination-postgresql-v7.2.0) (2024-01-23) From 60cfee655a266e20a82117ffc025ddaf46561192 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:30:42 +0200 Subject: [PATCH 62/78] chore: Update plugin `destination-postgresql` version to v7.3.0 (#16514) Updates the `destination-postgresql` plugin latest version to v7.3.0 --- 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 242e5a027f293a..dd096427dcb05c 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v7.2.0" } +{ "latest": "plugins-destination-postgresql-v7.3.0" } From 0b6b6d2fd6ec5e65345c2411a8b0246592bf4930 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:15:49 +0200 Subject: [PATCH 63/78] chore(deps): Update dependency destination-postgresql to v7.3.0 (#16516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [destination-postgresql](https://hub.cloudquery.io) | minor | `v7.2.0` -> `v7.3.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### 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/k8s/test/policy_cq_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index 169037d7bcb9ef..4d456d01aa6062 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -12,6 +12,6 @@ spec: name: postgresql path: cloudquery/postgresql registry: cloudquery - version: "v7.2.0" # latest version of postgresql plugin + version: "v7.3.0" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From dbace976b05ceaaca416ce7b48f38a95a26d0b9b Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Mon, 5 Feb 2024 10:25:44 -0600 Subject: [PATCH 64/78] fix: Remove `NOT NULL` when moving to `_cq_id` (#16518) #### Summary Prior to this PR if a user was migrating from component PKs to `_cq_id` the `NOT NULL` on the old PKs would remain... This would mean that the next migration would find a diff that is unable to be migrated --- .../destination/postgresql/client/migrate.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/plugins/destination/postgresql/client/migrate.go b/plugins/destination/postgresql/client/migrate.go index 57a219762d78f0..fb2864492d8b69 100644 --- a/plugins/destination/postgresql/client/migrate.go +++ b/plugins/destination/postgresql/client/migrate.go @@ -102,7 +102,7 @@ func (c *Client) autoMigrateTable(ctx context.Context, table *schema.Table, chan case schema.TableColumnChangeTypeRemove: continue case schema.TableColumnChangeTypeMoveToCQOnly: - return c.migrateToCQID(ctx, tableName, change.Current) + return c.migrateToCQID(ctx, table, change.Current) default: return fmt.Errorf("unsupported column change type: %s for column: %v from %v", change.Type.String(), change.Current, change.Previous) } @@ -170,7 +170,7 @@ func (c *Client) dropTable(ctx context.Context, tableName string) error { return nil } -func (c *Client) migrateToCQID(ctx context.Context, tableName string, _ schema.Column) (err error) { +func (c *Client) migrateToCQID(ctx context.Context, table *schema.Table, _ schema.Column) (err error) { // Steps: // acquire connection var conn *pgxpool.Conn @@ -179,6 +179,10 @@ func (c *Client) migrateToCQID(ctx context.Context, tableName string, _ schema.C return fmt.Errorf("failed to acquire connection: %w", err) } defer conn.Release() + tableName := table.Name + sanitizedTableName := pgx.Identifier{tableName}.Sanitize() + sanitizedPKName := pgx.Identifier{getPKName(&schema.Table{Name: tableName})}.Sanitize() + // start transaction tx, err := conn.BeginTx(ctx, pgx.TxOptions{ IsoLevel: pgx.Serializable, @@ -201,9 +205,6 @@ func (c *Client) migrateToCQID(ctx context.Context, tableName string, _ schema.C } }() - sanitizedTableName := pgx.Identifier{tableName}.Sanitize() - sanitizedPKName := pgx.Identifier{getPKName(&schema.Table{Name: tableName})}.Sanitize() - // Drop existing primary key _, err = tx.Exec(ctx, "ALTER TABLE "+sanitizedTableName+" DROP CONSTRAINT "+sanitizedPKName) if err != nil { @@ -211,6 +212,14 @@ func (c *Client) migrateToCQID(ctx context.Context, tableName string, _ schema.C return err } + for _, colName := range table.PrimaryKeyComponents() { + _, err = tx.Exec(ctx, "ALTER TABLE "+sanitizedTableName+" ALTER COLUMN "+pgx.Identifier{colName}.Sanitize()+" DROP NOT NULL") + if err != nil { + c.logger.Error().Err(err).Str("table", tableName).Str("column", colName).Msg("Failed to drop NOT NULL constraint") + return err + } + } + // Create new Primary Key with CQID _, err = tx.Exec(ctx, "ALTER TABLE "+sanitizedTableName+" ADD CONSTRAINT "+sanitizedPKName+" PRIMARY KEY ("+pgx.Identifier{schema.CqIDColumn.Name}.Sanitize()+")") if err != nil { From 18e735ac2da4e882c087581d18874ef0975c04ae Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 18:43:02 +0200 Subject: [PATCH 65/78] chore(main): Release plugins-destination-postgresql v7.3.1 (#16519) :robot: I have created a release *beep* *boop* --- ## [7.3.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.3.0...plugins-destination-postgresql-v7.3.1) (2024-02-05) ### Bug Fixes * Remove `NOT NULL` when moving to `_cq_id` ([#16518](https://github.com/cloudquery/cloudquery/issues/16518)) ([dbace97](https://github.com/cloudquery/cloudquery/commit/dbace976b05ceaaca416ce7b48f38a95a26d0b9b)) --- 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 e887d3a8bf5a83..91a25ac54a45d3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -21,7 +21,7 @@ "plugins/source/terraform+FILLER": "0.0.0", "plugins/source/test": "4.0.7", "plugins/source/test+FILLER": "0.0.0", - "plugins/destination/postgresql": "7.3.0", + "plugins/destination/postgresql": "7.3.1", "plugins/destination/postgresql+FILLER": "0.0.0", "plugins/destination/test": "2.2.19", "plugins/destination/test+FILLER": "0.0.0", diff --git a/plugins/destination/postgresql/CHANGELOG.md b/plugins/destination/postgresql/CHANGELOG.md index 14312affeb160e..5ee841e2d0bbda 100644 --- a/plugins/destination/postgresql/CHANGELOG.md +++ b/plugins/destination/postgresql/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.3.1](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.3.0...plugins-destination-postgresql-v7.3.1) (2024-02-05) + + +### Bug Fixes + +* Remove `NOT NULL` when moving to `_cq_id` ([#16518](https://github.com/cloudquery/cloudquery/issues/16518)) ([dbace97](https://github.com/cloudquery/cloudquery/commit/dbace976b05ceaaca416ce7b48f38a95a26d0b9b)) + ## [7.3.0](https://github.com/cloudquery/cloudquery/compare/plugins-destination-postgresql-v7.2.0...plugins-destination-postgresql-v7.3.0) (2024-02-05) From 0749e58860a2484d8595ea131125a729b455a2ac Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 18:47:38 +0200 Subject: [PATCH 66/78] chore: Update plugin `destination-postgresql` version to v7.3.1 (#16520) Updates the `destination-postgresql` plugin latest version to v7.3.1 --- 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 dd096427dcb05c..fd09789b2c595f 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v7.3.0" } +{ "latest": "plugins-destination-postgresql-v7.3.1" } From b92c89896c69ef1998edc9736c94c816c80b890a Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:12:04 +0200 Subject: [PATCH 67/78] chore(deps): Update dependency destination-postgresql to v7.3.1 (#16521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [destination-postgresql](https://hub.cloudquery.io) | patch | `v7.3.0` -> `v7.3.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### 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/k8s/test/policy_cq_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index 4d456d01aa6062..45ecf0e536c47c 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -12,6 +12,6 @@ spec: name: postgresql path: cloudquery/postgresql registry: cloudquery - version: "v7.3.0" # latest version of postgresql plugin + version: "v7.3.1" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From f750cd7c57130ad419f59bf62b30cdf0c9e8e3ab Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Mon, 5 Feb 2024 20:14:34 +0100 Subject: [PATCH 68/78] chore: Fix detection of Go Plugins (#16522) #### Summary Now that we're publishing to the Hub we shouldn't use the Go Releaser file to detect if this is a Go plugin 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/github/go.mod | 4 ++-- plugins/source/github/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index a93eaa0c57728a..f2b9872d129faf 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -10,6 +10,7 @@ require ( github.com/gofri/go-github-ratelimit v1.0.3 github.com/golang/mock v1.6.0 github.com/google/go-github/v49 v49.0.0 + github.com/invopop/jsonschema v0.12.0 github.com/rs/zerolog v1.31.0 golang.org/x/oauth2 v0.16.0 golang.org/x/sync v0.6.0 @@ -60,7 +61,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/invopop/jsonschema v0.12.0 // indirect github.com/iris-contrib/schema v0.0.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -132,4 +132,4 @@ require ( ) // github.com/cloudquery/jsonschema @ cqmain -replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f +replace github.com/invopop/jsonschema => github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index 5da0c6d861da3a..a64efd28863814 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -51,8 +51,8 @@ github.com/cloudquery/cloudquery-api-go v1.7.2 h1:jpQfeZUxekbV7ASN5ONpGIkrtKIZvC github.com/cloudquery/cloudquery-api-go v1.7.2/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/codegen v0.3.12 h1:9BaYdwbMJU1HVT/BHI+ykhOhBGeXt8AjpvBiXN1KhKE= github.com/cloudquery/codegen v0.3.12/go.mod h1:utqjurr58U8uqcPJe0rZjh06i0Eq9uAPGOmyIjq/1w8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f h1:vmYGxIGDVpmhk0QVeDwXXbAt+SwQcOn4xH1G25pmKP8= -github.com/cloudquery/jsonschema v0.0.0-20231018073309-6c617a23d42f/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb h1:/l8fbvLOCNlgkHp8VUKTTL+Tk9gs5y/K3Yx/bRfReNk= +github.com/cloudquery/jsonschema v0.0.0-20240202134451-d771afde32fb/go.mod h1:0SoZ/U7yJlNOR+fWsBSeTvTbGXB6DK01tzJ7m2Xfg34= github.com/cloudquery/plugin-pb-go v1.16.7 h1:wLx5TFvS6gAvD1dcBZdv5YSskcNCnNpF1JNituka5jM= github.com/cloudquery/plugin-pb-go v1.16.7/go.mod h1:Sd08P8HIjwi3gmfoE0X21qo6HL1NiVdNl/00JrK+DkM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= From 6e03293f234a0a64bde53f3972eed1705b557153 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Tue, 6 Feb 2024 15:44:58 +0200 Subject: [PATCH 76/78] fix: Use `io.cloudquery:plugin-sdk-java` (#16530) Follow-up for package renaming --- plugins/source/bitbucket/app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/source/bitbucket/app/build.gradle b/plugins/source/bitbucket/app/build.gradle index 676e861f892287..35d5622fd4e7d6 100644 --- a/plugins/source/bitbucket/app/build.gradle +++ b/plugins/source/bitbucket/app/build.gradle @@ -31,21 +31,21 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' // This dependency is used by the application. - implementation "com.fasterxml.jackson.core:jackson-core:2.15.1" - implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.1" - implementation "com.fasterxml.jackson.core:jackson-databind:2.15.1" + implementation 'com.fasterxml.jackson.core:jackson-core:2.15.1' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.1' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.1' implementation 'com.google.guava:guava:31.1-jre' implementation 'com.konghq:unirest-java:3.14.2' - implementation "io.grpc:grpc-protobuf:1.57.1" - implementation "io.grpc:grpc-stub:1.57.1" - implementation "io.grpc:grpc-services:1.57.1" - implementation "io.grpc:grpc-testing:1.57.1" + implementation 'io.grpc:grpc-protobuf:1.57.1' + implementation 'io.grpc:grpc-stub:1.57.1' + implementation 'io.grpc:grpc-services:1.57.1' + implementation 'io.grpc:grpc-testing:1.57.1' implementation 'org.apache.logging.log4j:log4j-api:2.20.0' implementation 'org.apache.logging.log4j:log4j-core:2.20.0' - implementation "io.cloudquery:plugin-pb-java:0.0.11" - implementation 'io.cloudquery.plugin.sdk:lib:0.0.16' + implementation 'io.cloudquery:plugin-pb-java:0.0.13' + implementation 'io.cloudquery:plugin-sdk-java:0.0.20' } // Apply a specific Java toolchain to ease working on different environments. From ed02aff0dd52b48b4e979101c74c4b3c2d0950b4 Mon Sep 17 00:00:00 2001 From: Tom Nick Date: Tue, 6 Feb 2024 15:39:15 +0100 Subject: [PATCH 77/78] doc: Fix broken hub link (#16529) #### Summary Fix the broken hub link in the docs (The www prefix was problematic). Took the liberty to actually mark them as links in markdown. --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f29fb3f24b48af..927cf508065379 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ See the **[Quickstart guide](https://www.cloudquery.io/docs/quickstart)** for in ### Links -- Homepage: https://www.cloudquery.io -- Documentation: https://www.cloudquery.io/docs -- Integrations: https://www.hub.cloudquery.io -- Releases: https://github.com/cloudquery/cloudquery/releases -- Plugin SDK: https://github.com/cloudquery/plugin-sdk +- Homepage: [https://www.cloudquery.io](https://www.cloudquery.io) +- Documentation: [https://www.cloudquery.io/docs](https://www.cloudquery.io/docs) +- Integrations: [https://hub.cloudquery.io](https://hub.cloudquery.io) +- Releases: [https://github.com/cloudquery/cloudquery/releases](https://github.com/cloudquery/cloudquery/releases) +- Plugin SDK: [https://github.com/cloudquery/plugin-sdk](https://github.com/cloudquery/plugin-sdk) ## License From 2398c9828dc144896be7e6aea2ba0a3d10e9b236 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 6 Feb 2024 17:29:31 +0200 Subject: [PATCH 78/78] chore(main): Release cli v5.3.1 (#16432) :robot: I have created a release *beep* *boop* --- ## [5.3.1](https://github.com/cloudquery/cloudquery/compare/cli-v5.3.0...cli-v5.3.1) (2024-02-06) ### Bug Fixes * **deps:** Update github.com/cloudquery/jsonschema digest to d771afd ([#16483](https://github.com/cloudquery/cloudquery/issues/16483)) ([dcaa994](https://github.com/cloudquery/cloudquery/commit/dcaa9949df43919c0745e05308ce97bf409c4d77)) * **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.3 ([#16513](https://github.com/cloudquery/cloudquery/issues/16513)) ([9463676](https://github.com/cloudquery/cloudquery/commit/94636769f67a4c41893742ea1e53b98f3c1614e4)) * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.8 ([#16467](https://github.com/cloudquery/cloudquery/issues/16467)) ([3a68f8f](https://github.com/cloudquery/cloudquery/commit/3a68f8fb50aaf30490751c86e1212ae1f790b054)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) --- 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 +- cli/CHANGELOG.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 91a25ac54a45d3..01adf1ca368ff3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "cli": "5.3.0", + "cli": "5.3.1", "cli+FILLER": "0.0.0", "plugins/source/aws": "22.19.2", "plugins/source/aws+FILLER": "0.0.0", diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index a09a9782d7ae55..7d98be7a749edc 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to CloudQuery 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.3.1](https://github.com/cloudquery/cloudquery/compare/cli-v5.3.0...cli-v5.3.1) (2024-02-06) + + +### Bug Fixes + +* **deps:** Update github.com/cloudquery/jsonschema digest to d771afd ([#16483](https://github.com/cloudquery/cloudquery/issues/16483)) ([dcaa994](https://github.com/cloudquery/cloudquery/commit/dcaa9949df43919c0745e05308ce97bf409c4d77)) +* **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.7.3 ([#16513](https://github.com/cloudquery/cloudquery/issues/16513)) ([9463676](https://github.com/cloudquery/cloudquery/commit/94636769f67a4c41893742ea1e53b98f3c1614e4)) +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.8 ([#16467](https://github.com/cloudquery/cloudquery/issues/16467)) ([3a68f8f](https://github.com/cloudquery/cloudquery/commit/3a68f8fb50aaf30490751c86e1212ae1f790b054)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.29.1 ([#16430](https://github.com/cloudquery/cloudquery/issues/16430)) ([738e89f](https://github.com/cloudquery/cloudquery/commit/738e89f2c969a8a3f1698a8686aeaddb358e7a23)) + ## [5.3.0](https://github.com/cloudquery/cloudquery/compare/cli-v5.2.0...cli-v5.3.0) (2024-02-01)