From eeccd55a20a943926bfa7e69a410175e300685a9 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:25:15 +0200 Subject: [PATCH 001/166] chore(main): Release plugins-destination-file v3.4.15 (#15869) :robot: I have created a release *beep* *boop* --- ## [3.4.15](https://github.com/cloudquery/cloudquery/compare/plugins-destination-file-v3.4.14...plugins-destination-file-v3.4.15) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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/file/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 790e53b4e1a3ab..d781eef2052053 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -43,7 +43,7 @@ "plugins/destination/gcs+FILLER": "0.0.0", "plugins/destination/s3": "4.8.6", "plugins/destination/s3+FILLER": "0.0.0", - "plugins/destination/file": "3.4.14", + "plugins/destination/file": "3.4.15", "plugins/destination/file+FILLER": "0.0.0", "plugins/destination/azblob": "3.4.15", "plugins/destination/azblob+FILLER": "0.0.0", diff --git a/plugins/destination/file/CHANGELOG.md b/plugins/destination/file/CHANGELOG.md index 1b7ea0411aeaa4..ec559129d93656 100644 --- a/plugins/destination/file/CHANGELOG.md +++ b/plugins/destination/file/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [3.4.15](https://github.com/cloudquery/cloudquery/compare/plugins-destination-file-v3.4.14...plugins-destination-file-v3.4.15) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.4.14](https://github.com/cloudquery/cloudquery/compare/plugins-destination-file-v3.4.13...plugins-destination-file-v3.4.14) (2023-12-28) From a751fde5699ee466c0c99ccd245368b42de27b95 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:29:04 +0200 Subject: [PATCH 002/166] chore(main): Release plugins-destination-elasticsearch v3.1.11 (#15868) :robot: I have created a release *beep* *boop* --- ## [3.1.11](https://github.com/cloudquery/cloudquery/compare/plugins-destination-elasticsearch-v3.1.10...plugins-destination-elasticsearch-v3.1.11) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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/elasticsearch/CHANGELOG.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d781eef2052053..ab74285dad932b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -65,7 +65,7 @@ "plugins/source/stripe+FILLER": "0.0.0", "plugins/source/hubspot": "3.0.16", "plugins/source/hubspot+FILLER": "0.0.0", - "plugins/destination/elasticsearch": "3.1.10", + "plugins/destination/elasticsearch": "3.1.11", "plugins/destination/elasticsearch+FILLER": "0.0.0", "plugins/destination/clickhouse": "3.4.6", "plugins/destination/clickhouse+FILLER": "0.0.0", diff --git a/plugins/destination/elasticsearch/CHANGELOG.md b/plugins/destination/elasticsearch/CHANGELOG.md index 71b242ae117b32..0306bdc993a4e2 100644 --- a/plugins/destination/elasticsearch/CHANGELOG.md +++ b/plugins/destination/elasticsearch/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [3.1.11](https://github.com/cloudquery/cloudquery/compare/plugins-destination-elasticsearch-v3.1.10...plugins-destination-elasticsearch-v3.1.11) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.1.10](https://github.com/cloudquery/cloudquery/compare/plugins-destination-elasticsearch-v3.1.9...plugins-destination-elasticsearch-v3.1.10) (2023-12-28) From b2df09c641c2b19dce194c1117f240d5731e6316 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:35:51 +0200 Subject: [PATCH 003/166] chore(main): Release plugins-destination-duckdb v5.0.9 (#15867) :robot: I have created a release *beep* *boop* --- ## [5.0.9](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.8...plugins-destination-duckdb-v5.0.9) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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 | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index ab74285dad932b..dce6dab4a8c33d 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.16", "plugins/source/awspricing+FILLER": "0.0.0", - "plugins/destination/duckdb": "5.0.8", + "plugins/destination/duckdb": "5.0.9", "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 db3323755749e1..ec85c49d4d8244 100644 --- a/plugins/destination/duckdb/CHANGELOG.md +++ b/plugins/destination/duckdb/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [5.0.9](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.8...plugins-destination-duckdb-v5.0.9) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [5.0.8](https://github.com/cloudquery/cloudquery/compare/plugins-destination-duckdb-v5.0.7...plugins-destination-duckdb-v5.0.8) (2023-12-28) From a1da21e72fc8a34d099e7ca21de760ce3622af28 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:39:06 +0200 Subject: [PATCH 004/166] chore: Update plugin `source-pagerduty` version to v3.1.2 (#15917) Updates the `source-pagerduty` plugin latest version to v3.1.2 --- website/versions/source-pagerduty.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-pagerduty.json b/website/versions/source-pagerduty.json index 5dadbbb6e60e86..079fc46a540872 100644 --- a/website/versions/source-pagerduty.json +++ b/website/versions/source-pagerduty.json @@ -1 +1 @@ -{ "latest": "plugins-source-pagerduty-v3.1.1" } +{ "latest": "plugins-source-pagerduty-v3.1.2" } From 58ac6f811757723319767746f75d0eb31a447565 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:41:35 +0200 Subject: [PATCH 005/166] chore: Update plugin `source-gitlab` version to v4.1.16 (#15918) Updates the `source-gitlab` plugin latest version to v4.1.16 --- website/versions/source-gitlab.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gitlab.json b/website/versions/source-gitlab.json index c0f61d320aadf3..f83323b60dd4ca 100644 --- a/website/versions/source-gitlab.json +++ b/website/versions/source-gitlab.json @@ -1 +1 @@ -{ "latest": "plugins-source-gitlab-v4.1.15" } +{ "latest": "plugins-source-gitlab-v4.1.16" } From 3aaad2fb3b33dff3480ba6cc7836942a40d2280b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:44:07 +0200 Subject: [PATCH 006/166] chore: Update plugin `source-hubspot` version to v3.0.16 (#15919) Updates the `source-hubspot` plugin latest version to v3.0.16 --- website/versions/source-hubspot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-hubspot.json b/website/versions/source-hubspot.json index 4d08f891406c2a..dcc1af99036578 100644 --- a/website/versions/source-hubspot.json +++ b/website/versions/source-hubspot.json @@ -1 +1 @@ -{ "latest": "plugins-source-hubspot-v3.0.15" } +{ "latest": "plugins-source-hubspot-v3.0.16" } From 7d43a2fa3b80b748c0a900ec92950c5b1fb960bf Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:48:20 +0200 Subject: [PATCH 007/166] chore: Update plugin `source-cloudflare` version to v6.0.1 (#15920) Updates the `source-cloudflare` plugin latest version to v6.0.1 --- website/versions/source-cloudflare.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-cloudflare.json b/website/versions/source-cloudflare.json index 88aeaa5bfa71d4..8e028720f6ef8a 100644 --- a/website/versions/source-cloudflare.json +++ b/website/versions/source-cloudflare.json @@ -1 +1 @@ -{ "latest": "plugins-source-cloudflare-v6.0.0" } +{ "latest": "plugins-source-cloudflare-v6.0.1" } From 332237af8c34a337a4530ee6134076b64b4b3b94 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:52:38 +0200 Subject: [PATCH 008/166] chore: Update plugin `destination-test` version to v2.2.17 (#15914) Updates the `destination-test` plugin latest version to v2.2.17 --- website/versions/destination-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-test.json b/website/versions/destination-test.json index 443da8e765f182..fe489c73aece66 100644 --- a/website/versions/destination-test.json +++ b/website/versions/destination-test.json @@ -1 +1 @@ -{ "latest": "plugins-destination-test-v2.2.16" } +{ "latest": "plugins-destination-test-v2.2.17" } From f85019f929a94a04379ef8d148f54432822908b6 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:55:12 +0200 Subject: [PATCH 009/166] chore: Update plugin `source-hackernews` version to v3.0.19 (#15922) Updates the `source-hackernews` plugin latest version to v3.0.19 --- website/versions/source-hackernews.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-hackernews.json b/website/versions/source-hackernews.json index 3406a83b4e6dc8..3c68e5238cea49 100644 --- a/website/versions/source-hackernews.json +++ b/website/versions/source-hackernews.json @@ -1 +1 @@ -{ "latest": "plugins-source-hackernews-v3.0.18" } +{ "latest": "plugins-source-hackernews-v3.0.19" } From 840cdc10fac4c0b694d133bc0f99f1343a161b52 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:05:49 +0200 Subject: [PATCH 010/166] chore: Update plugin `source-github` version to v7.6.2 (#15921) Updates the `source-github` plugin latest version to v7.6.2 --- website/versions/source-github.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-github.json b/website/versions/source-github.json index 20cf869b90b941..912f1b72404766 100644 --- a/website/versions/source-github.json +++ b/website/versions/source-github.json @@ -1 +1 @@ -{ "latest": "plugins-source-github-v7.6.1" } +{ "latest": "plugins-source-github-v7.6.2" } From f5fad03a5d29538eaa9c9c85fd94ad6f66c3745f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:14:09 +0200 Subject: [PATCH 011/166] chore: Update plugin `source-notion` version to v1.0.8 (#15923) Updates the `source-notion` plugin latest version to v1.0.8 --- website/versions/source-notion.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-notion.json b/website/versions/source-notion.json index 0cc3cb7348c6ab..bd082ce55f6bcd 100644 --- a/website/versions/source-notion.json +++ b/website/versions/source-notion.json @@ -1 +1 @@ -{ "latest": "plugins-source-notion-v1.0.7" } +{ "latest": "plugins-source-notion-v1.0.8" } From dec46f933a250d37b7d735214bd2efc2d7b7666e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:17:08 +0200 Subject: [PATCH 012/166] chore: Update plugin `source-datadog` version to v4.2.6 (#15924) Updates the `source-datadog` plugin latest version to v4.2.6 --- website/versions/source-datadog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-datadog.json b/website/versions/source-datadog.json index 81cc619f39d89a..78a5ce26a6f099 100644 --- a/website/versions/source-datadog.json +++ b/website/versions/source-datadog.json @@ -1 +1 @@ -{ "latest": "plugins-source-datadog-v4.2.5" } +{ "latest": "plugins-source-datadog-v4.2.6" } From 4207299feb12aea2a506d61b330abcd1fec3064c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:19:40 +0200 Subject: [PATCH 013/166] chore: Update plugin `source-digitalocean` version to v5.3.12 (#15925) Updates the `source-digitalocean` plugin latest version to v5.3.12 --- website/versions/source-digitalocean.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-digitalocean.json b/website/versions/source-digitalocean.json index e715e867ba3d42..06873d6b2323e5 100644 --- a/website/versions/source-digitalocean.json +++ b/website/versions/source-digitalocean.json @@ -1 +1 @@ -{ "latest": "plugins-source-digitalocean-v5.3.11" } +{ "latest": "plugins-source-digitalocean-v5.3.12" } From bc34ec10314ad56b6ec76e374b3452b7e3afa728 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:22:20 +0200 Subject: [PATCH 014/166] chore: Update plugin `destination-postgresql` version to v7.1.4 (#15930) Updates the `destination-postgresql` plugin latest version to v7.1.4 --- 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 f571f1612a5b55..c76f07cca79ad9 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v7.1.3" } +{ "latest": "plugins-destination-postgresql-v7.1.4" } From 1223b3439d0a2b47e6f8ec08de33df9b0ec88329 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:24:55 +0200 Subject: [PATCH 015/166] chore: Update plugin `source-awspricing` version to v3.0.16 (#15931) Updates the `source-awspricing` plugin latest version to v3.0.16 --- website/versions/source-awspricing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-awspricing.json b/website/versions/source-awspricing.json index b9644dcdd7b0c8..ee47e5fd96a963 100644 --- a/website/versions/source-awspricing.json +++ b/website/versions/source-awspricing.json @@ -1 +1 @@ -{ "latest": "plugins-source-awspricing-v3.0.15" } +{ "latest": "plugins-source-awspricing-v3.0.16" } From 0eb2f5f9b9c7668d48b2b9538184afa1500ab0ef Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:27:30 +0200 Subject: [PATCH 016/166] chore: Update plugin `destination-sqlite` version to v2.4.19 (#15933) Updates the `destination-sqlite` plugin latest version to v2.4.19 --- 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 2cc4cf530bc8bc..0e648ba7532500 100644 --- a/website/versions/destination-sqlite.json +++ b/website/versions/destination-sqlite.json @@ -1 +1 @@ -{ "latest": "plugins-destination-sqlite-v2.4.18" } +{ "latest": "plugins-destination-sqlite-v2.4.19" } From 1640e6741973114ec8e1f8d04d79b302755cc7c4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:46:38 +0200 Subject: [PATCH 017/166] chore(deps): Update CloudQuery monorepo modules (#15934) 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 | `v4.3.6` -> `v4.4.0` | | [destination-postgresql](https://hub.cloudquery.io) | patch | `v7.1.3` -> `v7.1.4` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/cloudquery (cli) ### [`v4.4.0`](https://togithub.com/cloudquery/cloudquery/releases/tag/cli-v4.4.0) [Compare Source](https://togithub.com/cloudquery/cloudquery/compare/cli-v4.3.6...cli-v4.4.0) ##### Features - Offline licensing support ([#​15831](https://togithub.com/cloudquery/cloudquery/issues/15831)) ([7eab631](https://togithub.com/cloudquery/cloudquery/commit/7eab6315362cc49adca0d06a5cf8b391237025fb)) - Support publishing to a private docker registry ([#​15698](https://togithub.com/cloudquery/cloudquery/issues/15698)) ([36e0351](https://togithub.com/cloudquery/cloudquery/commit/36e035107e801e9f0a3751eaecdc39959dd60da5)) ##### Bug Fixes - **deps:** Update github.com/apache/arrow/go/v15 digest to [`7c3480e`](https://togithub.com/cloudquery/cloudquery/commit/7c3480e) ([#​15904](https://togithub.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://togithub.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) - **deps:** Update github.com/gomarkdown/markdown digest to [`1d6d208`](https://togithub.com/cloudquery/cloudquery/commit/1d6d208) ([#​15907](https://togithub.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://togithub.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) - **deps:** Update golang.org/x/exp digest to [`02704c9`](https://togithub.com/cloudquery/cloudquery/commit/02704c9) ([#​15909](https://togithub.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://togithub.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.15.0 ([#​15851](https://togithub.com/cloudquery/cloudquery/issues/15851)) ([f51f12d](https://togithub.com/cloudquery/cloudquery/commit/f51f12d7217843dab594859e0a431b4faf545259)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.0 ([#​15856](https://togithub.com/cloudquery/cloudquery/issues/15856)) ([0d63c66](https://togithub.com/cloudquery/cloudquery/commit/0d63c66360c726eb618804dbe3b8a75f9de6c636)) - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#​15863](https://togithub.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://togithub.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) - **deps:** Update module github.com/prometheus/client_golang to v1.11.1 \[SECURITY] ([#​15855](https://togithub.com/cloudquery/cloudquery/issues/15855)) ([676805b](https://togithub.com/cloudquery/cloudquery/commit/676805b0563cc0e3ed99b1de7e4549257b0ee2c5))
--- ### 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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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 | 2 +- .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 +- plugins/source/k8s/test/policy_cq_config.yml | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/manual_commands_triggers.yml b/.github/workflows/manual_commands_triggers.yml index 1fa42460abda13..2ec36a8c7ad0f5 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: v4.3.6 + version: v4.4.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 0cc6d85ea39953..a936e9dfda1e4d 100644 --- a/.github/workflows/publish_plugin_to_hub.yml +++ b/.github/workflows/publish_plugin_to_hub.yml @@ -127,7 +127,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v4.3.6 + version: v4.4.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 20411a014ecba3..167858925222e4 100644 --- a/.github/workflows/publish_plugin_to_hub_duckdb.yml +++ b/.github/workflows/publish_plugin_to_hub_duckdb.yml @@ -107,7 +107,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v4.3.6 + version: v4.4.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 9786e7469f2acd..f943729b446ddb 100644 --- a/.github/workflows/publish_plugin_to_hub_snowflake.yml +++ b/.github/workflows/publish_plugin_to_hub_snowflake.yml @@ -108,7 +108,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v4.3.6 + version: v4.4.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 81385a6ad3cae0..ee8fc8715c341d 100644 --- a/.github/workflows/publish_plugin_to_hub_sqlite.yml +++ b/.github/workflows/publish_plugin_to_hub_sqlite.yml @@ -107,7 +107,7 @@ jobs: - name: Setup CloudQuery uses: cloudquery/setup-cloudquery@v3 with: - version: v4.3.6 + version: v4.4.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 ade57eb42d5f6d..e48f9212f7538a 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: v4.3.6 + version: v4.4.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 2b48c721a4573b..747afa0c604292 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: v4.3.6 + version: v4.4.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 6bf745c2fe9306..7de70860ff5365 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: v4.3.6 + version: v4.4.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 c10d9fb9cf131e..f23f13d4eeff4a 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: v4.3.6 + version: v4.4.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 d85ad2f40f365a..d846ec2bd77a5f 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: v4.3.6 + version: v4.4.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 ec61e9f20e8198..d253c84d1b8051 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: v4.3.6 + version: v4.4.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 3ccaa7ba3f2c85..6c14755821d5aa 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: v4.3.6 + version: v4.4.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 04f8106f353385..74836323d2adb7 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: v4.3.6 + version: v4.4.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: v4.3.6 + version: v4.4.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 616d222a6ceb7a..41e5c856955bd5 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: v4.3.6 + version: v4.4.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 3fd358c40ec74e..5203ebe03c1ed3 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: v4.3.6 + version: v4.4.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 b446198698e43d..59c4e0a9aa58ae 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: v4.3.6 + version: v4.4.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 1945e61280e4a6..1f481e8c50d521 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: v4.3.6 + version: v4.4.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 ea6ea69cf7c20d..375d45cadac56f 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: v4.3.6 + version: v4.4.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: v4.3.6 + version: v4.4.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 476d76d626399b..324664cd4e1630 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: v4.3.6 + version: v4.4.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 5d598f5c3b9bfd..69d37f840b8a52 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: v4.3.6 + version: v4.4.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 f80dd3023026c7..6bf1e9ffac007c 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: v4.3.6 + version: v4.4.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 40c1b458b2b3ee..1fc10ccbdfacbb 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: v4.3.6 + version: v4.4.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 55be5eb5a1dcfd..1aba642182cdd0 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: v4.3.6 + version: v4.4.0 - name: gen if: github.event_name == 'pull_request' run: make gen diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index e030fdc31dc4f6..c109b7bd17e800 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.1.3" # latest version of postgresql plugin + version: "v7.1.4" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From b99439127b3607903eb6c59169b5aa751ba111ca Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:56:42 +0200 Subject: [PATCH 018/166] chore(main): Release plugins-destination-azblob v3.4.16 (#15864) :robot: I have created a release *beep* *boop* --- ## [3.4.16](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.15...plugins-destination-azblob-v3.4.16) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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 | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index dce6dab4a8c33d..50df88c16b3010 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.15", "plugins/destination/file+FILLER": "0.0.0", - "plugins/destination/azblob": "3.4.15", + "plugins/destination/azblob": "3.4.16", "plugins/destination/azblob+FILLER": "0.0.0", "plugins/destination/neo4j": "5.0.4", "plugins/destination/neo4j+FILLER": "0.0.0", diff --git a/plugins/destination/azblob/CHANGELOG.md b/plugins/destination/azblob/CHANGELOG.md index c930fcb95e4fd0..dbf525f48bd55c 100644 --- a/plugins/destination/azblob/CHANGELOG.md +++ b/plugins/destination/azblob/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [3.4.16](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.15...plugins-destination-azblob-v3.4.16) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.4.15](https://github.com/cloudquery/cloudquery/compare/plugins-destination-azblob-v3.4.14...plugins-destination-azblob-v3.4.15) (2023-12-28) From 48fc1321a6b79482ada9312f5212f6b46a26cf2d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:03:20 +0200 Subject: [PATCH 019/166] chore(main): Release plugins-destination-bigquery v3.3.12 (#15865) :robot: I have created a release *beep* *boop* --- ## [3.3.12](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v3.3.11...plugins-destination-bigquery-v3.3.12) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto digest to 995d672 ([#15910](https://github.com/cloudquery/cloudquery/issues/15910)) ([de15c6b](https://github.com/cloudquery/cloudquery/commit/de15c6b6129535f2022de6fec3f4c875dd897bad)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/destination/bigquery/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 50df88c16b3010..8c85f52724b5a8 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -31,7 +31,7 @@ "plugins/destination/snowflake+FILLER": "0.0.0", "plugins/source/datadog": "4.2.6", "plugins/source/datadog+FILLER": "0.0.0", - "plugins/destination/bigquery": "3.3.11", + "plugins/destination/bigquery": "3.3.12", "plugins/destination/bigquery+FILLER": "0.0.0", "plugins/source/pagerduty": "3.1.2", "plugins/source/pagerduty+FILLER": "0.0.0", diff --git a/plugins/destination/bigquery/CHANGELOG.md b/plugins/destination/bigquery/CHANGELOG.md index d33f12066b33ac..e765b5a852d93a 100644 --- a/plugins/destination/bigquery/CHANGELOG.md +++ b/plugins/destination/bigquery/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [3.3.12](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v3.3.11...plugins-destination-bigquery-v3.3.12) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto digest to 995d672 ([#15910](https://github.com/cloudquery/cloudquery/issues/15910)) ([de15c6b](https://github.com/cloudquery/cloudquery/commit/de15c6b6129535f2022de6fec3f4c875dd897bad)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.3.11](https://github.com/cloudquery/cloudquery/compare/plugins-destination-bigquery-v3.3.10...plugins-destination-bigquery-v3.3.11) (2023-12-28) From 9e6d93d5e410b44bb7b0546cbb79ef2e8decf835 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:09:07 +0200 Subject: [PATCH 020/166] chore(main): Release plugins-destination-clickhouse v3.4.7 (#15866) :robot: I have created a release *beep* *boop* --- ## [3.4.7](https://github.com/cloudquery/cloudquery/compare/plugins-destination-clickhouse-v3.4.6...plugins-destination-clickhouse-v3.4.7) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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/clickhouse/CHANGELOG.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8c85f52724b5a8..8df442371a3104 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -67,7 +67,7 @@ "plugins/source/hubspot+FILLER": "0.0.0", "plugins/destination/elasticsearch": "3.1.11", "plugins/destination/elasticsearch+FILLER": "0.0.0", - "plugins/destination/clickhouse": "3.4.6", + "plugins/destination/clickhouse": "3.4.7", "plugins/destination/clickhouse+FILLER": "0.0.0", "plugins/source/postgresql": "3.0.7", "plugins/source/postgresql+FILLER": "0.0.0", diff --git a/plugins/destination/clickhouse/CHANGELOG.md b/plugins/destination/clickhouse/CHANGELOG.md index 2aea5489c3b3d7..6f226abe280203 100644 --- a/plugins/destination/clickhouse/CHANGELOG.md +++ b/plugins/destination/clickhouse/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [3.4.7](https://github.com/cloudquery/cloudquery/compare/plugins-destination-clickhouse-v3.4.6...plugins-destination-clickhouse-v3.4.7) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.4.6](https://github.com/cloudquery/cloudquery/compare/plugins-destination-clickhouse-v3.4.5...plugins-destination-clickhouse-v3.4.6) (2023-12-28) From 97f6b32bbd773027d36a83ff8dbfd49834f87ff0 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:12:22 +0200 Subject: [PATCH 021/166] chore: Update plugin `source-k8s` version to v5.2.5 (#15915) Updates the `source-k8s` plugin latest version to v5.2.5 --- website/versions/source-k8s.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-k8s.json b/website/versions/source-k8s.json index 9f9e95947f07de..7c8496c7f85e6e 100644 --- a/website/versions/source-k8s.json +++ b/website/versions/source-k8s.json @@ -1 +1 @@ -{ "latest": "plugins-source-k8s-v5.2.4" } +{ "latest": "plugins-source-k8s-v5.2.5" } From a633606ad1127d95dffdb4993c079bd5954493bb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:14:45 +0200 Subject: [PATCH 022/166] chore: Update Scaffold version to v2.1.21 (#15916) Updates Scaffold latest version to v2.1.21 --- website/versions/scaffold.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/scaffold.json b/website/versions/scaffold.json index 03d66a391920e0..b816747729fbb7 100644 --- a/website/versions/scaffold.json +++ b/website/versions/scaffold.json @@ -1 +1 @@ -{ "latest": "scaffold-v2.1.20" } +{ "latest": "scaffold-v2.1.21" } From 5815276bf44308934f4424d9b8ed7a75d744d849 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:19:05 +0200 Subject: [PATCH 023/166] chore: Update plugin `destination-gremlin` version to v2.2.18 (#15935) Updates the `destination-gremlin` plugin latest version to v2.2.18 --- website/versions/destination-gremlin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-gremlin.json b/website/versions/destination-gremlin.json index fc8700e04bffce..6e235c0722649c 100644 --- a/website/versions/destination-gremlin.json +++ b/website/versions/destination-gremlin.json @@ -1 +1 @@ -{ "latest": "plugins-destination-gremlin-v2.2.17" } +{ "latest": "plugins-destination-gremlin-v2.2.18" } From 15c5d2a033098787ffddeb7c4eab167cc7c9905f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:21:37 +0200 Subject: [PATCH 024/166] chore: Update plugin `destination-snowflake` version to v3.3.7 (#15936) Updates the `destination-snowflake` plugin latest version to v3.3.7 --- 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 31f6edee046d1d..bee1eef9cfb39e 100644 --- a/website/versions/destination-snowflake.json +++ b/website/versions/destination-snowflake.json @@ -1 +1 @@ -{ "latest": "plugins-destination-snowflake-v3.3.6" } +{ "latest": "plugins-destination-snowflake-v3.3.7" } From cdddcd9bbbc7d3d8a2caf6b5ad2eb98fcbc2a984 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:26:07 +0200 Subject: [PATCH 025/166] chore: Update plugin `source-alicloud` version to v4.0.18 (#15937) Updates the `source-alicloud` plugin latest version to v4.0.18 --- website/versions/source-alicloud.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-alicloud.json b/website/versions/source-alicloud.json index f47ce34a38ce82..8004830a234f4b 100644 --- a/website/versions/source-alicloud.json +++ b/website/versions/source-alicloud.json @@ -1 +1 @@ -{ "latest": "plugins-source-alicloud-v4.0.17" } +{ "latest": "plugins-source-alicloud-v4.0.18" } From e3adac41beecc3e93fac23dee15b53dc15c4c8cd Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:35:38 +0200 Subject: [PATCH 026/166] chore: Update plugin `source-okta` version to v3.2.16 (#15926) Updates the `source-okta` plugin latest version to v3.2.16 --- website/versions/source-okta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-okta.json b/website/versions/source-okta.json index a6c8aba989b42e..bf676c4d0270b8 100644 --- a/website/versions/source-okta.json +++ b/website/versions/source-okta.json @@ -1 +1 @@ -{ "latest": "plugins-source-okta-v3.2.15" } +{ "latest": "plugins-source-okta-v3.2.16" } From 48057bcb44443008d343133cce7e36c4901fa59d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:42:24 +0200 Subject: [PATCH 027/166] chore(main): Release plugins-destination-kafka v3.2.18 (#15873) :robot: I have created a release *beep* *boop* --- ## [3.2.18](https://github.com/cloudquery/cloudquery/compare/plugins-destination-kafka-v3.2.17...plugins-destination-kafka-v3.2.18) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) --- 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/kafka/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8df442371a3104..6e90d3679d536f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -49,7 +49,7 @@ "plugins/destination/azblob+FILLER": "0.0.0", "plugins/destination/neo4j": "5.0.4", "plugins/destination/neo4j+FILLER": "0.0.0", - "plugins/destination/kafka": "3.2.17", + "plugins/destination/kafka": "3.2.18", "plugins/destination/kafka+FILLER": "0.0.0", "plugins/source/hackernews": "3.0.19", "plugins/source/hackernews+FILLER": "0.0.0", diff --git a/plugins/destination/kafka/CHANGELOG.md b/plugins/destination/kafka/CHANGELOG.md index ca14ad4f41b130..e0e2899ff5ad2b 100644 --- a/plugins/destination/kafka/CHANGELOG.md +++ b/plugins/destination/kafka/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [3.2.18](https://github.com/cloudquery/cloudquery/compare/plugins-destination-kafka-v3.2.17...plugins-destination-kafka-v3.2.18) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/filetypes/v4 to v4.2.3 ([#15900](https://github.com/cloudquery/cloudquery/issues/15900)) ([500197f](https://github.com/cloudquery/cloudquery/commit/500197f536944546560ee8643852efa6524729f2)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) + ## [3.2.17](https://github.com/cloudquery/cloudquery/compare/plugins-destination-kafka-v3.2.16...plugins-destination-kafka-v3.2.17) (2023-12-28) From 37ee7278c12dc42ccc111e071c82bd1d38d6ecdd Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:44:53 +0200 Subject: [PATCH 028/166] chore: Update plugin `destination-s3` version to v4.8.6 (#15927) Updates the `destination-s3` plugin latest version to v4.8.6 --- website/versions/destination-s3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-s3.json b/website/versions/destination-s3.json index f6b0ee96bd87e9..2de55320ee8d6b 100644 --- a/website/versions/destination-s3.json +++ b/website/versions/destination-s3.json @@ -1 +1 @@ -{ "latest": "plugins-destination-s3-v4.8.5" } +{ "latest": "plugins-destination-s3-v4.8.6" } From 444cc35503b66de87b3b1b7d91a2b4df3a4f61a2 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:47:31 +0200 Subject: [PATCH 029/166] chore: Update plugin `destination-mongodb` version to v2.2.20 (#15928) Updates the `destination-mongodb` plugin latest version to v2.2.20 --- website/versions/destination-mongodb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-mongodb.json b/website/versions/destination-mongodb.json index c038d0d62bd474..3ea9862e9e1420 100644 --- a/website/versions/destination-mongodb.json +++ b/website/versions/destination-mongodb.json @@ -1 +1 @@ -{ "latest": "plugins-destination-mongodb-v2.2.19" } +{ "latest": "plugins-destination-mongodb-v2.2.20" } From e82db7c98315897329a6d44596aa25bc8f714c60 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:49:54 +0200 Subject: [PATCH 030/166] chore: Update plugin `destination-neo4j` version to v5.0.4 (#15929) Updates the `destination-neo4j` plugin latest version to v5.0.4 --- website/versions/destination-neo4j.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-neo4j.json b/website/versions/destination-neo4j.json index 8846c9ce914000..47504a92e05692 100644 --- a/website/versions/destination-neo4j.json +++ b/website/versions/destination-neo4j.json @@ -1 +1 @@ -{ "latest": "plugins-destination-neo4j-v5.0.3" } +{ "latest": "plugins-destination-neo4j-v5.0.4" } From b67b87be5df0fa4a6e0eab9abd9c2e98317957c3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:54:14 +0200 Subject: [PATCH 031/166] chore: Update plugin `destination-gcs` version to v3.4.15 (#15938) Updates the `destination-gcs` plugin latest version to v3.4.15 --- website/versions/destination-gcs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-gcs.json b/website/versions/destination-gcs.json index 2df2496e5f0901..26e838a6b73a8c 100644 --- a/website/versions/destination-gcs.json +++ b/website/versions/destination-gcs.json @@ -1 +1 @@ -{ "latest": "plugins-destination-gcs-v3.4.14" } +{ "latest": "plugins-destination-gcs-v3.4.15" } From 557886ca01b5561212cc1c44534b6afd61dac211 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:02:50 +0200 Subject: [PATCH 032/166] fix(deps): Update module github.com/cloudquery/filetypes/v4 to v4.2.4 (#15941) 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.3` -> `v4.2.4` | --- > [!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.4`](https://togithub.com/cloudquery/filetypes/releases/tag/v4.2.4) [Compare Source](https://togithub.com/cloudquery/filetypes/compare/v4.2.3...v4.2.4) ##### Bug Fixes - **deps:** Update github.com/apache/arrow/go/v15 digest to [`7c3480e`](https://togithub.com/cloudquery/filetypes/commit/7c3480e) ([#​391](https://togithub.com/cloudquery/filetypes/issues/391)) ([0805592](https://togithub.com/cloudquery/filetypes/commit/0805592d65d71aefba0d003dc9e7b1c31051a5c1)) - **deps:** Update github.com/gomarkdown/markdown digest to [`1d6d208`](https://togithub.com/cloudquery/filetypes/commit/1d6d208) ([#​392](https://togithub.com/cloudquery/filetypes/issues/392)) ([a36e87e](https://togithub.com/cloudquery/filetypes/commit/a36e87e2662768931d3e8e44cf0f746dba007c2e)) - **deps:** Update golang.org/x/exp digest to [`02704c9`](https://togithub.com/cloudquery/filetypes/commit/02704c9) ([#​394](https://togithub.com/cloudquery/filetypes/issues/394)) ([bbfddd0](https://togithub.com/cloudquery/filetypes/commit/bbfddd02dff3d17612b0354cfe819ad2340bb475)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`995d672`](https://togithub.com/cloudquery/filetypes/commit/995d672) ([#​395](https://togithub.com/cloudquery/filetypes/issues/395)) ([505e046](https://togithub.com/cloudquery/filetypes/commit/505e04608d4e7bca8a23090a2793674113f42d0e)) - **deps:** Update module github.com/klauspost/compress to v1.17.4 ([#​397](https://togithub.com/cloudquery/filetypes/issues/397)) ([3c5d0c0](https://togithub.com/cloudquery/filetypes/commit/3c5d0c02f4ed543c000195395bb9dd07551fbd25)) - **deps:** Update module github.com/labstack/echo/v4 to v4.11.4 ([#​398](https://togithub.com/cloudquery/filetypes/issues/398)) ([e226b95](https://togithub.com/cloudquery/filetypes/commit/e226b954363214ce52c86317edb902a0202c1aac))
--- ### 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 | 6 +++--- plugins/destination/azblob/go.sum | 12 ++++++------ plugins/destination/file/go.mod | 6 +++--- plugins/destination/file/go.sum | 12 ++++++------ plugins/destination/gcs/go.mod | 6 +++--- plugins/destination/gcs/go.sum | 12 ++++++------ plugins/destination/kafka/go.mod | 6 +++--- plugins/destination/kafka/go.sum | 12 ++++++------ plugins/destination/s3/go.mod | 6 +++--- plugins/destination/s3/go.sum | 12 ++++++------ 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 416c6bcccd7092..a6989ab266e5fe 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/filetypes/v4 v4.2.3 + github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 @@ -77,8 +77,8 @@ require ( github.com/klauspost/compress v1.17.4 // 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.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 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 0cd1de8c68dad2..e8ae4e61438f9b 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -65,8 +65,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/filetypes/v4 v4.2.3 h1:ixbKrIenlEQplbpGKDcTShXHwxLH0MVZiUSWOwfKCTU= -github.com/cloudquery/filetypes/v4 v4.2.3/go.mod h1:2VJ1cLxMfHxvC6Lu6PsruqtdF9PEDswFdANYkIhZ9Bg= +github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= +github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= @@ -191,10 +191,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -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= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 59e3d026c7f4c1..61c048f5462816 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/filetypes/v4 v4.2.3 + github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 @@ -70,8 +70,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 2f86e3c3891860..e17c3cf80dcd31 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -53,8 +53,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/filetypes/v4 v4.2.3 h1:ixbKrIenlEQplbpGKDcTShXHwxLH0MVZiUSWOwfKCTU= -github.com/cloudquery/filetypes/v4 v4.2.3/go.mod h1:2VJ1cLxMfHxvC6Lu6PsruqtdF9PEDswFdANYkIhZ9Bg= +github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= +github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= @@ -173,10 +173,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= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index bc083fd6873131..8a51e15d32579d 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( cloud.google.com/go/storage v1.30.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/filetypes/v4 v4.2.3 + github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -78,8 +78,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 786b228c579555..de808b60d79726 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -67,8 +67,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/filetypes/v4 v4.2.3 h1:ixbKrIenlEQplbpGKDcTShXHwxLH0MVZiUSWOwfKCTU= -github.com/cloudquery/filetypes/v4 v4.2.3/go.mod h1:2VJ1cLxMfHxvC6Lu6PsruqtdF9PEDswFdANYkIhZ9Bg= +github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= +github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= @@ -222,10 +222,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= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 3bd82551edc8b7..7289a9ebf02889 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/filetypes/v4 v4.2.3 + github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/rs/zerolog v1.31.0 ) @@ -80,8 +80,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 0b14318e1c98e6..3f381f25291067 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -57,8 +57,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/filetypes/v4 v4.2.3 h1:ixbKrIenlEQplbpGKDcTShXHwxLH0MVZiUSWOwfKCTU= -github.com/cloudquery/filetypes/v4 v4.2.3/go.mod h1:2VJ1cLxMfHxvC6Lu6PsruqtdF9PEDswFdANYkIhZ9Bg= +github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= +github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= @@ -206,10 +206,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= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 524b2610c3cb01..079eaebbf7d3d6 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.2 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 - github.com/cloudquery/filetypes/v4 v4.2.3 + github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 @@ -90,8 +90,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index ac834ae2c2b0aa..b0467e0b2e982d 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -91,8 +91,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/filetypes/v4 v4.2.3 h1:ixbKrIenlEQplbpGKDcTShXHwxLH0MVZiUSWOwfKCTU= -github.com/cloudquery/filetypes/v4 v4.2.3/go.mod h1:2VJ1cLxMfHxvC6Lu6PsruqtdF9PEDswFdANYkIhZ9Bg= +github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= +github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= @@ -215,10 +215,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= From 275d13b25bbcbb4ca40b932c1c4df3418885a871 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:05:21 +0200 Subject: [PATCH 033/166] chore: Update plugin `destination-meilisearch` version to v2.2.18 (#15942) Updates the `destination-meilisearch` plugin latest version to v2.2.18 --- website/versions/destination-meilisearch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-meilisearch.json b/website/versions/destination-meilisearch.json index 3513c8d32a8ba6..1f57607ef53580 100644 --- a/website/versions/destination-meilisearch.json +++ b/website/versions/destination-meilisearch.json @@ -1 +1 @@ -{ "latest": "plugins-destination-meilisearch-v2.2.17" } +{ "latest": "plugins-destination-meilisearch-v2.2.18" } From 1b14865608329b7eb68e82a7db43c7a5e3675d73 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:09:24 +0200 Subject: [PATCH 034/166] chore: Update plugin `destination-firehose` version to v2.2.16 (#15943) Updates the `destination-firehose` plugin latest version to v2.2.16 --- website/versions/destination-firehose.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-firehose.json b/website/versions/destination-firehose.json index 3b981aa6804299..127380b543e57c 100644 --- a/website/versions/destination-firehose.json +++ b/website/versions/destination-firehose.json @@ -1 +1 @@ -{ "latest": "plugins-destination-firehose-v2.2.15" } +{ "latest": "plugins-destination-firehose-v2.2.16" } From e0041004bd95b5944dc5cd638d1a6b671a78cd55 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:11:58 +0200 Subject: [PATCH 035/166] chore: Update CLI version to v4.4.0 (#15944) Updates the CLI latest version to v4.4.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 b5243b3d3cffc7..c372e68e72411b 100644 --- a/website/versions/cli.json +++ b/website/versions/cli.json @@ -1 +1 @@ -{ "latest": "cli-v4.3.6" } +{ "latest": "cli-v4.4.0" } From e6313f9ded633d9251749eb6f90e6719f36e62a2 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:14:34 +0200 Subject: [PATCH 036/166] chore: Update plugin `destination-elasticsearch` version to v3.1.11 (#15945) Updates the `destination-elasticsearch` plugin latest version to v3.1.11 --- website/versions/destination-elasticsearch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-elasticsearch.json b/website/versions/destination-elasticsearch.json index 062e38ea08c17d..b99087f808983e 100644 --- a/website/versions/destination-elasticsearch.json +++ b/website/versions/destination-elasticsearch.json @@ -1 +1 @@ -{ "latest": "plugins-destination-elasticsearch-v3.1.10" } +{ "latest": "plugins-destination-elasticsearch-v3.1.11" } From c164e42c54abb9d821726f57572fccca5325947d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:17:00 +0200 Subject: [PATCH 037/166] chore: Update plugin `destination-file` version to v3.4.15 (#15946) Updates the `destination-file` plugin latest version to v3.4.15 --- website/versions/destination-file.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-file.json b/website/versions/destination-file.json index 767546e9e53d3a..924330a921db6e 100644 --- a/website/versions/destination-file.json +++ b/website/versions/destination-file.json @@ -1 +1 @@ -{ "latest": "plugins-destination-file-v3.4.14" } +{ "latest": "plugins-destination-file-v3.4.15" } From e493c79aa90892d462dc87aefd1fefc8d806ba8f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:19:26 +0200 Subject: [PATCH 038/166] chore: Update plugin `destination-duckdb` version to v5.0.9 (#15947) Updates the `destination-duckdb` plugin latest version to v5.0.9 --- 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 e96a3a5a4f3a96..8a1411e03ae0ad 100644 --- a/website/versions/destination-duckdb.json +++ b/website/versions/destination-duckdb.json @@ -1 +1 @@ -{ "latest": "plugins-destination-duckdb-v5.0.8" } +{ "latest": "plugins-destination-duckdb-v5.0.9" } From f6ae69a9719db6207da570863e41745b59c726d5 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:24:18 +0200 Subject: [PATCH 039/166] fix(deps): Update dependency cloudquery-plugin-sdk to v0.1.11 (#15940) 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.10` -> `==0.1.11` | --- > [!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.11`](https://togithub.com/cloudquery/plugin-sdk-python/blob/HEAD/CHANGELOG.md#0111-2024-01-02) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-python/compare/v0.1.10...v0.1.11) ##### Bug Fixes - **deps:** Update dependency black to v23.12.1 ([#​103](https://togithub.com/cloudquery/plugin-sdk-python/issues/103)) ([abfd215](https://togithub.com/cloudquery/plugin-sdk-python/commit/abfd215f2be7fb63154d0cd7114ae9fbb19eaa73)) - **deps:** Update dependency cloudquery-plugin-pb to v0.0.21 ([#​111](https://togithub.com/cloudquery/plugin-sdk-python/issues/111)) ([94eadd1](https://togithub.com/cloudquery/plugin-sdk-python/commit/94eadd1041d036518812db4202022104a4200169)) - **deps:** Update dependency pyarrow to v14.0.2 ([#​104](https://togithub.com/cloudquery/plugin-sdk-python/issues/104)) ([3e16d15](https://togithub.com/cloudquery/plugin-sdk-python/commit/3e16d15f9b959b83ae12640d207bfa98f3c3a815)) - **deps:** Update dependency pytest to v7.4.4 ([#​106](https://togithub.com/cloudquery/plugin-sdk-python/issues/106)) ([230e6fd](https://togithub.com/cloudquery/plugin-sdk-python/commit/230e6fd72c122e2579886aa09f148535d486105d)) - **deps:** Update dependency structlog to v23.3.0 ([#​107](https://togithub.com/cloudquery/plugin-sdk-python/issues/107)) ([b210f6b](https://togithub.com/cloudquery/plugin-sdk-python/commit/b210f6b7d0a3c34746fbca236dbd449e26dccfb6)) - **deps:** Update dependency tzdata to v2023.4 ([#​108](https://togithub.com/cloudquery/plugin-sdk-python/issues/108)) ([870fd60](https://togithub.com/cloudquery/plugin-sdk-python/commit/870fd606a51fdc5ceb7a9b516a448e95bf5a56b2)) - **deps:** Update python Docker tag to v3.12 ([#​109](https://togithub.com/cloudquery/plugin-sdk-python/issues/109)) ([79f40a1](https://togithub.com/cloudquery/plugin-sdk-python/commit/79f40a1bc00df9c20e3635897361b990dbc9b0bb))
--- ### 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 | 8 ++++---- plugins/source/typeform/requirements.txt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/source/square/requirements.txt b/plugins/source/square/requirements.txt index 4677aaa75753e3..49faa67bc10046 100644 --- a/plugins/source/square/requirements.txt +++ b/plugins/source/square/requirements.txt @@ -1,5 +1,5 @@ -black==23.12.0 -cloudquery-plugin-sdk==0.1.10 -pyarrow==14.0.1 +black==23.12.1 +cloudquery-plugin-sdk==0.1.11 +pyarrow==14.0.2 squareup==29.0.0.20230720 -pytest==7.4.3 +pytest==7.4.4 diff --git a/plugins/source/typeform/requirements.txt b/plugins/source/typeform/requirements.txt index 4c78b2870103b4..3b4558ecfd442a 100644 --- a/plugins/source/typeform/requirements.txt +++ b/plugins/source/typeform/requirements.txt @@ -1,5 +1,5 @@ -cloudquery-plugin-sdk==0.1.10 -pyarrow==14.0.1 +cloudquery-plugin-sdk==0.1.11 +pyarrow==14.0.2 requests==2.31.0 -pytest==7.4.3 +pytest==7.4.4 pandas==2.1.4 From 2def2ef6268352fb7b229d55d27fd84f7e8bba1c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:31:03 +0200 Subject: [PATCH 040/166] fix(deps): Update module github.com/cloudquery/plugin-pb-go to v1.16.2 (#15948) 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.0` -> `v1.16.2` | --- > [!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.2`](https://togithub.com/cloudquery/plugin-pb-go/releases/tag/v1.16.2) [Compare Source](https://togithub.com/cloudquery/plugin-pb-go/compare/v1.16.1...v1.16.2) ##### Bug Fixes - Pass user team to Docker auth endpoint ([#​210](https://togithub.com/cloudquery/plugin-pb-go/issues/210)) ([452df35](https://togithub.com/cloudquery/plugin-pb-go/commit/452df351ae97086cf24a2820cf0388222b4ea1a0)) ### [`v1.16.1`](https://togithub.com/cloudquery/plugin-pb-go/releases/tag/v1.16.1) [Compare Source](https://togithub.com/cloudquery/plugin-pb-go/compare/v1.16.0...v1.16.1) ##### Bug Fixes - **deps:** Update github.com/apache/arrow/go/v15 digest to [`7c3480e`](https://togithub.com/cloudquery/plugin-pb-go/commit/7c3480e) ([#​201](https://togithub.com/cloudquery/plugin-pb-go/issues/201)) ([f65ee3f](https://togithub.com/cloudquery/plugin-pb-go/commit/f65ee3f21c9bdcc8de3f5207ca41de2c74ae129f)) - **deps:** Update github.com/gomarkdown/markdown digest to [`1d6d208`](https://togithub.com/cloudquery/plugin-pb-go/commit/1d6d208) ([#​202](https://togithub.com/cloudquery/plugin-pb-go/issues/202)) ([6b94635](https://togithub.com/cloudquery/plugin-pb-go/commit/6b94635dcca9eea00331592e27effbf8a04f6770)) - **deps:** Update golang.org/x/exp digest to [`02704c9`](https://togithub.com/cloudquery/plugin-pb-go/commit/02704c9) ([#​204](https://togithub.com/cloudquery/plugin-pb-go/issues/204)) ([3ed8cdb](https://togithub.com/cloudquery/plugin-pb-go/commit/3ed8cdbcf7dfc06889160e3b86c759cc80117aa1)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`995d672`](https://togithub.com/cloudquery/plugin-pb-go/commit/995d672) ([#​205](https://togithub.com/cloudquery/plugin-pb-go/issues/205)) ([30f8920](https://togithub.com/cloudquery/plugin-pb-go/commit/30f8920f8ecfa15c199937bc692e0ff782783ee7)) - **deps:** Update module github.com/klauspost/compress to v1.17.4 ([#​207](https://togithub.com/cloudquery/plugin-pb-go/issues/207)) ([5e6931b](https://togithub.com/cloudquery/plugin-pb-go/commit/5e6931b21a22c22e01785e828917a48edd5f3cd6)) - **deps:** Update module github.com/klauspost/cpuid/v2 to v2.2.6 ([#​208](https://togithub.com/cloudquery/plugin-pb-go/issues/208)) ([6e35a34](https://togithub.com/cloudquery/plugin-pb-go/commit/6e35a34bde571a1413cb18d1e6f2db53f1e7a721)) - **deps:** Update module github.com/labstack/echo/v4 to v4.11.4 ([#​209](https://togithub.com/cloudquery/plugin-pb-go/issues/209)) ([6a0579a](https://togithub.com/cloudquery/plugin-pb-go/commit/6a0579aaf5065f6654fde34b95f327ccaa75508f))
--- ### 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 | 6 +++--- cli/go.sum | 12 ++++++------ scaffold/cmd/templates/source/go.mod.tpl | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 01bc05316dab3c..abcc27575a4c74 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -7,7 +7,7 @@ require ( github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.3 - github.com/cloudquery/plugin-pb-go v1.16.0 + github.com/cloudquery/plugin-pb-go v1.16.2 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible @@ -82,8 +82,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 diff --git a/cli/go.sum b/cli/go.sum index 1ad2cd32897ca7..fb0a8a3850df67 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -60,8 +60,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/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/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.2 h1:Uj9cDsp/meAa7KEZglOFTHNIJDftmp7iUGj0ri1EUj4= +github.com/cloudquery/plugin-pb-go v1.16.2/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= github.com/cloudquery/plugin-sdk/v4 v4.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -214,10 +214,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= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index 3e11c3f5f216f5..374ef531f8e8d7 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.0 + github.com/cloudquery/plugin-pb-go v1.16.2 github.com/cloudquery/plugin-sdk/v4 v4.24.0 github.com/rs/zerolog v1.29.0 ) From 92dfc6d518e811c7f13f528e57ef2e7765a3c1e2 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:37:28 +0200 Subject: [PATCH 041/166] chore: Update plugin `destination-azblob` version to v3.4.16 (#15949) Updates the `destination-azblob` plugin latest version to v3.4.16 --- 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 fd434e86fea90a..81e161a7b8416a 100644 --- a/website/versions/destination-azblob.json +++ b/website/versions/destination-azblob.json @@ -1 +1 @@ -{ "latest": "plugins-destination-azblob-v3.4.15" } +{ "latest": "plugins-destination-azblob-v3.4.16" } From 3beadb8df72986840883b0e6e7cd23cdb96396f5 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:39:54 +0200 Subject: [PATCH 042/166] chore: Update plugin `destination-bigquery` version to v3.3.12 (#15950) Updates the `destination-bigquery` plugin latest version to v3.3.12 --- website/versions/destination-bigquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-bigquery.json b/website/versions/destination-bigquery.json index 52a5ede4137e43..e538104284c24d 100644 --- a/website/versions/destination-bigquery.json +++ b/website/versions/destination-bigquery.json @@ -1 +1 @@ -{ "latest": "plugins-destination-bigquery-v3.3.11" } +{ "latest": "plugins-destination-bigquery-v3.3.12" } From c197d812ed26e102faaa9ec8f3b4485ac22929b7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:42:20 +0200 Subject: [PATCH 043/166] chore: Update plugin `destination-clickhouse` version to v3.4.7 (#15951) Updates the `destination-clickhouse` plugin latest version to v3.4.7 --- website/versions/destination-clickhouse.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-clickhouse.json b/website/versions/destination-clickhouse.json index 091d1a22d820ac..c778463bf30d61 100644 --- a/website/versions/destination-clickhouse.json +++ b/website/versions/destination-clickhouse.json @@ -1 +1 @@ -{ "latest": "plugins-destination-clickhouse-v3.4.6" } +{ "latest": "plugins-destination-clickhouse-v3.4.7" } From 349d7778cadc1b49fd0837b2827835fc837d5580 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:44:51 +0200 Subject: [PATCH 044/166] chore: Update plugin `destination-kafka` version to v3.2.18 (#15953) Updates the `destination-kafka` plugin latest version to v3.2.18 --- website/versions/destination-kafka.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-kafka.json b/website/versions/destination-kafka.json index 887ec529a6f689..f2112a94b6e4cc 100644 --- a/website/versions/destination-kafka.json +++ b/website/versions/destination-kafka.json @@ -1 +1 @@ -{ "latest": "plugins-destination-kafka-v3.2.17" } +{ "latest": "plugins-destination-kafka-v3.2.18" } From 28c8da48c1bf6bcc3f84e5c3027e2672faa5fa6e Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Tue, 2 Jan 2024 17:08:06 +0000 Subject: [PATCH 045/166] doc: Add docs for instrumenting a paid plugin (#15964) --- .../developers/instrumenting-a-paid-plugin.md | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 website/pages/docs/developers/instrumenting-a-paid-plugin.md diff --git a/website/pages/docs/developers/instrumenting-a-paid-plugin.md b/website/pages/docs/developers/instrumenting-a-paid-plugin.md new file mode 100644 index 00000000000000..71d9905d119dcf --- /dev/null +++ b/website/pages/docs/developers/instrumenting-a-paid-plugin.md @@ -0,0 +1,102 @@ +--- +title: Instrumenting a Paid Plugin +description: Learn how to modify your plugin code to publish a paid (premium or open-core) plugin +--- + +# Instrumenting a Paid Plugin + +This page is aimed at plugin developers. CloudQuery plugins can be published as free, open-core or premium. In order for rows to be counted as paid in an open-core or premium plugin, you will need to add some additional instrumentation code. Instrumenting a paid plugin to check quotas and count the number of rows synced is relatively simple and can be done using the [`github.com/cloudquery/plugin-sdk/v4/premium`](http://github.com/cloudquery/plugin-sdk/v4/premium) package. + +## Steps + +1. Ensure that the plugin’s team, name and kind are passed in. For example: + + ```go + var ( + Name = "your-plugin-name" // TODO: replace with your plugin name + Kind = "source" // TODO: replace with your plugin kind (source / destination) + Team = "your-team-name" // TODO: replace with your team name + Version = "development" + ) + + func Plugin() *plugin.Plugin { + return plugin.NewPlugin( + Name, + Version, + Configure, + plugin.WithKind(Kind), + plugin.WithTeam(Team), + ) + } + ``` + +2. Inside `resources/plugin/client.go`, add `usage premium.UsageClient` to the `Client` struct. +3. Instantiate the `premium.UsageClient` inside `Configure`: + + ```go + uc, err := premium.NewUsageClient( + opts.PluginMeta, + premium.WithLogger(logger), + ) + if err != nil { + return nil, fmt.Errorf("failed to initialize usage client: %w", err) + } + + return &Client{ + // ... + usage: uc, + // ... + } + ``` + +4. Add the following methods to the `Client`: + + ```go + // 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 + } + if si, ok := msg.(*message.SyncInsert); ok { + 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 + } + ``` + +5. Inside the `Client` `Sync` method, create a new context using `premium.WithCancelOnQuotaExceeded`. This will do two things: 1. stop the sync from happening if the user has no remaining quota, and 2. periodically check that the user still has remaining quota, canceling the context if not. + + ```go + newCtx, err := premium.WithCancelOnQuotaExceeded(ctx, c.usage) + if err != nil { + return fmt.Errorf("failed to configure quota monitor: %w", err) + } + return c.scheduler.Sync(newCtx, schedulerClient, tt, res, scheduler.WithSyncDeterministicCQID(options.DeterministicCQID)) + ``` + + If there is a `stateClient` the above block should read: + + ```go + newCtx, err := premium.WithCancelOnQuotaExceeded(ctx, c.usage) + if err != nil { + return fmt.Errorf("failed to configure quota monitor: %w", err) + } + if err := c.scheduler.Sync(newCtx, schedulerClient, tt, res, scheduler.WithSyncDeterministicCQID(options.DeterministicCQID)); err != nil { + return fmt.Errorf("failed to sync: %w", err) + } + return stateClient.Flush(ctx) + ``` + +6. If all tables are paid: `return premium.MakeAllTablesPaid(tables)` in `getTables`. +If only some tables are paid: add `isPaid: true` to the relevant Table definitions. From 2292b5a2aa5936f2529238a05708de0b3bde9a35 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:19:49 +0200 Subject: [PATCH 046/166] fix(deps): Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 (#15932) 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.24.0` -> `v4.25.0` | --- > [!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.25.0`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.25.0) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.24.1...v4.25.0) ##### Features - Support multiple and/or specific plugin licenses ([#​1451](https://togithub.com/cloudquery/plugin-sdk/issues/1451)) ([993e352](https://togithub.com/cloudquery/plugin-sdk/commit/993e352dd2abbdfaa1ff5d6a3cc48c38457fa7f8)) ##### Bug Fixes - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.1 ([#​1454](https://togithub.com/cloudquery/plugin-sdk/issues/1454)) ([dc4afb6](https://togithub.com/cloudquery/plugin-sdk/commit/dc4afb6994c673623ff10539ba04fca34b9a02d8)) ### [`v4.24.1`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.24.1) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.24.0...v4.24.1) ##### Bug Fixes - **deps:** Update github.com/apache/arrow/go/v15 digest to [`7c3480e`](https://togithub.com/cloudquery/plugin-sdk/commit/7c3480e) ([#​1443](https://togithub.com/cloudquery/plugin-sdk/issues/1443)) ([bc8644f](https://togithub.com/cloudquery/plugin-sdk/commit/bc8644f40c11ab9d39d14e90d2cdb07d7b89898d)) - **deps:** Update github.com/gomarkdown/markdown digest to [`1d6d208`](https://togithub.com/cloudquery/plugin-sdk/commit/1d6d208) ([#​1445](https://togithub.com/cloudquery/plugin-sdk/issues/1445)) ([9a29286](https://togithub.com/cloudquery/plugin-sdk/commit/9a2928606c7f627ab7b5c74efdfc4b2d2484d98f)) - **deps:** Update golang.org/x/exp digest to [`02704c9`](https://togithub.com/cloudquery/plugin-sdk/commit/02704c9) ([#​1446](https://togithub.com/cloudquery/plugin-sdk/issues/1446)) ([496d59d](https://togithub.com/cloudquery/plugin-sdk/commit/496d59d34ef540d8a2b4a683f838938e3de3b239)) - **deps:** Update google.golang.org/genproto/googleapis/api digest to [`995d672`](https://togithub.com/cloudquery/plugin-sdk/commit/995d672) ([#​1447](https://togithub.com/cloudquery/plugin-sdk/issues/1447)) ([21771e7](https://togithub.com/cloudquery/plugin-sdk/commit/21771e759b0dba180c679e7221bad62a26466ce1)) - **deps:** Update google.golang.org/genproto/googleapis/rpc digest to [`995d672`](https://togithub.com/cloudquery/plugin-sdk/commit/995d672) ([#​1448](https://togithub.com/cloudquery/plugin-sdk/issues/1448)) ([2135e11](https://togithub.com/cloudquery/plugin-sdk/commit/2135e1105800bd65a57806cf8ed6c1a0283e0188)) - **deps:** Update module github.com/klauspost/compress to v1.17.4 ([#​1450](https://togithub.com/cloudquery/plugin-sdk/issues/1450)) ([04323d7](https://togithub.com/cloudquery/plugin-sdk/commit/04323d7f599f10693b072322eb6e6ec1714fa835))
--- ### 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 | 4 ++-- plugins/destination/azblob/go.sum | 8 ++++---- plugins/destination/bigquery/go.mod | 8 ++++---- plugins/destination/bigquery/go.sum | 16 ++++++++-------- plugins/destination/clickhouse/go.mod | 8 ++++---- plugins/destination/clickhouse/go.sum | 16 ++++++++-------- plugins/destination/duckdb/go.mod | 8 ++++---- plugins/destination/duckdb/go.sum | 16 ++++++++-------- plugins/destination/elasticsearch/go.mod | 8 ++++---- plugins/destination/elasticsearch/go.sum | 16 ++++++++-------- plugins/destination/file/go.mod | 4 ++-- plugins/destination/file/go.sum | 8 ++++---- plugins/destination/firehose/go.mod | 8 ++++---- plugins/destination/firehose/go.sum | 16 ++++++++-------- plugins/destination/gcs/go.mod | 4 ++-- plugins/destination/gcs/go.sum | 8 ++++---- plugins/destination/gremlin/go.mod | 8 ++++---- plugins/destination/gremlin/go.sum | 16 ++++++++-------- plugins/destination/kafka/go.mod | 4 ++-- plugins/destination/kafka/go.sum | 8 ++++---- plugins/destination/meilisearch/go.mod | 8 ++++---- plugins/destination/meilisearch/go.sum | 16 ++++++++-------- plugins/destination/mongodb/go.mod | 8 ++++---- plugins/destination/mongodb/go.sum | 16 ++++++++-------- plugins/destination/mssql/go.mod | 8 ++++---- plugins/destination/mssql/go.sum | 16 ++++++++-------- plugins/destination/mysql/go.mod | 8 ++++---- plugins/destination/mysql/go.sum | 16 ++++++++-------- plugins/destination/neo4j/go.mod | 8 ++++---- plugins/destination/neo4j/go.sum | 16 ++++++++-------- plugins/destination/postgresql/go.mod | 8 ++++---- plugins/destination/postgresql/go.sum | 16 ++++++++-------- plugins/destination/s3/go.mod | 4 ++-- plugins/destination/s3/go.sum | 8 ++++---- plugins/destination/snowflake/go.mod | 8 ++++---- plugins/destination/snowflake/go.sum | 16 ++++++++-------- plugins/destination/sqlite/go.mod | 8 ++++---- plugins/destination/sqlite/go.sum | 16 ++++++++-------- plugins/destination/test/go.mod | 8 ++++---- plugins/destination/test/go.sum | 16 ++++++++-------- plugins/source/alicloud/go.mod | 8 ++++---- plugins/source/alicloud/go.sum | 16 ++++++++-------- plugins/source/awspricing/go.mod | 8 ++++---- plugins/source/awspricing/go.sum | 16 ++++++++-------- plugins/source/cloudflare/go.mod | 8 ++++---- plugins/source/cloudflare/go.sum | 16 ++++++++-------- plugins/source/datadog/go.mod | 8 ++++---- plugins/source/datadog/go.sum | 16 ++++++++-------- plugins/source/digitalocean/go.mod | 8 ++++---- plugins/source/digitalocean/go.sum | 16 ++++++++-------- plugins/source/firestore/go.mod | 8 ++++---- plugins/source/firestore/go.sum | 16 ++++++++-------- plugins/source/github/go.mod | 8 ++++---- plugins/source/github/go.sum | 16 ++++++++-------- plugins/source/gitlab/go.mod | 8 ++++---- plugins/source/gitlab/go.sum | 16 ++++++++-------- plugins/source/hackernews/go.mod | 8 ++++---- plugins/source/hackernews/go.sum | 16 ++++++++-------- plugins/source/hubspot/go.mod | 8 ++++---- plugins/source/hubspot/go.sum | 16 ++++++++-------- plugins/source/k8s/go.mod | 8 ++++---- plugins/source/k8s/go.sum | 16 ++++++++-------- plugins/source/notion/go.mod | 8 ++++---- plugins/source/notion/go.sum | 16 ++++++++-------- plugins/source/okta/go.mod | 8 ++++---- plugins/source/okta/go.sum | 16 ++++++++-------- plugins/source/oracle/go.mod | 8 ++++---- plugins/source/oracle/go.sum | 16 ++++++++-------- plugins/source/pagerduty/go.mod | 8 ++++---- plugins/source/pagerduty/go.sum | 16 ++++++++-------- plugins/source/test/go.mod | 8 ++++---- plugins/source/test/go.sum | 16 ++++++++-------- scaffold/cmd/templates/source/go.mod.tpl | 2 +- 75 files changed, 406 insertions(+), 406 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index abcc27575a4c74..0e100c62f0fe60 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -8,7 +8,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.3 github.com/cloudquery/plugin-pb-go v1.16.2 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v24.0.7+incompatible diff --git a/cli/go.sum b/cli/go.sum index fb0a8a3850df67..d512fd343c71dc 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -62,8 +62,8 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= github.com/cloudquery/plugin-pb-go v1.16.2 h1:Uj9cDsp/meAa7KEZglOFTHNIJDftmp7iUGj0ri1EUj4= github.com/cloudquery/plugin-pb-go v1.16.2/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= -github.com/cloudquery/plugin-sdk/v4 v4.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index a6989ab266e5fe..a0f2ac4c39db96 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -37,7 +37,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index e8ae4e61438f9b..b96c81d4f1e9b3 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -69,12 +69,12 @@ github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNd github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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 eab416e4d0fdca..a60cf7acc16587 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.57.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 golang.org/x/sync v0.5.0 @@ -33,7 +33,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -66,8 +66,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index f4e1ae07b5a3b4..0f2089e32017b7 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -73,12 +73,12 @@ 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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -226,10 +226,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= diff --git a/plugins/destination/clickhouse/go.mod b/plugins/destination/clickhouse/go.mod index cba2b2df592b80..61b5a2b9cc7b6d 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -34,7 +34,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -72,8 +72,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 diff --git a/plugins/destination/clickhouse/go.sum b/plugins/destination/clickhouse/go.sum index 687d91f3562534..1e983eb7d80f8d 100644 --- a/plugins/destination/clickhouse/go.sum +++ b/plugins/destination/clickhouse/go.sum @@ -55,12 +55,12 @@ 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -179,10 +179,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= diff --git a/plugins/destination/duckdb/go.mod b/plugins/destination/duckdb/go.mod index a7560647ae6a42..08ec6ba4d49c3b 100644 --- a/plugins/destination/duckdb/go.mod +++ b/plugins/destination/duckdb/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/google/uuid v1.5.0 github.com/marcboeker/go-duckdb v1.5.6 github.com/rs/zerolog v1.31.0 @@ -28,7 +28,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -65,8 +65,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/duckdb/go.sum b/plugins/destination/duckdb/go.sum index f4e77aac982c36..228b53b77dace0 100644 --- a/plugins/destination/duckdb/go.sum +++ b/plugins/destination/duckdb/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -163,10 +163,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= diff --git a/plugins/destination/elasticsearch/go.mod b/plugins/destination/elasticsearch/go.mod index fb42a148af4ee7..cd90779e42ce7c 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-20231229025812-7c3480e2f028 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/elastic/go-elasticsearch/v8 v8.6.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -66,8 +66,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 diff --git a/plugins/destination/elasticsearch/go.sum b/plugins/destination/elasticsearch/go.sum index 3b9cd08a5eb12a..e2b45de132e88b 100644 --- a/plugins/destination/elasticsearch/go.sum +++ b/plugins/destination/elasticsearch/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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,10 +161,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= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 61c048f5462816..85abab91acc6bf 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -32,7 +32,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index e17c3cf80dcd31..9f7bbd3ada4ae6 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -57,12 +57,12 @@ github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNd github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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 93946e1c1708be..aa6b1f487f9c73 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.0 github.com/aws/aws-sdk-go-v2/config v1.26.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.23.1 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -40,7 +40,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -76,8 +76,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 diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index d8a03a507040d0..3ac6e2f931618c 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -71,12 +71,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -185,10 +185,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= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 8a51e15d32579d..f3b89588a20874 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go/storage v1.30.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -36,7 +36,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index de808b60d79726..a8c24a6cda02d3 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -71,12 +71,12 @@ github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNd github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index 445dda5cc368cc..fe2a3f04be1764 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.0 github.com/aws/aws-sdk-go-v2/config v1.26.2 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 ) @@ -39,7 +39,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -77,8 +77,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 diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index 2ee6241c99be78..005bb485bbd798 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -72,12 +72,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -186,10 +186,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= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 7289a9ebf02889..080ea3cf117f06 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -6,7 +6,7 @@ require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 ) @@ -30,7 +30,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 3f381f25291067..952b270322df71 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -61,12 +61,12 @@ github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNd github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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 7911d8c1e1ea6f..b5e51ccb218686 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/meilisearch/meilisearch-go v0.24.0 @@ -30,7 +30,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -67,8 +67,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 diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index d0061c84bce9a6..f3a88533e9701a 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -48,12 +48,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -168,10 +168,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= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 22076aec575fc8..43b7f4947a6d6a 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 go.mongodb.org/mongo-driver v1.12.1 @@ -26,7 +26,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -62,8 +62,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 diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 83bd86b7b5b834..411ace02521334 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -160,10 +160,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= diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index 62e6f3a9d3ba9b..674aef368993a8 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/microsoft/go-mssqldb v1.5.0 @@ -34,7 +34,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -74,8 +74,8 @@ require ( github.com/klauspost/compress v1.17.4 // 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.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 diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index 755beb7f3d4d93..9c278f07807760 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -59,12 +59,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -199,10 +199,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -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= diff --git a/plugins/destination/mysql/go.mod b/plugins/destination/mysql/go.mod index 5a1f5919ab033f..a791fcb4b57c29 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -27,7 +27,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -63,8 +63,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 diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index deffce982126cc..7805e732954e7d 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -158,10 +158,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= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 0a53f4b39a68b3..f597ba355a7b94 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/neo4j/neo4j-go-driver/v5 v5.6.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -26,7 +26,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -63,8 +63,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 diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 1438d7e61c7da6..35aad2a9f260f3 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -157,10 +157,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= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 212e98d896e7d7..e54d6112c83586 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 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 @@ -30,7 +30,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -71,8 +71,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 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index aefb32ed9c48e8..0c5b67a32a983a 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -173,10 +173,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= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 079eaebbf7d3d6..ce1e0f2c7c100c 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -51,7 +51,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index b0467e0b2e982d..a2a2bb5ffa6995 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -95,12 +95,12 @@ github.com/cloudquery/filetypes/v4 v4.2.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNd github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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 f96b4bfb50ead5..8a986a83d665bc 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/snowflakedb/gosnowflake v1.7.1 @@ -50,7 +50,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -93,8 +93,8 @@ require ( github.com/klauspost/asmfmt v1.3.2 // 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 diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 3b89ca80cdab1b..23e10e17fc8e7f 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -103,12 +103,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= @@ -240,10 +240,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -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= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 44b4b31d611b7a..917b1cb8da0ab0 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.31.0 ) @@ -25,7 +25,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -62,8 +62,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 diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index 976df8087903f2..d8f7cef1f38b7a 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -157,10 +157,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= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index 5928967b1ddd3e..7dab4865448122 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 ) @@ -24,7 +24,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -61,8 +61,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 diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index aad51f052a652f..e007403fc089d9 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -43,12 +43,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -157,10 +157,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= diff --git a/plugins/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index 5e68d108e7a264..8b4e7657d119ec 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/golang/mock v1.5.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.31.0 @@ -32,7 +32,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -72,8 +72,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 diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index cdb06038780856..fb19d8418a9ffd 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -63,12 +63,12 @@ github.com/cloudquery/cloudquery-api-go v1.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXs github.com/cloudquery/cloudquery-api-go v1.6.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/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -191,10 +191,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= diff --git a/plugins/source/awspricing/go.mod b/plugins/source/awspricing/go.mod index 0a30a95341f7b4..b952d4dc273b89 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.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 ) @@ -26,7 +26,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -64,8 +64,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 diff --git a/plugins/source/awspricing/go.sum b/plugins/source/awspricing/go.sum index d3fbc011a7626a..d3255d490e4bbc 100644 --- a/plugins/source/awspricing/go.sum +++ b/plugins/source/awspricing/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -163,10 +163,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= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index a27fe90f0664d2..632065b5e9c6c9 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudflare/cloudflare-go v0.84.0 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.31.0 github.com/thoas/go-funk v0.9.3 @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -70,8 +70,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 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 51eeb304ece543..e7beb68a93a968 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -49,12 +49,12 @@ github.com/cloudflare/cloudflare-go v0.84.0 h1:1jQPJfq3nPdjKF+oqjTOSRAWcTCA6u5fc github.com/cloudflare/cloudflare-go v0.84.0/go.mod h1:5pkAzpoWJYI5NekLZoRryQAcghYDhdbUxdcal1f7lu4= 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/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -175,10 +175,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= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index f980922d90c4d2..9d68f77d28dcc1 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/DataDog/datadog-api-client-go/v2 v2.17.0 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.31.0 @@ -33,7 +33,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -71,8 +71,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 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 04c8c6e8fb984a..613a291924c9b3 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -51,12 +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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -170,10 +170,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= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index ad05cd2281d24c..8348d43f8c734b 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.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 github.com/aws/smithy-go v1.19.0 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/digitalocean/godo v1.99.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 @@ -49,7 +49,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -88,8 +88,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 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 6a88e688051b1e..c7ccaa13e3ced3 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -85,12 +85,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -207,10 +207,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= diff --git a/plugins/source/firestore/go.mod b/plugins/source/firestore/go.mod index 0c12b42bb3edab..50e4e0f1afde8e 100644 --- a/plugins/source/firestore/go.mod +++ b/plugins/source/firestore/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( cloud.google.com/go/firestore v1.14.0 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 golang.org/x/sync v0.5.0 @@ -32,7 +32,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -73,8 +73,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 diff --git a/plugins/source/firestore/go.sum b/plugins/source/firestore/go.sum index e4f85b010e69f9..77f67c70d38379 100644 --- a/plugins/source/firestore/go.sum +++ b/plugins/source/firestore/go.sum @@ -57,12 +57,12 @@ 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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -204,10 +204,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= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index 56438a43a6ad16..0990f69bd89fc7 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-20231229025812-7c3480e2f028 github.com/beatlabs/github-auth v0.0.0-20231208231443-3b7665fb4bb8 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 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 @@ -32,7 +32,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -71,8 +71,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 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index a4fbcd66b7bb3b..a4b5c831ddc184 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -49,12 +49,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -173,10 +173,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= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index 37cd32929498d1..ad557480a57778 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 github.com/xanzy/go-gitlab v0.83.0 @@ -28,7 +28,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -70,8 +70,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 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index aa4c00e32bdd2c..3a3b4d0c34ab96 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -175,10 +175,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= diff --git a/plugins/source/hackernews/go.mod b/plugins/source/hackernews/go.mod index 61ede557f5520f..ee6dc7324cb025 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/golang/mock v1.6.0 github.com/hermanschaaf/hackernews v1.0.1 github.com/rs/zerolog v1.31.0 @@ -31,7 +31,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -69,8 +69,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 diff --git a/plugins/source/hackernews/go.sum b/plugins/source/hackernews/go.sum index 309376faf245b5..aecf58adba815a 100644 --- a/plugins/source/hackernews/go.sum +++ b/plugins/source/hackernews/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -167,10 +167,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= diff --git a/plugins/source/hubspot/go.mod b/plugins/source/hubspot/go.mod index df2f2e1ef9873a..be0885b361441d 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-20231229025812-7c3480e2f028 github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b golang.org/x/time v0.5.0 @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -67,8 +67,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 diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum index e90a1b4c815f72..9fce8c8dd6c558 100644 --- a/plugins/source/hubspot/go.sum +++ b/plugins/source/hubspot/go.sum @@ -49,12 +49,12 @@ github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 h1:pjhz1KktkBA github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126/go.mod h1:hedWyunNqr3OeTCQPjIMBjrJq/RImLOkIj37puh6oIE= 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/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -166,10 +166,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= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 10923e90818009..4a14e05f974379 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/golang/mock v1.6.0 github.com/google/gnostic v0.6.9 github.com/rs/zerolog v1.31.0 @@ -35,7 +35,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -81,8 +81,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 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 3aa85edc561623..9061f5db715ff2 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -59,12 +59,12 @@ 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -230,10 +230,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= diff --git a/plugins/source/notion/go.mod b/plugins/source/notion/go.mod index 50a418bf01a3a8..84a765efcf3e93 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.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 ) @@ -26,7 +26,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -64,8 +64,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 diff --git a/plugins/source/notion/go.sum b/plugins/source/notion/go.sum index d3fbc011a7626a..d3255d490e4bbc 100644 --- a/plugins/source/notion/go.sum +++ b/plugins/source/notion/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -163,10 +163,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= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index 01f69be923f4eb..bc73f6ace11184 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.2 github.com/rs/zerolog v1.31.0 @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -68,8 +68,8 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 // 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 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 5bed97a9ef543b..730e09f0ea4c6a 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -88,12 +88,12 @@ 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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -271,10 +271,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= diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index 295b8835d01575..20fd8c5bb5666f 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/oracle/oci-go-sdk/v65 v65.28.3 github.com/rs/zerolog v1.31.0 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -68,8 +68,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 diff --git a/plugins/source/oracle/go.sum b/plugins/source/oracle/go.sum index a33b3d705c29c8..cadf9ee898976f 100644 --- a/plugins/source/oracle/go.sum +++ b/plugins/source/oracle/go.sum @@ -51,12 +51,12 @@ 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.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -167,10 +167,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= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index 7dc3fb0e824837..0783d51f887745 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 @@ -29,7 +29,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -68,8 +68,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 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index b908fa505e0bd7..fb3430433a7768 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -51,12 +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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -174,10 +174,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= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index d0d76ea37eb760..fbce89e441dd90 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.31.0 ) @@ -26,7 +26,7 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.0 // indirect + github.com/cloudquery/plugin-pb-go v1.16.1 // 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 @@ -64,8 +64,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 diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index d3fbc011a7626a..d3255d490e4bbc 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -47,12 +47,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.0 h1:IoEIfskvZ07cTHnM5ma0KUVZtZSGtjXawZRH1nA5brQ= -github.com/cloudquery/plugin-pb-go v1.16.0/go.mod h1:p9qa3KC23payNjDiahMRh4f9Wu0uBPjDK8oHCqSp8eU= +github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= +github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.24.0 h1:H3+0fJAntI/8wSCpvLbXXgJVTSfnPTa1BFBbKcmT+gM= -github.com/cloudquery/plugin-sdk/v4 v4.24.0/go.mod h1:J0RFLvDx6ggzJ42uJaItron/uJX6+nCtHIQ7OUahpNc= +github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= +github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= 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= @@ -163,10 +163,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= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index 374ef531f8e8d7..9846215f2cfeaa 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.2 - github.com/cloudquery/plugin-sdk/v4 v4.24.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.29.0 ) From 76e5afc5905ddbe23b4ad06d0ff80c2ae33a30a7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:33:28 +0200 Subject: [PATCH 047/166] chore(deps): Update tj-actions/changed-files action to v40 [SECURITY] (#15965) 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 | |---|---|---|---| | [tj-actions/changed-files](https://togithub.com/tj-actions/changed-files) | action | major | `v39` -> `v40` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. ### GitHub Vulnerability Alerts #### [CVE-2023-51664](https://togithub.com/tj-actions/changed-files/security/advisories/GHSA-mcph-m25j-8j63) ### Summary The `tj-actions/changed-files` workflow allows for command injection in changed filenames, allowing an attacker to execute arbitrary code and potentially leak secrets. ### Details The [`changed-files`](https://togithub.com/tj-actions/changed-files) action returns a list of files changed in a commit or pull request which provides an `escape_json` input [enabled by default](https://togithub.com/tj-actions/changed-files/blob/94549999469dbfa032becf298d95c87a14c34394/action.yml#L136), only escapes `"` for JSON values. This could potentially allow filenames that contain special characters such as `;` and \` (backtick) which can be used by an attacker to take over the [GitHub Runner](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners) if the output value is used in a raw fashion (thus being directly replaced before execution) inside a `run` block. By running custom commands an attacker may be able to steal **secrets** such as `GITHUB_TOKEN` if triggered on other events than `pull_request`. For example on `push`. #### Proof of Concept 1. Submit a pull request to a repository with a new file injecting a command. For example `$(whoami).txt` which is a valid filename. 2. Upon approval of the workflow (triggered by the pull request), the action will get executed and the malicious pull request filename will flow into the `List all changed files` step below. ```yaml - name: List all changed files run: | for file in $; do echo "$file was changed" done ``` Example output: ```yaml ##[group]Run for file in $(whoami).txt; do for file in $(whoami).txt; do echo "$file was changed" done shell: /usr/bin/bash -e {0} ##[endgroup] runner.txt was changed ``` ### Impact This issue may lead to arbitrary command execution in the GitHub Runner. ### Resolution - A new `safe_output` input would be enabled by default and return filename paths escaping special characters like ;, ` (backtick), $, (), etc for bash environments. - A safe recommendation of using environment variables to store unsafe outputs. ```yaml - name: List all changed files env: ALL_CHANGED_FILES: $ run: | for file in "$ALL_CHANGED_FILES"; do echo "$file was changed" done ``` ### Resources * [Keeping your GitHub Actions and workflows secure Part 2: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input/) * [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) --- ### Release Notes
tj-actions/changed-files (tj-actions/changed-files) ### [`v40`](https://togithub.com/tj-actions/changed-files/releases/tag/v40) [Compare Source](https://togithub.com/tj-actions/changed-files/compare/v39...v40) ### Changes in v40.2.3 #### What's Changed - Upgraded to v40.2.2 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1787](https://togithub.com/tj-actions/changed-files/pull/1787) - chore(deps): update dependency prettier to v3.1.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1788](https://togithub.com/tj-actions/changed-files/pull/1788) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1789](https://togithub.com/tj-actions/changed-files/pull/1789) - chore(deps): update typescript-eslint monorepo to v6.14.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1790](https://togithub.com/tj-actions/changed-files/pull/1790) - chore(deps): update github/codeql-action action to v3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1792](https://togithub.com/tj-actions/changed-files/pull/1792) - chore(deps): update actions/download-artifact action to v4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1793](https://togithub.com/tj-actions/changed-files/pull/1793) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1795](https://togithub.com/tj-actions/changed-files/pull/1795) - chore(deps): update dependency eslint to v8.56.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1796](https://togithub.com/tj-actions/changed-files/pull/1796) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.5 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1797](https://togithub.com/tj-actions/changed-files/pull/1797) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1798](https://togithub.com/tj-actions/changed-files/pull/1798) - chore(deps): update actions/setup-node action to v4.0.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1799](https://togithub.com/tj-actions/changed-files/pull/1799) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.2.3 *** ### Changes in v40.2.2 #### What's Changed - Upgraded to v40.2.1 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1771](https://togithub.com/tj-actions/changed-files/pull/1771) - chore(deps): update typescript-eslint monorepo to v6.13.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1772](https://togithub.com/tj-actions/changed-files/pull/1772) - chore: Create SECURITY.md by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1773](https://togithub.com/tj-actions/changed-files/pull/1773) - chore: Update package.json by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1774](https://togithub.com/tj-actions/changed-files/pull/1774) - chore(deps-dev): bump [@​types/jest](https://togithub.com/types/jest) from 29.5.10 to 29.5.11 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1775](https://togithub.com/tj-actions/changed-files/pull/1775) - chore(deps): update dependency typescript to v5.3.3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1777](https://togithub.com/tj-actions/changed-files/pull/1777) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1778](https://togithub.com/tj-actions/changed-files/pull/1778) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1779](https://togithub.com/tj-actions/changed-files/pull/1779) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1781](https://togithub.com/tj-actions/changed-files/pull/1781) - chore(deps): bump tj-actions/branch-names from 7 to 8 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1782](https://togithub.com/tj-actions/changed-files/pull/1782) - docs: add rodrigorfk as a contributor for code, test, and bug by [@​allcontributors](https://togithub.com/allcontributors) in [https://github.com/tj-actions/changed-files/pull/1785](https://togithub.com/tj-actions/changed-files/pull/1785) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1786](https://togithub.com/tj-actions/changed-files/pull/1786) - fix: bug recovering deleted files for submodules by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1784](https://togithub.com/tj-actions/changed-files/pull/1784) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.2.2 *** ### Changes in v40.2.1 #### What's Changed - Upgraded to v40.2.0 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1746](https://togithub.com/tj-actions/changed-files/pull/1746) - chore: update README.md by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1749](https://togithub.com/tj-actions/changed-files/pull/1749) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1750](https://togithub.com/tj-actions/changed-files/pull/1750) - chore(deps): update typescript-eslint monorepo to v6.13.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1751](https://togithub.com/tj-actions/changed-files/pull/1751) - chore(deps): update typescript-eslint monorepo to v6.13.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1753](https://togithub.com/tj-actions/changed-files/pull/1753) - chore: remove unused job by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1754](https://togithub.com/tj-actions/changed-files/pull/1754) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1755](https://togithub.com/tj-actions/changed-files/pull/1755) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1757](https://togithub.com/tj-actions/changed-files/pull/1757) - security: remove usage of pull_request_target event from test.yml by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1758](https://togithub.com/tj-actions/changed-files/pull/1758) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1761](https://togithub.com/tj-actions/changed-files/pull/1761) - test: verify bug writing outputs when files_yaml is used by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1762](https://togithub.com/tj-actions/changed-files/pull/1762) - security: Update test.yml removing pull_request_review event by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1763](https://togithub.com/tj-actions/changed-files/pull/1763) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1764](https://togithub.com/tj-actions/changed-files/pull/1764) - chore(deps): update dependency eslint to v8.55.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1765](https://togithub.com/tj-actions/changed-files/pull/1765) - chore(deps): update dependency eslint-config-prettier to v9.1.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1766](https://togithub.com/tj-actions/changed-files/pull/1766) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1767](https://togithub.com/tj-actions/changed-files/pull/1767) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1769](https://togithub.com/tj-actions/changed-files/pull/1769) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.3 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1768](https://togithub.com/tj-actions/changed-files/pull/1768) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1770](https://togithub.com/tj-actions/changed-files/pull/1770) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.2.1 *** ### Changes in v40.2.0 #### What's Changed - Upgraded to v40.1.1 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1704](https://togithub.com/tj-actions/changed-files/pull/1704) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1706](https://togithub.com/tj-actions/changed-files/pull/1706) - chore(deps): update dependency prettier to v3.1.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1707](https://togithub.com/tj-actions/changed-files/pull/1707) - chore(deps): update typescript-eslint monorepo to v6.11.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1708](https://togithub.com/tj-actions/changed-files/pull/1708) - chore: Update update-readme.yml by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1709](https://togithub.com/tj-actions/changed-files/pull/1709) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1710](https://togithub.com/tj-actions/changed-files/pull/1710) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1711](https://togithub.com/tj-actions/changed-files/pull/1711) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1712](https://togithub.com/tj-actions/changed-files/pull/1712) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1713](https://togithub.com/tj-actions/changed-files/pull/1713) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1714](https://togithub.com/tj-actions/changed-files/pull/1714) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.9.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1715](https://togithub.com/tj-actions/changed-files/pull/1715) - chore(deps): update dependency eslint to v8.54.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1716](https://togithub.com/tj-actions/changed-files/pull/1716) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.9.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1717](https://togithub.com/tj-actions/changed-files/pull/1717) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1720](https://togithub.com/tj-actions/changed-files/pull/1720) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1721](https://togithub.com/tj-actions/changed-files/pull/1721) - chore: simplify matrix example workflow by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1719](https://togithub.com/tj-actions/changed-files/pull/1719) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1722](https://togithub.com/tj-actions/changed-files/pull/1722) - chore(deps): update typescript-eslint monorepo to v6.12.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1723](https://togithub.com/tj-actions/changed-files/pull/1723) - chore(deps): update dependency typescript to v5.3.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1724](https://togithub.com/tj-actions/changed-files/pull/1724) - Bump [@​types/node](https://togithub.com/types/node) from 20.9.2 to 20.9.3 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1725](https://togithub.com/tj-actions/changed-files/pull/1725) - chore(deps): update dependency [@​types/jest](https://togithub.com/types/jest) to v29.5.9 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1729](https://togithub.com/tj-actions/changed-files/pull/1729) - chore(deps): update dependency [@​types/micromatch](https://togithub.com/types/micromatch) to v4.0.6 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1731](https://togithub.com/tj-actions/changed-files/pull/1731) - chore(deps): update dependency [@​types/lodash](https://togithub.com/types/lodash) to v4.14.202 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1730](https://togithub.com/tj-actions/changed-files/pull/1730) - Bump [@​types/lodash](https://togithub.com/types/lodash) from 4.14.201 to 4.14.202 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1728](https://togithub.com/tj-actions/changed-files/pull/1728) - Bump [@​types/micromatch](https://togithub.com/types/micromatch) from 4.0.5 to 4.0.6 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1727](https://togithub.com/tj-actions/changed-files/pull/1727) - Bump [@​types/jest](https://togithub.com/types/jest) from 29.5.8 to 29.5.9 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1726](https://togithub.com/tj-actions/changed-files/pull/1726) - Bump [@​types/node](https://togithub.com/types/node) from 20.9.3 to 20.9.4 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1732](https://togithub.com/tj-actions/changed-files/pull/1732) - chore(deps): update dependency [@​types/jest](https://togithub.com/types/jest) to v29.5.10 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1734](https://togithub.com/tj-actions/changed-files/pull/1734) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.9.5 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1736](https://togithub.com/tj-actions/changed-files/pull/1736) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.10.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1737](https://togithub.com/tj-actions/changed-files/pull/1737) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1743](https://togithub.com/tj-actions/changed-files/pull/1743) - feat: add support for passing branch name to the base_sha and sha inputs by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1742](https://togithub.com/tj-actions/changed-files/pull/1742) - fix: prevent similar commit hashes error when using the branch name by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1744](https://togithub.com/tj-actions/changed-files/pull/1744) - fix: prevent similar commit hashes error when using the branch name by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1745](https://togithub.com/tj-actions/changed-files/pull/1745) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.2.0 *** ### Changes in v40.1.1 #### What's Changed - Upgraded to v40.1.0 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1695](https://togithub.com/tj-actions/changed-files/pull/1695) - chore(deps): update dependency eslint to v8.53.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1696](https://togithub.com/tj-actions/changed-files/pull/1696) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1697](https://togithub.com/tj-actions/changed-files/pull/1697) - chore(deps): update typescript-eslint monorepo to v6.10.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1698](https://togithub.com/tj-actions/changed-files/pull/1698) - chore(deps): update dependency [@​types/jest](https://togithub.com/types/jest) to v29.5.8 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1699](https://togithub.com/tj-actions/changed-files/pull/1699) - chore(deps): update dependency [@​types/uuid](https://togithub.com/types/uuid) to v9.0.7 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1702](https://togithub.com/tj-actions/changed-files/pull/1702) - chore(deps): update dependency [@​types/micromatch](https://togithub.com/types/micromatch) to v4.0.5 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1701](https://togithub.com/tj-actions/changed-files/pull/1701) - chore(deps): update dependency [@​types/lodash](https://togithub.com/types/lodash) to v4.14.201 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1700](https://togithub.com/tj-actions/changed-files/pull/1700) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.9.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1703](https://togithub.com/tj-actions/changed-files/pull/1703) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.1.1 *** ### Changes in v40.1.0 #### What's Changed - Upgraded to v40.0.2 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1689](https://togithub.com/tj-actions/changed-files/pull/1689) - fix(deps): update dependency yaml to v2.3.4 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1691](https://togithub.com/tj-actions/changed-files/pull/1691) - feat: add support for controlling the pattern order by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1693](https://togithub.com/tj-actions/changed-files/pull/1693) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1694](https://togithub.com/tj-actions/changed-files/pull/1694) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.1.0 *** ### Changes in v40.0.2 #### What's Changed - Upgraded to v40.0.1 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1686](https://togithub.com/tj-actions/changed-files/pull/1686) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.8.10 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1687](https://togithub.com/tj-actions/changed-files/pull/1687) - fix: order of file patterns by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1688](https://togithub.com/tj-actions/changed-files/pull/1688) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.0.2 *** ### Changes in v40.0.1 #### What's Changed - Upgraded to v40 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1672](https://togithub.com/tj-actions/changed-files/pull/1672) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1673](https://togithub.com/tj-actions/changed-files/pull/1673) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1675](https://togithub.com/tj-actions/changed-files/pull/1675) - chore(deps): update dependency eslint-plugin-jest to v27.5.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1674](https://togithub.com/tj-actions/changed-files/pull/1674) - chore(deps): update dependency eslint-plugin-jest to v27.6.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1676](https://togithub.com/tj-actions/changed-files/pull/1676) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1677](https://togithub.com/tj-actions/changed-files/pull/1677) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1678](https://togithub.com/tj-actions/changed-files/pull/1678) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1680](https://togithub.com/tj-actions/changed-files/pull/1680) - chore(deps): update dependency [@​typescript-eslint/parser](https://togithub.com/typescript-eslint/parser) to v6.9.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1682](https://togithub.com/tj-actions/changed-files/pull/1682) - chore(deps): update dependency [@​typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin) to v6.9.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1683](https://togithub.com/tj-actions/changed-files/pull/1683) - fix: bug with order in which the files and files ignore patterns are combined by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1684](https://togithub.com/tj-actions/changed-files/pull/1684) - chore(deps): update dependency [@​types/jest](https://togithub.com/types/jest) to v29.5.7 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1685](https://togithub.com/tj-actions/changed-files/pull/1685) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v40.0.1 *** ### Changes in v40.0.0 #### 🔥 🔥 Breaking Change 🔥 🔥 - Directory patterns now require explicit specification of the globstar pattern to match all sub paths. ##### ```diff ... - name: Get specific changed files id: changed-files-specific uses: tj-actions/changed-files@v40 with: files: | - dir + dir/** ``` #### What's Changed - Upgraded to v39.2.4 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1664](https://togithub.com/tj-actions/changed-files/pull/1664) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1665](https://togithub.com/tj-actions/changed-files/pull/1665) - Bump [@​types/node](https://togithub.com/types/node) from 20.8.7 to 20.8.8 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/tj-actions/changed-files/pull/1666](https://togithub.com/tj-actions/changed-files/pull/1666) - chore(deps): update dependency [@​types/node](https://togithub.com/types/node) to v20.8.9 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1668](https://togithub.com/tj-actions/changed-files/pull/1668) - remove: appending globstar pattern for directories to prevent bugs with path matching by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1670](https://togithub.com/tj-actions/changed-files/pull/1670) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1671](https://togithub.com/tj-actions/changed-files/pull/1671) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v39...v40.0.0 ***
--- ### 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/wait_for_required_workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wait_for_required_workflows.yml b/.github/workflows/wait_for_required_workflows.yml index 4dbafa39326700..a92b19f2bd116f 100644 --- a/.github/workflows/wait_for_required_workflows.yml +++ b/.github/workflows/wait_for_required_workflows.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v39 + uses: tj-actions/changed-files@v40 - uses: actions/github-script@v6 env: FILES: ${{ steps.changed-files.outputs.all_modified_files }} From e8d06c3da08abc4189b60b9803ca4c643f9b39b8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:35:29 +0200 Subject: [PATCH 048/166] chore(main): Release plugins-source-firestore v3.0.19 (#15889) :robot: I have created a release *beep* *boop* --- ## [3.0.19](https://github.com/cloudquery/cloudquery/compare/plugins-source-firestore-v3.0.18...plugins-source-firestore-v3.0.19) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto digest to 995d672 ([#15910](https://github.com/cloudquery/cloudquery/issues/15910)) ([de15c6b](https://github.com/cloudquery/cloudquery/commit/de15c6b6129535f2022de6fec3f4c875dd897bad)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/firestore/CHANGELOG.md | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 6e90d3679d536f..9a85372254e7c8 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -87,7 +87,7 @@ "plugins/destination/gremlin+FILLER": "0.0.0", "plugins/destination/meilisearch": "2.2.18", "plugins/destination/meilisearch+FILLER": "1.0.0", - "plugins/source/firestore": "3.0.18", + "plugins/source/firestore": "3.0.19", "plugins/source/firestore+FILLER": "0.0.0", "plugins/source/oracledb": "3.0.12", "plugins/source/oracledb+FILLER": "0.0.0", diff --git a/plugins/source/firestore/CHANGELOG.md b/plugins/source/firestore/CHANGELOG.md index 8e0a2facf834d7..b38dab750f4ac0 100644 --- a/plugins/source/firestore/CHANGELOG.md +++ b/plugins/source/firestore/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [3.0.19](https://github.com/cloudquery/cloudquery/compare/plugins-source-firestore-v3.0.18...plugins-source-firestore-v3.0.19) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto digest to 995d672 ([#15910](https://github.com/cloudquery/cloudquery/issues/15910)) ([de15c6b](https://github.com/cloudquery/cloudquery/commit/de15c6b6129535f2022de6fec3f4c875dd897bad)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [3.0.18](https://github.com/cloudquery/cloudquery/compare/plugins-source-firestore-v3.0.17...plugins-source-firestore-v3.0.18) (2023-12-28) From c60ddc749c2fede2670b29b031abe8e4c64ec6be Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:37:53 +0200 Subject: [PATCH 049/166] chore(main): Release plugins-source-oracle v4.2.6 (#15897) :robot: I have created a release *beep* *boop* --- ## [4.2.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.5...plugins-source-oracle-v4.2.6) (2024-01-02) ### Bug Fixes * **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) * **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) * **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) * **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/oracle/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 9a85372254e7c8..b2931477feda84 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -55,7 +55,7 @@ "plugins/source/hackernews+FILLER": "0.0.0", "scaffold": "2.1.21", "scaffold+FILLER": "0.0.0", - "plugins/source/oracle": "4.2.5", + "plugins/source/oracle": "4.2.6", "plugins/source/oracle+FILLER": "0.0.0", "plugins/source/alicloud": "4.0.18", "plugins/source/alicloud+FILLER": "0.0.0", diff --git a/plugins/source/oracle/CHANGELOG.md b/plugins/source/oracle/CHANGELOG.md index d35d740c23fe61..e3832424e353c9 100644 --- a/plugins/source/oracle/CHANGELOG.md +++ b/plugins/source/oracle/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [4.2.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.5...plugins-source-oracle-v4.2.6) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update github.com/apache/arrow/go/v15 digest to 7c3480e ([#15904](https://github.com/cloudquery/cloudquery/issues/15904)) ([a3ec012](https://github.com/cloudquery/cloudquery/commit/a3ec01203183e5c94630beae86434519e87e225d)) +* **deps:** Update github.com/gomarkdown/markdown digest to 1d6d208 ([#15907](https://github.com/cloudquery/cloudquery/issues/15907)) ([86d29a9](https://github.com/cloudquery/cloudquery/commit/86d29a900e6c9dbcad09f5b0c4b0615aee59a2ae)) +* **deps:** Update golang.org/x/exp digest to 02704c9 ([#15909](https://github.com/cloudquery/cloudquery/issues/15909)) ([dfe32d2](https://github.com/cloudquery/cloudquery/commit/dfe32d2557dcac0fb6dc741c9df4edccdcb07076)) +* **deps:** Update google.golang.org/genproto/googleapis/api digest to 995d672 ([#15911](https://github.com/cloudquery/cloudquery/issues/15911)) ([18ac2b8](https://github.com/cloudquery/cloudquery/commit/18ac2b806d798e0a9052cc10e8442557ab1c4253)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.24.0 ([#15863](https://github.com/cloudquery/cloudquery/issues/15863)) ([47d7899](https://github.com/cloudquery/cloudquery/commit/47d78994370f083912b6d4329f12d5cef9c255d5)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [4.2.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.4...plugins-source-oracle-v4.2.5) (2023-12-28) From 6c39c20d41c4f2e38ba0064c3e08366bd05c1b65 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:03:59 +0200 Subject: [PATCH 050/166] chore: Update plugin `source-firestore` version to v3.0.19 (#15995) Updates the `source-firestore` plugin latest version to v3.0.19 --- website/versions/source-firestore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-firestore.json b/website/versions/source-firestore.json index ff4a9cf0ae97f1..017b627f9dd2bb 100644 --- a/website/versions/source-firestore.json +++ b/website/versions/source-firestore.json @@ -1 +1 @@ -{ "latest": "plugins-source-firestore-v3.0.18" } +{ "latest": "plugins-source-firestore-v3.0.19" } From 6f4f56f7ff12bf90b4849831b687fb263aaf5871 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 20:09:11 +0200 Subject: [PATCH 051/166] chore: Update plugin `source-oracle` version to v4.2.6 (#15996) Updates the `source-oracle` plugin latest version to v4.2.6 --- website/versions/source-oracle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-oracle.json b/website/versions/source-oracle.json index 24238077e78fc0..f02275c9cd67b2 100644 --- a/website/versions/source-oracle.json +++ b/website/versions/source-oracle.json @@ -1 +1 @@ -{ "latest": "plugins-source-oracle-v4.2.5" } +{ "latest": "plugins-source-oracle-v4.2.6" } From b217fd4b60f6f4dc7fa3464d3dd7e182dc6356ef Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 2 Jan 2024 21:46:56 +0200 Subject: [PATCH 052/166] fix(deps): Update tj-actions/changed-files action to v41 [SECURITY] (#15997) 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 | |---|---|---|---| | [tj-actions/changed-files](https://togithub.com/tj-actions/changed-files) | action | major | `v40` -> `v41` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. ### GitHub Vulnerability Alerts #### [CVE-2023-51664](https://togithub.com/tj-actions/changed-files/security/advisories/GHSA-mcph-m25j-8j63) ### Summary The `tj-actions/changed-files` workflow allows for command injection in changed filenames, allowing an attacker to execute arbitrary code and potentially leak secrets. ### Details The [`changed-files`](https://togithub.com/tj-actions/changed-files) action returns a list of files changed in a commit or pull request which provides an `escape_json` input [enabled by default](https://togithub.com/tj-actions/changed-files/blob/94549999469dbfa032becf298d95c87a14c34394/action.yml#L136), only escapes `"` for JSON values. This could potentially allow filenames that contain special characters such as `;` and \` (backtick) which can be used by an attacker to take over the [GitHub Runner](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners) if the output value is used in a raw fashion (thus being directly replaced before execution) inside a `run` block. By running custom commands an attacker may be able to steal **secrets** such as `GITHUB_TOKEN` if triggered on other events than `pull_request`. For example on `push`. #### Proof of Concept 1. Submit a pull request to a repository with a new file injecting a command. For example `$(whoami).txt` which is a valid filename. 2. Upon approval of the workflow (triggered by the pull request), the action will get executed and the malicious pull request filename will flow into the `List all changed files` step below. ```yaml - name: List all changed files run: | for file in $; do echo "$file was changed" done ``` Example output: ```yaml ##[group]Run for file in $(whoami).txt; do for file in $(whoami).txt; do echo "$file was changed" done shell: /usr/bin/bash -e {0} ##[endgroup] runner.txt was changed ``` ### Impact This issue may lead to arbitrary command execution in the GitHub Runner. ### Resolution - A new `safe_output` input would be enabled by default and return filename paths escaping special characters like ;, ` (backtick), $, (), etc for bash environments. - A safe recommendation of using environment variables to store unsafe outputs. ```yaml - name: List all changed files env: ALL_CHANGED_FILES: $ run: | for file in "$ALL_CHANGED_FILES"; do echo "$file was changed" done ``` ### Resources * [Keeping your GitHub Actions and workflows secure Part 2: Untrusted input](https://securitylab.github.com/research/github-actions-untrusted-input/) * [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) --- ### Release Notes
tj-actions/changed-files (tj-actions/changed-files) ### [`v41`](https://togithub.com/tj-actions/changed-files/releases/tag/v41) [Compare Source](https://togithub.com/tj-actions/changed-files/compare/v40...v41) ### Changes in v41.0.1 #### What's Changed - Upgraded to v41 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1811](https://togithub.com/tj-actions/changed-files/pull/1811) - chore(deps): update dependency eslint-plugin-prettier to v5.1.2 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1813](https://togithub.com/tj-actions/changed-files/pull/1813) - fix: update characters escaped by safe output by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1815](https://togithub.com/tj-actions/changed-files/pull/1815) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v41...v41.0.1 *** ### Changes in v41.0.0 #### 🔥 🔥 BREAKING CHANGE 🔥 🔥 A new `safe_output` input is now available to prevent outputting unsafe filename characters (Enabled by default). This would escape characters in the filename that could be used for command injection. > \[!NOTE] > This can be disabled by setting the `safe_output` to false this comes with a recommendation to store all outputs generated in an environment variable first before using them. ##### Example ```yaml ... - name: Get changed files id: changed-files uses: tj-actions/changed-files@v40 with: safe_output: false # set to false because we are using an environment variable to store the output and avoid command injection. - name: List all added files env: ADDED_FILES: ${{ steps.changed-files.outputs.added_files }} run: | for file in "$ADDED_FILES"; do echo "$file was added" done ... ``` #### What's Changed - chore(deps): update typescript-eslint monorepo to v6.15.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1801](https://togithub.com/tj-actions/changed-files/pull/1801) - Upgraded to v40.2.3 by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1800](https://togithub.com/tj-actions/changed-files/pull/1800) - chore(deps): update dependency eslint-plugin-prettier to v5.1.0 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1802](https://togithub.com/tj-actions/changed-files/pull/1802) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1803](https://togithub.com/tj-actions/changed-files/pull/1803) - chore(deps): update dependency eslint-plugin-prettier to v5.1.1 by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1804](https://togithub.com/tj-actions/changed-files/pull/1804) - fix: update safe output regex and the docs by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1805](https://togithub.com/tj-actions/changed-files/pull/1805) - Revert "chore(deps): update actions/download-artifact action to v4" by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1806](https://togithub.com/tj-actions/changed-files/pull/1806) - Update README.md by [@​jackton1](https://togithub.com/jackton1) in [https://github.com/tj-actions/changed-files/pull/1808](https://togithub.com/tj-actions/changed-files/pull/1808) - chore(deps): lock file maintenance by [@​renovate](https://togithub.com/renovate) in [https://github.com/tj-actions/changed-files/pull/1809](https://togithub.com/tj-actions/changed-files/pull/1809) - Updated README.md by [@​tj-actions-bot](https://togithub.com/tj-actions-bot) in [https://github.com/tj-actions/changed-files/pull/1810](https://togithub.com/tj-actions/changed-files/pull/1810) **Full Changelog**: https://github.com/tj-actions/changed-files/compare/v40...v41.0.0 ***
--- ### 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/wait_for_required_workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wait_for_required_workflows.yml b/.github/workflows/wait_for_required_workflows.yml index a92b19f2bd116f..4fe5527449363d 100644 --- a/.github/workflows/wait_for_required_workflows.yml +++ b/.github/workflows/wait_for_required_workflows.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 - uses: actions/github-script@v6 env: FILES: ${{ steps.changed-files.outputs.all_modified_files }} From ff01d857fbd06e80f0233619a0762976434dd864 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:07:01 +0200 Subject: [PATCH 053/166] chore(main): Release plugins-source-typeform v1.2.1 (#15961) :robot: I have created a release *beep* *boop* --- ## [1.2.1](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.2.0...plugins-source-typeform-v1.2.1) (2024-01-02) ### Bug Fixes * **deps:** Update dependency cloudquery-plugin-sdk to v0.1.11 ([#15940](https://github.com/cloudquery/cloudquery/issues/15940)) ([f6ae69a](https://github.com/cloudquery/cloudquery/commit/f6ae69a9719db6207da570863e41745b59c726d5)) --- 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 b2931477feda84..890b3491a3bfcb 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.1", "plugins/source/square+FILLER": "0.0.0", - "plugins/source/typeform": "1.2.0", + "plugins/source/typeform": "1.2.1", "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 baa4c8cd84ae67..9cf74794eaecd1 100644 --- a/plugins/source/typeform/CHANGELOG.md +++ b/plugins/source/typeform/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.1](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.2.0...plugins-source-typeform-v1.2.1) (2024-01-02) + + +### Bug Fixes + +* **deps:** Update dependency cloudquery-plugin-sdk to v0.1.11 ([#15940](https://github.com/cloudquery/cloudquery/issues/15940)) ([f6ae69a](https://github.com/cloudquery/cloudquery/commit/f6ae69a9719db6207da570863e41745b59c726d5)) + ## [1.2.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-typeform-v1.1.2...plugins-source-typeform-v1.2.0) (2023-12-29) diff --git a/plugins/source/typeform/plugin/plugin.py b/plugins/source/typeform/plugin/plugin.py index 359479ef3bb469..d00a10419d9f81 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.0" # {x-release-please-version} +PLUGIN_VERSION = "1.2.1" # {x-release-please-version} class TypeformPlugin(plugin.Plugin): From 9364a5018bd637e455e8ef65116eb99610bec700 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:14:53 +0200 Subject: [PATCH 054/166] chore: Update plugin `source-typeform` version to v1.2.1 (#16000) Updates the `source-typeform` plugin latest version to v1.2.1 --- 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 697ca77822b536..70372e847970b4 100644 --- a/website/versions/source-typeform.json +++ b/website/versions/source-typeform.json @@ -1 +1 @@ -{ "latest": "plugins-source-typeform-v1.2.0" } +{ "latest": "plugins-source-typeform-v1.2.1" } From 9e25f4a6171c46ed0e09f13a8d4216120e57007f Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Wed, 3 Jan 2024 12:54:00 +0200 Subject: [PATCH 055/166] feat!: Remove deprecated spec options (#15999) Extracted from https://github.com/cloudquery/cloudquery/pull/15998 BEGIN_COMMIT_OVERRIDE feat: Remove deprecated spec options (https://github.com/cloudquery/cloudquery/pull/15999) BREAKING-CHANGE: Remove deprecated spec options (https://github.com/cloudquery/cloudquery/pull/15999). The following deprecated spec options were removed: * source plugin spec: * `concurrency` * `table_concurrency` * `resource_concurrency` * `backend` * `backend_spec` * destination plugin spec: * `batch_size` * `batch_size_bytes` END_COMMIT_OVERRIDE --- cli/cmd/infer_test.go | 4 -- cli/cmd/specs.go | 37 +---------- cli/cmd/sync.go | 14 +--- cli/internal/specs/v0/backend.go | 60 ----------------- cli/internal/specs/v0/backend_test.go | 36 ---------- cli/internal/specs/v0/destination.go | 29 ++------- cli/internal/specs/v0/destination_test.go | 36 ++++------ cli/internal/specs/v0/scheduler.go | 60 ----------------- cli/internal/specs/v0/scheduler_test.go | 36 ---------- cli/internal/specs/v0/source.go | 65 +------------------ cli/internal/specs/v0/source_test.go | 7 -- cli/internal/specs/v0/spec_reader.go | 3 +- cli/internal/specs/v0/spec_reader_test.go | 10 +-- cli/internal/specs/v0/testdata/dir/aws.yml | 1 - .../specs/v0/testdata/dir_yaml/aws.yaml | 1 - cli/internal/specs/v0/testdata/gcp.yml | 1 - cli/internal/specs/v0/testdata/gcpv2.yml | 1 - 17 files changed, 30 insertions(+), 371 deletions(-) delete mode 100644 cli/internal/specs/v0/backend.go delete mode 100644 cli/internal/specs/v0/backend_test.go delete mode 100644 cli/internal/specs/v0/scheduler.go delete mode 100644 cli/internal/specs/v0/scheduler_test.go diff --git a/cli/cmd/infer_test.go b/cli/cmd/infer_test.go index 14aa6febbddc02..ae2be68218b3cf 100644 --- a/cli/cmd/infer_test.go +++ b/cli/cmd/infer_test.go @@ -28,7 +28,6 @@ spec: name: gcp path: cloudquery/gcp version: v10.0.0 - table_concurrency: 10 destinations: [dummydest] tables: [test] --- @@ -50,7 +49,6 @@ spec: name: gcp path: cloudquery/gcp version: v99.999.0 - table_concurrency: 10 destinations: [dummydest] tables: [test] --- @@ -72,7 +70,6 @@ spec: path: cloudquery/gcp registry: cloudquery version: v99.999.0 - table_concurrency: 10 destinations: [dummydest] tables: [test] --- @@ -94,7 +91,6 @@ spec: path: cloudquery/gcp registry: github version: v99.999.0 - table_concurrency: 10 destinations: [dummydest] tables: [test] --- diff --git a/cli/cmd/specs.go b/cli/cmd/specs.go index 5fb2cb0963232b..a3564340c81061 100644 --- a/cli/cmd/specs.go +++ b/cli/cmd/specs.go @@ -7,17 +7,6 @@ import ( pbSpecs "github.com/cloudquery/plugin-pb-go/specs" ) -func CLIBackendToPbBackend(backend specs.Backend) pbSpecs.Backend { - switch backend { - case specs.BackendLocal: - return pbSpecs.BackendLocal - case specs.BackendNone: - return pbSpecs.BackendNone - default: - panic(fmt.Sprintf("unknown backend %q", backend.String())) - } -} - func CLIRegistryToPbRegistry(registry specs.Registry) pbSpecs.Registry { switch registry { case specs.RegistryGithub: @@ -33,17 +22,6 @@ func CLIRegistryToPbRegistry(registry specs.Registry) pbSpecs.Registry { } } -func CLISchedulerToPbScheduler(scheduler specs.Scheduler) pbSpecs.Scheduler { - switch scheduler { - case specs.SchedulerDFS: - return pbSpecs.SchedulerDFS - case specs.SchedulerRoundRobin: - return pbSpecs.SchedulerRoundRobin - default: - panic(fmt.Sprintf("unknown scheduler %q", scheduler.String())) - } -} - // This converts CLI configuration to a source spec prior to V3 version // when our spec wasn't decoupled from the over the wire protocol func CLISourceSpecToPbSpec(spec specs.Source) pbSpecs.Source { @@ -58,14 +36,6 @@ func CLISourceSpecToPbSpec(spec specs.Source) pbSpecs.Source { Destinations: spec.Destinations, Spec: spec.Spec, DeterministicCQID: spec.DeterministicCQID, - - // allow use of deprecated options here for backwards-compatibility - Concurrency: spec.Concurrency, // nolint:staticcheck - TableConcurrency: spec.TableConcurrency, // nolint:staticcheck - ResourceConcurrency: spec.ResourceConcurrency, // nolint:staticcheck - Backend: CLIBackendToPbBackend(spec.Backend), // nolint:staticcheck - BackendSpec: spec.BackendSpec, // nolint:staticcheck - Scheduler: CLISchedulerToPbScheduler(spec.Scheduler), // nolint:staticcheck } } @@ -112,10 +82,7 @@ func CLIDestinationSpecToPbSpec(spec specs.Destination) pbSpecs.Destination { Registry: CLIRegistryToPbRegistry(spec.Registry), WriteMode: CLIWriteModeToPbWriteMode(spec.WriteMode), MigrateMode: CLIMigrateModeToPbMigrateMode(spec.MigrateMode), - - BatchSize: spec.BatchSize, // nolint:staticcheck // allow use of deprecated options here for backwards-compatibility - BatchSizeBytes: spec.BatchSizeBytes, // nolint:staticcheck // allow use of deprecated options here for backwards-compatibility - Spec: spec.Spec, - PKMode: CLIPkModeToPbPKMode(spec.PKMode), + PKMode: CLIPkModeToPbPKMode(spec.PKMode), + Spec: spec.Spec, } } diff --git a/cli/cmd/sync.go b/cli/cmd/sync.go index 5ec0ed5661b03a..2a6852062fbd10 100644 --- a/cli/cmd/sync.go +++ b/cli/cmd/sync.go @@ -214,13 +214,7 @@ func sync(cmd *cobra.Command, args []string) error { for field, msg := range warnings { log.Warn().Str("source", source.Name).Str("field", field).Msg(msg) } - if _, found := warnings["scheduler"]; found { - source.Spec["scheduler"] = source.Scheduler.String() // nolint:staticcheck // use of deprecated field - } - if _, found := warnings["concurrency"]; found { - source.Spec["concurrency"] = source.Concurrency // nolint:staticcheck // use of deprecated field - } - for i, destination := range destinationClientsForSource { + for _, destination := range destinationClientsForSource { versions, err := destination.Versions(ctx) if err != nil { return fmt.Errorf("failed to get destination versions: %w", err) @@ -232,12 +226,6 @@ func sync(cmd *cobra.Command, args []string) error { for field, msg := range destWarnings { log.Warn().Str("destination", destination.Name()).Str("field", field).Msg(msg) } - if _, found := destWarnings["batch_size"]; found { - destinationForSourceSpec[i].Spec["batch_size"] = destinationForSourceSpec[i].BatchSize // nolint:staticcheck // use of deprecated field - } - if _, found := destWarnings["batch_size_bytes"]; found { - destinationForSourceSpec[i].Spec["batch_size_bytes"] = destinationForSourceSpec[i].BatchSizeBytes // nolint:staticcheck // use of deprecated field - } } src := v3source{ diff --git a/cli/internal/specs/v0/backend.go b/cli/internal/specs/v0/backend.go deleted file mode 100644 index 6c6cea9153ed64..00000000000000 --- a/cli/internal/specs/v0/backend.go +++ /dev/null @@ -1,60 +0,0 @@ -package specs - -import ( - "bytes" - "encoding/json" - "fmt" -) - -type Backend int - -const ( - BackendNone Backend = iota - BackendLocal -) - -var AllBackends = Backends{BackendNone, BackendLocal} -var AllBackendNames = [...]string{ - BackendNone: "none", - BackendLocal: "local", -} - -type Backends []Backend - -func (s Backends) String() string { - var buffer bytes.Buffer - for i, backend := range s { - if i > 0 { - buffer.WriteString(", ") - } - buffer.WriteString(backend.String()) - } - return buffer.String() -} - -func (s Backend) String() string { - return AllBackendNames[s] -} -func (s Backend) MarshalJSON() ([]byte, error) { - return []byte(`"` + s.String() + `"`), nil -} - -func (s *Backend) UnmarshalJSON(data []byte) (err error) { - var backend string - if err := json.Unmarshal(data, &backend); err != nil { - return err - } - if *s, err = BackendFromString(backend); err != nil { - return err - } - return nil -} - -func BackendFromString(s string) (Backend, error) { - for i, backend := range AllBackendNames { - if s == backend { - return Backend(i), nil - } - } - return BackendNone, fmt.Errorf("unknown backend %s", s) -} diff --git a/cli/internal/specs/v0/backend_test.go b/cli/internal/specs/v0/backend_test.go deleted file mode 100644 index d16056afb628db..00000000000000 --- a/cli/internal/specs/v0/backend_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package specs - -import ( - "encoding/json" - "testing" - - "gopkg.in/yaml.v3" -) - -func TestBackendJsonMarshalUnmarshal(t *testing.T) { - b, err := json.Marshal(BackendLocal) - if err != nil { - t.Fatal("failed to marshal backend:", err) - } - var backend Backend - if err := json.Unmarshal(b, &backend); err != nil { - t.Fatal("failed to unmarshal backend:", err) - } - if backend != BackendLocal { - t.Fatal("expected backend to be local, but got:", backend) - } -} - -func TestBackendYamlMarshalUnmarshal(t *testing.T) { - b, err := yaml.Marshal(BackendLocal) - if err != nil { - t.Fatal("failed to marshal backend:", err) - } - var backend Backend - if err := yaml.Unmarshal(b, &backend); err != nil { - t.Fatal("failed to unmarshal backend:", err) - } - if backend != BackendLocal { - t.Fatal("expected backend to be local, but got:", backend) - } -} diff --git a/cli/internal/specs/v0/destination.go b/cli/internal/specs/v0/destination.go index 989b54a93425d8..77a98701060c26 100644 --- a/cli/internal/specs/v0/destination.go +++ b/cli/internal/specs/v0/destination.go @@ -16,29 +16,20 @@ type Destination struct { Registry Registry `json:"registry,omitempty"` WriteMode WriteMode `json:"write_mode,omitempty"` MigrateMode MigrateMode `json:"migrate_mode,omitempty"` - // Deprecated: use plugin-spec batch_size_bytes instead - BatchSize int `json:"batch_size,omitempty"` - // Deprecated: use plugin-spec batch_size_bytes instead - BatchSizeBytes int `json:"batch_size_bytes,omitempty"` - Spec map[string]any `json:"spec,omitempty"` - PKMode PKMode `json:"pk_mode,omitempty"` + PKMode PKMode `json:"pk_mode,omitempty"` + + Spec map[string]any `json:"spec,omitempty"` // registryInferred is a flag that indicates whether the registry was inferred from a zero value registryInferred bool } -func (d *Destination) GetWarnings() Warnings { +func (*Destination) GetWarnings() Warnings { warnings := make(map[string]string) - if d.BatchSize != 0 { - warnings["batch_size"] = "batch_size in the top-level spec is deprecated and will be removed in a future release. Please use the plugin-spec `batch_size` option instead." - } - if d.BatchSizeBytes != 0 { - warnings["batch_size_bytes"] = "batch_size_bytes in the top-level spec is deprecated and will be removed in a future release. Please use the plugin-spec `batch_size_bytes` option instead." - } return warnings } -func (d *Destination) SetDefaults(defaultBatchSize, defaultBatchSizeBytes int) { +func (d *Destination) SetDefaults() { if d.Spec == nil { d.Spec = make(map[string]any) } @@ -46,12 +37,6 @@ func (d *Destination) SetDefaults(defaultBatchSize, defaultBatchSizeBytes int) { d.Registry = RegistryCloudQuery d.registryInferred = true } - if d.BatchSize == 0 { - d.BatchSize = defaultBatchSize - } - if d.BatchSizeBytes == 0 { - d.BatchSizeBytes = defaultBatchSizeBytes - } } func (d *Destination) UnmarshalSpec(out any) error { @@ -87,9 +72,7 @@ func (d *Destination) Validate() error { return fmt.Errorf("version must start with v") } } - if d.BatchSize < 0 { - return fmt.Errorf("batch_size must be greater than 0") - } + return nil } diff --git a/cli/internal/specs/v0/destination_test.go b/cli/internal/specs/v0/destination_test.go index bfaa23b06cdc23..e72ff3685b8bbe 100644 --- a/cli/internal/specs/v0/destination_test.go +++ b/cli/internal/specs/v0/destination_test.go @@ -126,12 +126,10 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryGrpc, - Path: "localhost:9999", - BatchSize: 10000, - BatchSizeBytes: 10000000, - Spec: map[string]any{}, + Name: "test", + Registry: RegistryGrpc, + Path: "localhost:9999", + Spec: map[string]any{}, }, }, { @@ -144,12 +142,10 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryLocal, - Path: "/home/user/some_executable", - BatchSize: 10000, - BatchSizeBytes: 10000000, - Spec: map[string]any{}, + Name: "test", + Registry: RegistryLocal, + Path: "/home/user/some_executable", + Spec: map[string]any{}, }, }, { @@ -166,8 +162,6 @@ spec: Registry: RegistryCloudQuery, Path: "cloudquery/test", Version: "v1.1.0", - BatchSize: 10000, - BatchSizeBytes: 10000000, Spec: map[string]any{}, registryInferred: true, }, @@ -183,13 +177,11 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryGithub, - Path: "cloudquery/test", - Version: "v1.1.0", - BatchSize: 10000, - BatchSizeBytes: 10000000, - Spec: map[string]any{}, + Name: "test", + Registry: RegistryGithub, + Path: "cloudquery/test", + Version: "v1.1.0", + Spec: map[string]any{}, }, }, } @@ -205,7 +197,7 @@ func TestDestinationUnmarshalSpecValidate(t *testing.T) { t.Fatal(err) } destination := spec.Spec.(*Destination) - destination.SetDefaults(10000, 10000000) + destination.SetDefaults() err = destination.Validate() if err != nil { if err.Error() != tc.err { diff --git a/cli/internal/specs/v0/scheduler.go b/cli/internal/specs/v0/scheduler.go deleted file mode 100644 index 582e7ac91f64ca..00000000000000 --- a/cli/internal/specs/v0/scheduler.go +++ /dev/null @@ -1,60 +0,0 @@ -package specs - -import ( - "bytes" - "encoding/json" - "fmt" -) - -type Scheduler int - -const ( - SchedulerDFS Scheduler = iota - SchedulerRoundRobin -) - -var AllStrategies = Schedulers{SchedulerDFS, SchedulerRoundRobin} -var AllSchedulerNames = [...]string{ - SchedulerDFS: "dfs", - SchedulerRoundRobin: "round-robin", -} - -type Schedulers []Scheduler - -func (s Schedulers) String() string { - var buffer bytes.Buffer - for i, scheduler := range s { - if i > 0 { - buffer.WriteString(", ") - } - buffer.WriteString(scheduler.String()) - } - return buffer.String() -} - -func (s Scheduler) String() string { - return AllSchedulerNames[s] -} -func (s Scheduler) MarshalJSON() ([]byte, error) { - return []byte(`"` + s.String() + `"`), nil -} - -func (s *Scheduler) UnmarshalJSON(data []byte) (err error) { - var scheduler string - if err := json.Unmarshal(data, &scheduler); err != nil { - return err - } - if *s, err = SchedulerFromString(scheduler); err != nil { - return err - } - return nil -} - -func SchedulerFromString(s string) (Scheduler, error) { - for i, scheduler := range AllSchedulerNames { - if s == scheduler { - return Scheduler(i), nil - } - } - return SchedulerDFS, fmt.Errorf("unknown scheduler %s", s) -} diff --git a/cli/internal/specs/v0/scheduler_test.go b/cli/internal/specs/v0/scheduler_test.go deleted file mode 100644 index e63f61d4d788ad..00000000000000 --- a/cli/internal/specs/v0/scheduler_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package specs - -import ( - "encoding/json" - "testing" - - "gopkg.in/yaml.v3" -) - -func TestSchedulerJsonMarshalUnmarshal(t *testing.T) { - b, err := json.Marshal(SchedulerDFS) - if err != nil { - t.Fatal("failed to marshal scheduler:", err) - } - var scheduler Scheduler - if err := json.Unmarshal(b, &scheduler); err != nil { - t.Fatal("failed to unmarshal scheduler:", err) - } - if scheduler != SchedulerDFS { - t.Fatal("expected scheduler to be dfs, but got:", scheduler) - } -} - -func TestSchedulerYamlMarshalUnmarshal(t *testing.T) { - b, err := yaml.Marshal(SchedulerDFS) - if err != nil { - t.Fatal("failed to marshal scheduler:", err) - } - var scheduler Scheduler - if err := yaml.Unmarshal(b, &scheduler); err != nil { - t.Fatal("failed to unmarshal scheduler:", err) - } - if scheduler != SchedulerDFS { - t.Fatal("expected scheduler to be dfs, but got:", scheduler) - } -} diff --git a/cli/internal/specs/v0/source.go b/cli/internal/specs/v0/source.go index d5bd5a639689fa..87127f07dd2145 100644 --- a/cli/internal/specs/v0/source.go +++ b/cli/internal/specs/v0/source.go @@ -10,10 +10,6 @@ import ( "github.com/thoas/go-funk" ) -const ( - defaultConcurrency = 500000 -) - type BackendOptions struct { TableName string `json:"table_name,omitempty"` Connection string `json:"connection,omitempty"` @@ -33,12 +29,6 @@ type Source struct { Path string `json:"path,omitempty"` // Registry can be "", "github", "local", "grpc", "docker", "cloudquery" Registry Registry `json:"registry,omitempty"` - // Deprecated: Concurrency is the number of concurrent workers to use when syncing data. Should now use plugin-specific field instead. - Concurrency uint64 `json:"concurrency,omitempty"` - // Deprecated: use plugin-level Concurrency instead - TableConcurrency uint64 `json:"table_concurrency,omitempty"` - // Deprecated: use plugin-level Concurrency instead - ResourceConcurrency uint64 `json:"resource_concurrency,omitempty"` // Tables to sync from the source plugin Tables []string `json:"tables,omitempty"` // SkipTables defines tables to skip when syncing data. Useful if a glob pattern is used in Tables @@ -51,12 +41,6 @@ type Source struct { // Optional Backend options for sync operation BackendOptions *BackendOptions `json:"backend_options,omitempty"` - // Deprecated: Backend is the name of the state backend to use. Should now use `backend_options` instead. - Backend Backend `json:"backend,omitempty"` - // Deprecated: BackendSpec contains any backend-specific configuration. Should now use `backend_options` instead. - BackendSpec any `json:"backend_spec,omitempty"` - // Deprecated: Scheduler defines the scheduling algorithm that should be used to sync data. Should now use plugin-specific field instead. - Scheduler Scheduler `json:"scheduler,omitempty"` // Spec defines plugin specific configuration // This is different in every source plugin. Spec map[string]any `json:"spec,omitempty"` @@ -78,24 +62,6 @@ type Source struct { // called before SetDefaults. func (s *Source) GetWarnings() Warnings { warnings := make(map[string]string) - if s.Backend.String() != BackendNone.String() { - warnings["backend"] = "the top-level `backend` option is deprecated. Please use the plugin-level `backend_options` option instead" - } - if s.BackendSpec != nil { - warnings["backend_spec"] = "the top-level `backend_spec` option is deprecated. Please use the plugin-level `backend_options` option instead" - } - if s.Scheduler.String() != SchedulerDFS.String() { - warnings["scheduler"] = "the top-level `scheduler` option is deprecated. Please use the plugin-level `scheduler` option instead" - } - if s.Concurrency != 0 { - warnings["concurrency"] = "the top-level `concurrency` option is deprecated. Please use the plugin-level `concurrency` option instead" - } - if s.TableConcurrency != 0 { - warnings["table_concurrency"] = "the `table_concurrency` option is deprecated. Please use the plugin-level `concurrency` option instead" - } - if s.ResourceConcurrency != 0 { - warnings["resource_concurrency"] = "the `resource_concurrency` option is deprecated. Please use the plugin-level `concurrency` option instead" - } if s.SkipDependentTables && slices.Contains(s.Tables, "*") { warnings["skip_dependent_tables"] = "the `skip_dependent_tables` option is ineffective when used with '*' `tables`" } @@ -114,21 +80,6 @@ func (s *Source) SetDefaults() { s.Registry = RegistryCloudQuery s.registryInferred = true } - if s.Backend.String() == "" { - s.Backend = BackendNone - } - if s.Scheduler.String() == "" { - s.Scheduler = SchedulerDFS - } - - if s.TableConcurrency != 0 || s.ResourceConcurrency != 0 { - // attempt to make a sensible backwards-compatible choice, but the CLI - // should raise a warning about this until the `table_concurrency` and `resource_concurrency` options are fully removed. - s.Concurrency = s.TableConcurrency + s.ResourceConcurrency - } - if s.Concurrency == 0 { - s.Concurrency = defaultConcurrency - } } // UnmarshalSpec unmarshals the internal spec into the given interface @@ -143,18 +94,6 @@ func (s *Source) UnmarshalSpec(out any) error { return dec.Decode(out) } -// UnmarshalBackendSpec unmarshals the backend spec into the given interface -func (s *Source) UnmarshalBackendSpec(out any) error { - b, err := json.Marshal(s.BackendSpec) - if err != nil { - return err - } - dec := json.NewDecoder(bytes.NewReader(b)) - dec.UseNumber() - dec.DisallowUnknownFields() - return dec.Decode(out) -} - func (s *Source) Validate() error { if s.Name == "" { return fmt.Errorf("name is required") @@ -184,9 +123,7 @@ func (s *Source) Validate() error { if len(s.Destinations) == 0 { return fmt.Errorf("at least one destination is required") } - if !funk.Contains(AllStrategies, s.Scheduler) { - return fmt.Errorf("unknown scheduler %v. Must be one of: %v", s.Scheduler, AllStrategies.String()) - } + return nil } diff --git a/cli/internal/specs/v0/source_test.go b/cli/internal/specs/v0/source_test.go index 8661e53b26b990..df5dd10b2b2b64 100644 --- a/cli/internal/specs/v0/source_test.go +++ b/cli/internal/specs/v0/source_test.go @@ -139,7 +139,6 @@ spec: path: cloudquery/test version: v1.1.0 destinations: ["test"] - scheduler: round-robin tables: ["test"] `, "", @@ -147,10 +146,8 @@ spec: Name: "test", Registry: RegistryCloudQuery, Path: "cloudquery/test", - Concurrency: defaultConcurrency, Version: "v1.1.0", Destinations: []string{"test"}, - Scheduler: SchedulerRoundRobin, Tables: []string{"test"}, Spec: map[string]any{}, registryInferred: true, @@ -171,10 +168,8 @@ spec: Name: "test", Registry: RegistryCloudQuery, Path: "cloudquery/test", - Concurrency: defaultConcurrency, Version: "v1.1.0", Destinations: []string{"test"}, - Scheduler: SchedulerDFS, Tables: []string{"test"}, Spec: map[string]any{}, registryInferred: true, @@ -196,10 +191,8 @@ spec: Name: "test", Registry: RegistryGithub, Path: "cloudquery/test", - Concurrency: defaultConcurrency, Version: "v1.1.0", Destinations: []string{"test"}, - Scheduler: SchedulerDFS, Tables: []string{"test"}, Spec: map[string]any{}, }, diff --git a/cli/internal/specs/v0/spec_reader.go b/cli/internal/specs/v0/spec_reader.go index d697b990334e4c..61be7151ac3700 100644 --- a/cli/internal/specs/v0/spec_reader.go +++ b/cli/internal/specs/v0/spec_reader.go @@ -112,8 +112,7 @@ func (r *SpecReader) loadSpecsFromFile(path string) error { return fmt.Errorf("duplicate destination name %s", destination.Name) } r.destinationWarningsMap[destination.Name] = destination.GetWarnings() - // We set the default value to 0, so it can be overridden later by plugins' defaults - destination.SetDefaults(0, 0) + destination.SetDefaults() if err := destination.Validate(); err != nil { return fmt.Errorf("failed to validate destination %s: %w", destination.Name, err) } diff --git a/cli/internal/specs/v0/spec_reader_test.go b/cli/internal/specs/v0/spec_reader_test.go index bad961acbdeccf..52adf877996495 100644 --- a/cli/internal/specs/v0/spec_reader_test.go +++ b/cli/internal/specs/v0/spec_reader_test.go @@ -43,8 +43,8 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, TableConcurrency: 10, Tables: []string{"test"}}, - {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, TableConcurrency: 10, Tables: []string{"test"}}, + {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, Tables: []string{"test"}}, + {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, }, destinations: []*Destination{ {Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}}, @@ -58,8 +58,8 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, TableConcurrency: 10, Tables: []string{"test"}}, - {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, TableConcurrency: 10, Tables: []string{"test"}}, + {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, Tables: []string{"test"}}, + {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, }, destinations: []*Destination{ {Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}}, @@ -246,7 +246,7 @@ func TestLoadSpecs(t *testing.T) { } for _, d := range tc.destinations { - d.SetDefaults(0, 0) + d.SetDefaults() } require.Equal(t, tc.sources, specReader.Sources) diff --git a/cli/internal/specs/v0/testdata/dir/aws.yml b/cli/internal/specs/v0/testdata/dir/aws.yml index 2ac2156aba526a..95da721609864b 100644 --- a/cli/internal/specs/v0/testdata/dir/aws.yml +++ b/cli/internal/specs/v0/testdata/dir/aws.yml @@ -3,7 +3,6 @@ spec: name: aws path: cloudquery/aws version: v1.0.0 - table_concurrency: 10 registry: local destinations: [postgresql] tables: [test] diff --git a/cli/internal/specs/v0/testdata/dir_yaml/aws.yaml b/cli/internal/specs/v0/testdata/dir_yaml/aws.yaml index 2ac2156aba526a..95da721609864b 100644 --- a/cli/internal/specs/v0/testdata/dir_yaml/aws.yaml +++ b/cli/internal/specs/v0/testdata/dir_yaml/aws.yaml @@ -3,7 +3,6 @@ spec: name: aws path: cloudquery/aws version: v1.0.0 - table_concurrency: 10 registry: local destinations: [postgresql] tables: [test] diff --git a/cli/internal/specs/v0/testdata/gcp.yml b/cli/internal/specs/v0/testdata/gcp.yml index 2e331a547f9205..19a47920b11a7e 100644 --- a/cli/internal/specs/v0/testdata/gcp.yml +++ b/cli/internal/specs/v0/testdata/gcp.yml @@ -3,7 +3,6 @@ spec: name: gcp path: cloudquery/gcp version: v1.0.0 - table_concurrency: 10 registry: local destinations: [postgresqlv2] tables: [test] diff --git a/cli/internal/specs/v0/testdata/gcpv2.yml b/cli/internal/specs/v0/testdata/gcpv2.yml index 623602a00a41cd..34b07ab610cfbc 100644 --- a/cli/internal/specs/v0/testdata/gcpv2.yml +++ b/cli/internal/specs/v0/testdata/gcpv2.yml @@ -3,6 +3,5 @@ spec: name: gcpv2 path: cloudquery/gcp version: v1.0.1 - table_concurrency: 10 destinations: [postgresqlv2] tables: [test] From 0c64ffd595b17a2c9068ceed9ce9f83f6cb48851 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Wed, 3 Jan 2024 13:59:53 +0200 Subject: [PATCH 056/166] refactor: Extract common plugin spec fields into metadata struct (#16001) Extracted from https://github.com/cloudquery/cloudquery/pull/15998 --- cli/internal/specs/v0/destination.go | 51 +--- cli/internal/specs/v0/destination_test.go | 81 +++--- cli/internal/specs/v0/metadata.go | 81 ++++++ cli/internal/specs/v0/source.go | 49 +--- cli/internal/specs/v0/source_test.go | 83 +++--- cli/internal/specs/v0/spec_reader_test.go | 307 ++++++++++++++++++++-- 6 files changed, 449 insertions(+), 203 deletions(-) create mode 100644 cli/internal/specs/v0/metadata.go diff --git a/cli/internal/specs/v0/destination.go b/cli/internal/specs/v0/destination.go index 77a98701060c26..80feee7d54ea1a 100644 --- a/cli/internal/specs/v0/destination.go +++ b/cli/internal/specs/v0/destination.go @@ -5,23 +5,15 @@ import ( "encoding/json" "fmt" "strings" - - "github.com/thoas/go-funk" ) type Destination struct { - Name string `json:"name,omitempty"` - Version string `json:"version,omitempty"` - Path string `json:"path,omitempty"` - Registry Registry `json:"registry,omitempty"` - WriteMode WriteMode `json:"write_mode,omitempty"` - MigrateMode MigrateMode `json:"migrate_mode,omitempty"` - PKMode PKMode `json:"pk_mode,omitempty"` - - Spec map[string]any `json:"spec,omitempty"` + Metadata - // registryInferred is a flag that indicates whether the registry was inferred from a zero value - registryInferred bool + WriteMode WriteMode `json:"write_mode,omitempty"` + MigrateMode MigrateMode `json:"migrate_mode,omitempty"` + PKMode PKMode `json:"pk_mode,omitempty"` + Spec map[string]any `json:"spec,omitempty"` } func (*Destination) GetWarnings() Warnings { @@ -30,13 +22,10 @@ func (*Destination) GetWarnings() Warnings { } func (d *Destination) SetDefaults() { + d.Metadata.SetDefaults() if d.Spec == nil { d.Spec = make(map[string]any) } - if d.Registry == RegistryUnset { - d.Registry = RegistryCloudQuery - d.registryInferred = true - } } func (d *Destination) UnmarshalSpec(out any) error { @@ -51,29 +40,7 @@ func (d *Destination) UnmarshalSpec(out any) error { } func (d *Destination) Validate() error { - if d.Name == "" { - return fmt.Errorf("name is required") - } - if d.Path == "" { - msg := "path is required" - // give a small hint to help users transition from the old config format that didn't require path - officialPlugins := []string{"postgresql", "csv"} - if funk.ContainsString(officialPlugins, d.Name) { - msg += fmt.Sprintf(". Hint: try setting path to cloudquery/%s in your config", d.Name) - } - return fmt.Errorf(msg) - } - - if d.Registry.NeedVersion() { - if d.Version == "" { - return fmt.Errorf("version is required") - } - if !strings.HasPrefix(d.Version, "v") { - return fmt.Errorf("version must start with v") - } - } - - return nil + return d.Metadata.Validate() } func (d Destination) VersionString() string { @@ -89,7 +56,3 @@ func (d Destination) VersionString() string { } return fmt.Sprintf("%s (%s@%s)", d.Name, pathParts[1], d.Version) } - -func (d Destination) RegistryInferred() bool { - return d.registryInferred -} diff --git a/cli/internal/specs/v0/destination_test.go b/cli/internal/specs/v0/destination_test.go index e72ff3685b8bbe..32b8e9557468f0 100644 --- a/cli/internal/specs/v0/destination_test.go +++ b/cli/internal/specs/v0/destination_test.go @@ -45,8 +45,8 @@ spec: `, "failed to decode spec: json: cannot unmarshal number into Go struct field Source.name of type string", &Source{ - Name: "test", - Tables: []string{"*"}, + Metadata: Metadata{Name: "test"}, + Tables: []string{"*"}, }, }, { @@ -57,8 +57,8 @@ spec: `, `failed to decode spec: json: unknown field "namea"`, &Source{ - Name: "test", - Tables: []string{"*"}, + Metadata: Metadata{Name: "test"}, + Tables: []string{"*"}, }, }, } @@ -126,10 +126,12 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryGrpc, - Path: "localhost:9999", - Spec: map[string]any{}, + Metadata: Metadata{ + Name: "test", + Registry: RegistryGrpc, + Path: "localhost:9999", + }, + Spec: map[string]any{}, }, }, { @@ -142,10 +144,12 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryLocal, - Path: "/home/user/some_executable", - Spec: map[string]any{}, + Metadata: Metadata{ + Name: "test", + Registry: RegistryLocal, + Path: "/home/user/some_executable", + }, + Spec: map[string]any{}, }, }, { @@ -158,12 +162,14 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryCloudQuery, - Path: "cloudquery/test", - Version: "v1.1.0", - Spec: map[string]any{}, - registryInferred: true, + Metadata: Metadata{ + Name: "test", + Registry: RegistryCloudQuery, + Path: "cloudquery/test", + Version: "v1.1.0", + registryInferred: true, + }, + Spec: map[string]any{}, }, }, { @@ -177,11 +183,13 @@ spec: `, "", &Destination{ - Name: "test", - Registry: RegistryGithub, - Path: "cloudquery/test", - Version: "v1.1.0", - Spec: map[string]any{}, + Metadata: Metadata{ + Name: "test", + Registry: RegistryGithub, + Path: "cloudquery/test", + Version: "v1.1.0", + }, + Spec: map[string]any{}, }, }, } @@ -212,20 +220,14 @@ func TestDestinationUnmarshalSpecValidate(t *testing.T) { } func TestDestination_VersionString(t *testing.T) { - type fields struct { - Name string - Version string - Path string - Registry Registry - } tests := []struct { - name string - fields fields - want string + name string + meta Metadata + want string }{ { name: "should use short version without name part in path when those are the same", - fields: fields{ + meta: Metadata{ Name: "aws", Version: "v10.0.0", Path: "cloudquery/aws", @@ -235,7 +237,7 @@ func TestDestination_VersionString(t *testing.T) { }, { name: "should use long version with path when name doesn't match path", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "cloudquery/aws", @@ -245,7 +247,7 @@ func TestDestination_VersionString(t *testing.T) { }, { name: "should handle non GitHub registry", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "localhost:7777", @@ -255,7 +257,7 @@ func TestDestination_VersionString(t *testing.T) { }, { name: "should handle malformed path", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "aws", @@ -266,12 +268,7 @@ func TestDestination_VersionString(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - d := Destination{ - Name: tt.fields.Name, - Version: tt.fields.Version, - Path: tt.fields.Path, - Registry: tt.fields.Registry, - } + d := Destination{Metadata: tt.meta} if got := d.VersionString(); got != tt.want { t.Errorf("Destination.String() = %v, want %v", got, tt.want) } diff --git a/cli/internal/specs/v0/metadata.go b/cli/internal/specs/v0/metadata.go new file mode 100644 index 00000000000000..4b037b584bd85a --- /dev/null +++ b/cli/internal/specs/v0/metadata.go @@ -0,0 +1,81 @@ +package specs + +import ( + "fmt" + "slices" + "strings" +) + +// Spec part to define exact plugin: name, version & location. +type Metadata struct { + // Name of the plugin to use + Name string `json:"name" jsonschema:"required,minLength=1"` + + // Version of the plugin to be used + Version string `json:"version"` + + // Path is the canonical path to the plugin in a given registry + // For example: + // * for `registry: github` the `path` will be: `org/repo` + // * for `registry: local` the `path` will be the path to the binary: `./path/to/binary` + // * for `registry: grpc` the `path` will be the address of the gRPC server: `host:port` + Path string `json:"path" jsonschema:"required,minLength=1"` + + // Registry can be "", "github", "local", "grpc", "docker", "cloudquery" + Registry Registry `json:"registry,omitempty" jsonschema:"default=cloudquery"` + + // registryInferred is a flag that indicates whether the registry was inferred from an empty value + registryInferred bool +} + +func (m *Metadata) Validate() error { + if m.Name == "" { + return fmt.Errorf("name is required") + } + + if m.Path == "" { + msg := "path is required" + // give a small hint to help users transition from the old config format that didn't require path + officialPlugins := []string{ + "aws", + "azure", + "gcp", + "digitalocean", + "github", + "heroku", + "k8s", + "okta", + "terraform", + "cloudflare", + "postgresql", + "csv", + "clickhouse", + } + if slices.Contains(officialPlugins, m.Name) { + msg += fmt.Sprintf(". Hint: try setting path to cloudquery/%s in your config", m.Name) + } + return fmt.Errorf(msg) + } + + if m.Registry.NeedVersion() { + if m.Version == "" { + return fmt.Errorf("version is required") + } + if !strings.HasPrefix(m.Version, "v") { + return fmt.Errorf("version must start with v") + } + } + + return nil +} + +func (m *Metadata) SetDefaults() { + if m.Registry == RegistryUnset { + m.Registry = RegistryCloudQuery + m.registryInferred = true + } +} + +func (m *Metadata) RegistryInferred() bool { + return m.registryInferred +} diff --git a/cli/internal/specs/v0/source.go b/cli/internal/specs/v0/source.go index 87127f07dd2145..ec62d6d0e41a6d 100644 --- a/cli/internal/specs/v0/source.go +++ b/cli/internal/specs/v0/source.go @@ -6,8 +6,6 @@ import ( "fmt" "slices" "strings" - - "github.com/thoas/go-funk" ) type BackendOptions struct { @@ -17,18 +15,8 @@ type BackendOptions struct { // Source is the spec for a source plugin type Source struct { - // Name of the source plugin to use - Name string `json:"name,omitempty"` - // Version of the source plugin to use - Version string `json:"version,omitempty"` - // Path is the canonical path to the source plugin in a given registry - // For example: - // in github the path will be: org/repo - // For the local registry the path will be the path to the binary: ./path/to/binary - // For the gRPC registry the path will be the address of the gRPC server: host:port - Path string `json:"path,omitempty"` - // Registry can be "", "github", "local", "grpc", "docker", "cloudquery" - Registry Registry `json:"registry,omitempty"` + Metadata + // Tables to sync from the source plugin Tables []string `json:"tables,omitempty"` // SkipTables defines tables to skip when syncing data. Useful if a glob pattern is used in Tables @@ -53,9 +41,6 @@ type Source struct { OtelEndpoint string `json:"otel_endpoint,omitempty"` // If specified this will spawn the plugin with --otel-endpoint-insecure OtelEndpointInsecure bool `json:"otel_endpoint_insecure,omitempty"` - - // registryInferred is a flag that indicates whether the registry was inferred from an empty value - registryInferred bool } // GetWarnings returns a list of deprecated options that were used in the source config. This should be @@ -73,13 +58,10 @@ func (s *Source) GetWarnings() Warnings { } func (s *Source) SetDefaults() { + s.Metadata.SetDefaults() if s.Spec == nil { s.Spec = make(map[string]any) } - if s.Registry == RegistryUnset { - s.Registry = RegistryCloudQuery - s.registryInferred = true - } } // UnmarshalSpec unmarshals the internal spec into the given interface @@ -95,31 +77,14 @@ func (s *Source) UnmarshalSpec(out any) error { } func (s *Source) Validate() error { - if s.Name == "" { - return fmt.Errorf("name is required") - } - if s.Path == "" { - msg := "path is required" - // give a small hint to help users transition from the old config format that didn't require path - officialPlugins := []string{"aws", "azure", "gcp", "digitalocean", "github", "heroku", "k8s", "okta", "terraform", "cloudflare"} - if funk.ContainsString(officialPlugins, s.Name) { - msg += fmt.Sprintf(". Hint: try setting path to cloudquery/%s in your config", s.Name) - } - return fmt.Errorf(msg) + if err := s.Metadata.Validate(); err != nil { + return err } if len(s.Tables) == 0 { return fmt.Errorf("tables configuration is required. Hint: set the tables you want to sync by adding `tables: [...]` or use `cloudquery tables` to list available tables") } - if s.Registry.NeedVersion() { - if s.Version == "" { - return fmt.Errorf("version is required") - } - if !strings.HasPrefix(s.Version, "v") { - return fmt.Errorf("version must start with v") - } - } if len(s.Destinations) == 0 { return fmt.Errorf("at least one destination is required") } @@ -140,7 +105,3 @@ func (s Source) VersionString() string { } return fmt.Sprintf("%s (%s@%s)", s.Name, pathParts[1], s.Version) } - -func (s Source) RegistryInferred() bool { - return s.registryInferred -} diff --git a/cli/internal/specs/v0/source_test.go b/cli/internal/specs/v0/source_test.go index df5dd10b2b2b64..0d32a9dd3832a1 100644 --- a/cli/internal/specs/v0/source_test.go +++ b/cli/internal/specs/v0/source_test.go @@ -26,8 +26,8 @@ spec: `, "failed to decode spec: json: cannot unmarshal number into Go struct field Source.name of type string", &Source{ - Name: "test", - Tables: []string{"*"}, + Metadata: Metadata{Name: "test"}, + Tables: []string{"*"}, }, }, { @@ -38,8 +38,8 @@ spec: `, `failed to decode spec: json: unknown field "namea"`, &Source{ - Name: "test", - Tables: []string{"*"}, + Metadata: Metadata{Name: "test"}, + Tables: []string{"*"}, }, }, } @@ -91,7 +91,6 @@ spec: spec: name: test path: cloudquery/test - tables: ["test"] `, "version is required", nil, @@ -103,7 +102,6 @@ spec: name: test path: cloudquery/test version: 1.1.0 - tables: ["test"] `, "version must start with v", nil, @@ -143,14 +141,16 @@ spec: `, "", &Source{ - Name: "test", - Registry: RegistryCloudQuery, - Path: "cloudquery/test", - Version: "v1.1.0", - Destinations: []string{"test"}, - Tables: []string{"test"}, - Spec: map[string]any{}, - registryInferred: true, + Metadata: Metadata{ + Name: "test", + Registry: RegistryCloudQuery, + Path: "cloudquery/test", + Version: "v1.1.0", + registryInferred: true, + }, + Destinations: []string{"test"}, + Tables: []string{"test"}, + Spec: map[string]any{}, }, }, { @@ -165,14 +165,16 @@ spec: `, "", &Source{ - Name: "test", - Registry: RegistryCloudQuery, - Path: "cloudquery/test", - Version: "v1.1.0", - Destinations: []string{"test"}, - Tables: []string{"test"}, - Spec: map[string]any{}, - registryInferred: true, + Metadata: Metadata{ + Name: "test", + Registry: RegistryCloudQuery, + Path: "cloudquery/test", + Version: "v1.1.0", + registryInferred: true, + }, + Destinations: []string{"test"}, + Tables: []string{"test"}, + Spec: map[string]any{}, }, }, { @@ -188,10 +190,12 @@ spec: `, "", &Source{ - Name: "test", - Registry: RegistryGithub, - Path: "cloudquery/test", - Version: "v1.1.0", + Metadata: Metadata{ + Name: "test", + Registry: RegistryGithub, + Path: "cloudquery/test", + Version: "v1.1.0", + }, Destinations: []string{"test"}, Tables: []string{"test"}, Spec: map[string]any{}, @@ -223,20 +227,14 @@ func TestSourceUnmarshalSpecValidate(t *testing.T) { } func TestSpec_VersionString(t *testing.T) { - type fields struct { - Name string - Version string - Path string - Registry Registry - } tests := []struct { - name string - fields fields - want string + name string + meta Metadata + want string }{ { name: "should use short version without name part in path when those are the same", - fields: fields{ + meta: Metadata{ Name: "aws", Version: "v10.0.0", Path: "cloudquery/aws", @@ -246,7 +244,7 @@ func TestSpec_VersionString(t *testing.T) { }, { name: "should use long version with path when name doesn't match path", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "cloudquery/aws", @@ -256,7 +254,7 @@ func TestSpec_VersionString(t *testing.T) { }, { name: "should handle non GitHub registry", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "localhost:7777", @@ -266,7 +264,7 @@ func TestSpec_VersionString(t *testing.T) { }, { name: "should handle malformed path", - fields: fields{ + meta: Metadata{ Name: "my-aws-spec", Version: "v10.0.0", Path: "aws", @@ -277,12 +275,7 @@ func TestSpec_VersionString(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - s := Source{ - Name: tt.fields.Name, - Version: tt.fields.Version, - Path: tt.fields.Path, - Registry: tt.fields.Registry, - } + s := Source{Metadata: tt.meta} if got := s.VersionString(); got != tt.want { t.Errorf("Source.String() = %v, want %v", got, tt.want) } diff --git a/cli/internal/specs/v0/spec_reader_test.go b/cli/internal/specs/v0/spec_reader_test.go index 52adf877996495..8595b37bfc2b82 100644 --- a/cli/internal/specs/v0/spec_reader_test.go +++ b/cli/internal/specs/v0/spec_reader_test.go @@ -43,12 +43,47 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, Tables: []string{"test"}}, - {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, + { + Metadata: Metadata{ + Name: "gcp", + Path: "cloudquery/gcp", + Version: "v1.0.0", + Registry: RegistryLocal, + }, + Destinations: []string{"postgresqlv2"}, + Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "aws", + Path: "cloudquery/aws", + Version: "v1.0.0", + Registry: RegistryLocal, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}}, - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite}, + { + Metadata: Metadata{ + Name: "postgresqlv2", + Path: "cloudquery/postgresql", + Version: "v1.0.0", + Registry: RegistryGrpc, + }, + WriteMode: WriteModeOverwrite, + Spec: map[string]any{"credentials": "mytestcreds"}, + }, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1.0.0", + Registry: RegistryGrpc, + }, + WriteMode: WriteModeOverwrite, + }, }, }, { @@ -58,12 +93,47 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresqlv2"}, Tables: []string{"test"}}, - {Name: "aws", Path: "cloudquery/aws", Version: "v1.0.0", Registry: RegistryLocal, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, + { + Metadata: Metadata{ + Name: "gcp", + Path: "cloudquery/gcp", + Version: "v1.0.0", + Registry: RegistryLocal, + }, + Destinations: []string{"postgresqlv2"}, + Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "aws", + Path: "cloudquery/aws", + Version: "v1.0.0", + Registry: RegistryLocal, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}}, - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.0.0", Registry: RegistryGrpc, WriteMode: WriteModeOverwrite}, + { + Metadata: Metadata{ + Name: "postgresqlv2", + Path: "cloudquery/postgresql", + Version: "v1.0.0", + Registry: RegistryGrpc, + }, + WriteMode: WriteModeOverwrite, + Spec: map[string]any{"credentials": "mytestcreds"}, + }, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1.0.0", + Registry: RegistryGrpc, + }, + WriteMode: WriteModeOverwrite, + }, }, }, { @@ -104,11 +174,40 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "aws", Path: "cloudquery/aws", Version: "v4.6.1", Registry: RegistryCloudQuery, Destinations: []string{"postgresql"}, Tables: []string{"test"}, registryInferred: true}, - {Name: "azure", Path: "cloudquery/azure", Version: "v1.3.3", Registry: RegistryCloudQuery, Destinations: []string{"postgresql"}, Tables: []string{"test"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "aws", + Path: "cloudquery/aws", + Version: "v4.6.1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "azure", + Path: "cloudquery/azure", + Version: "v1.3.3", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.6.3", Registry: RegistryCloudQuery, Spec: map[string]any{"connection_string": "postgresql://postgres:pass@localhost:5432/postgres"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1.6.3", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Spec: map[string]any{"connection_string": "postgresql://postgres:pass@localhost:5432/postgres"}, + }, }, }, { @@ -118,11 +217,40 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "aws", Path: "cloudquery/aws", Version: "v1", Registry: RegistryCloudQuery, Destinations: []string{"postgresql"}, Tables: []string{"test"}, registryInferred: true}, - {Name: "azure", Path: "cloudquery/azure", Version: "v1.3.3", Registry: RegistryCloudQuery, Destinations: []string{"postgresql", "postgresql"}, Tables: []string{"test"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "aws", + Path: "cloudquery/aws", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "azure", + Path: "cloudquery/azure", + Version: "v1.3.3", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"postgresql", "postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.6.3", Registry: RegistryCloudQuery, Spec: map[string]any{"connection_string": "postgresql://localhost:5432/cloudquery?sslmode=disable", "version": "#v1"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1.6.3", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Spec: map[string]any{"connection_string": "postgresql://localhost:5432/cloudquery?sslmode=disable", "version": "#v1"}, + }, }, envVariables: map[string]string{ "VERSION": "v1", @@ -137,11 +265,37 @@ var specLoaderTestCases = []specLoaderTestCase{ return "failed to expand environment variable in file testdata/env_variables.yml (section 3): env variable CONNECTION_STRING not found" }, sources: []*Source{ - {Name: "aws", Path: "cloudquery/aws", Version: "v1", Registry: RegistryGithub, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, - {Name: "azure", Path: "cloudquery/azure", Version: "v1.3.3", Registry: RegistryGithub, Destinations: []string{"postgresql", "postgresql"}, Tables: []string{"test"}}, + { + Metadata: Metadata{ + Name: "aws", + Path: "cloudquery/aws", + Version: "v1", + Registry: RegistryGithub, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "azure", + Path: "cloudquery/azure", + Version: "v1.3.3", + Registry: RegistryGithub, + }, + Destinations: []string{"postgresql", "postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.6.3", Registry: RegistryGithub, Spec: map[string]any{}}, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1.6.3", + Registry: RegistryGithub, + }, + Spec: map[string]any{}, + }, }, envVariables: map[string]string{ "VERSION": "v1", @@ -155,10 +309,28 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "test", Path: "cloudquery/test", Version: "v1", Registry: RegistryCloudQuery, Destinations: []string{"postgresql"}, Tables: []string{"test"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "test", + Path: "cloudquery/test", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"postgresql"}, Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1", Registry: RegistryCloudQuery, Spec: map[string]any{"custom_version": "#v1"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Spec: map[string]any{"custom_version": "#v1"}, + }, }, envVariables: map[string]string{ "VERSION": "v1", @@ -171,10 +343,27 @@ var specLoaderTestCases = []specLoaderTestCase{ return "failed to expand environment variable in file testdata/env_variable_in_string.yml (section 2): env variable VERSION not found" }, sources: []*Source{ - {Name: "test", Path: "cloudquery/test", Version: "v1", Registry: RegistryCloudQuery, Destinations: []string{"postgresql"}, Tables: []string{"test"}}, + { + Metadata: Metadata{ + Name: "test", + Path: "cloudquery/test", + Version: "v1", + Registry: RegistryCloudQuery, + }, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1", Registry: RegistryCloudQuery, Spec: map[string]any{}}, + { + Metadata: Metadata{ + Name: "postgresql", + Path: "cloudquery/postgresql", + Version: "v1", + Registry: RegistryCloudQuery, + }, + Spec: map[string]any{}, + }, }, envVariables: map[string]string{}, }, @@ -185,11 +374,38 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "0123456789", Path: "cloudquery/aws", Version: "v1", Registry: RegistryCloudQuery, Destinations: []string{"0987654321"}, Tables: []string{"test"}, registryInferred: true}, - {Name: "012345", Path: "cloudquery/aws", Version: "v1", Registry: RegistryCloudQuery, Destinations: []string{"0987654321"}, Tables: []string{"test"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "0123456789", + Path: "cloudquery/aws", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"0987654321"}, Tables: []string{"test"}, + }, + { + Metadata: Metadata{ + Name: "012345", + Path: "cloudquery/aws", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Destinations: []string{"0987654321"}, Tables: []string{"test"}, + }, }, destinations: []*Destination{ - {Name: "0987654321", Path: "cloudquery/postgresql", Version: "v1", Registry: RegistryCloudQuery, Spec: map[string]any{"connection_string": "postgresql://localhost:5432/cloudquery?sslmode=disable"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "0987654321", + Path: "cloudquery/postgresql", + Version: "v1", + Registry: RegistryCloudQuery, + registryInferred: true, + }, + Spec: map[string]any{"connection_string": "postgresql://localhost:5432/cloudquery?sslmode=disable"}, + }, }, envVariables: map[string]string{ "ACCOUNT_ID": "0123456789", @@ -202,10 +418,28 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Registry: RegistryCloudQuery, Version: "v1.0.0", Destinations: []string{"bigquery"}, Tables: []string{"*"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "gcp", + Path: "cloudquery/gcp", + Registry: RegistryCloudQuery, + Version: "v1.0.0", + registryInferred: true, + }, + Destinations: []string{"bigquery"}, Tables: []string{"*"}, + }, }, destinations: []*Destination{ - {Name: "bigquery", Path: "cloudquery/bigquery", Registry: RegistryCloudQuery, Version: "v3.1.0", Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "bigquery", + Path: "cloudquery/bigquery", + Registry: RegistryCloudQuery, + Version: "v3.1.0", + registryInferred: true, + }, + Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}, + }, }, }, { @@ -215,10 +449,27 @@ var specLoaderTestCases = []specLoaderTestCase{ return "" }, sources: []*Source{ - {Name: "gcp", Path: "cloudquery/gcp", Registry: RegistryCloudQuery, Version: "v1.0.0", Destinations: []string{"bigquery"}, Tables: []string{"*"}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "gcp", + Path: "cloudquery/gcp", + Registry: RegistryCloudQuery, + Version: "v1.0.0", + registryInferred: true, + }, + Destinations: []string{"bigquery"}, Tables: []string{"*"}, + }, }, destinations: []*Destination{ - {Name: "bigquery", Path: "cloudquery/bigquery", Registry: RegistryCloudQuery, Version: "v3.1.0", Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}, registryInferred: true}, + { + Metadata: Metadata{ + Name: "bigquery", + Path: "cloudquery/bigquery", + Registry: RegistryCloudQuery, + Version: "v3.1.0", + registryInferred: true, + }, + Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}}, }, }, } From da020491c5901a1f775515bd86eaaed2950c3b93 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Wed, 3 Jan 2024 15:44:21 +0200 Subject: [PATCH 057/166] feat: Add JSON schema for CLI specs (#15998) Closes https://github.com/cloudquery/cloudquery/issues/14658 --- .github/workflows/cli.yml | 6 +- cli/Makefile | 7 + cli/cmd/analytics.go | 4 +- cli/cmd/registry.go | 4 +- cli/cmd/specs.go | 4 +- cli/go.mod | 9 + cli/go.sum | 12 + cli/internal/specs/v0/destination.go | 18 +- cli/internal/specs/v0/destination_test.go | 53 ++- cli/internal/specs/v0/doc.go | 2 +- cli/internal/specs/v0/gen/main.go | 40 ++ cli/internal/specs/v0/kind.go | 62 +++ cli/internal/specs/v0/kind_test.go | 61 +++ cli/internal/specs/v0/metadata.go | 30 ++ cli/internal/specs/v0/metadata_test.go | 161 ++++++++ cli/internal/specs/v0/migrate_mode.go | 28 +- cli/internal/specs/v0/migrate_mode_test.go | 70 +++- cli/internal/specs/v0/pk_mode.go | 28 +- cli/internal/specs/v0/pk_mode_test.go | 70 +++- cli/internal/specs/v0/registry.go | 50 ++- cli/internal/specs/v0/registry_test.go | 90 ++++- cli/internal/specs/v0/schema.json | 332 ++++++++++++++++ cli/internal/specs/v0/source.go | 49 ++- cli/internal/specs/v0/source_test.go | 419 +++++++++++++++++++-- cli/internal/specs/v0/spec.go | 104 ++--- cli/internal/specs/v0/spec_reader_test.go | 32 +- cli/internal/specs/v0/spec_test.go | 92 +++++ cli/internal/specs/v0/write_mode.go | 31 +- cli/internal/specs/v0/write_mode_test.go | 78 +++- 29 files changed, 1727 insertions(+), 219 deletions(-) create mode 100644 cli/internal/specs/v0/gen/main.go create mode 100644 cli/internal/specs/v0/kind.go create mode 100644 cli/internal/specs/v0/kind_test.go create mode 100644 cli/internal/specs/v0/metadata_test.go create mode 100644 cli/internal/specs/v0/schema.json create mode 100644 cli/internal/specs/v0/spec_test.go diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index b7704b99251afc..84265ea322f77d 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -50,10 +50,10 @@ jobs: run: go build . - name: Test run: make test - - name: gen-docs + - name: gen if: matrix.os == 'ubuntu-latest' - run: make gen-docs - - name: Fail if docs are changed + run: make gen + - name: Fail if files are changed if: matrix.os == 'ubuntu-latest' run: test "$(git status -s ../website/pages/docs/reference/cli/*.md | wc -l)" -eq 0 validate-release: diff --git a/cli/Makefile b/cli/Makefile index 519f1b69e2faba..69db26ca25aa9b 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -11,3 +11,10 @@ test: gen-docs: rm -rf ../website/pages/docs/reference/cli/*.md go run main.go doc ../website/pages/docs/reference/cli/ + +.PHONY: gen-spec-schema +gen-spec-schema: + go run internal/specs/v0/gen/main.go + +.PHONY: gen +gen: gen-docs gen-spec-schema \ No newline at end of file diff --git a/cli/cmd/analytics.go b/cli/cmd/analytics.go index 565d26b2312031..c176f7a59e0326 100644 --- a/cli/cmd/analytics.go +++ b/cli/cmd/analytics.go @@ -65,7 +65,7 @@ func (c *AnalyticsClient) SendSyncMetrics(ctx context.Context, sourceSpec specs. } if c.client != nil { sourcePath := sourceSpec.Path - if sourceSpec.Registry == specs.RegistryLocal || sourceSpec.Registry == specs.RegistryGrpc { + if sourceSpec.Registry == specs.RegistryLocal || sourceSpec.Registry == specs.RegistryGRPC { _, sourcePath = path.Split(sourceSpec.Path) } syncSummary := &analytics.SyncSummary{ @@ -81,7 +81,7 @@ func (c *AnalyticsClient) SendSyncMetrics(ctx context.Context, sourceSpec specs. } for _, destinationSpec := range destinationsSpecs { destPath := destinationSpec.Path - if destinationSpec.Registry == specs.RegistryLocal || destinationSpec.Registry == specs.RegistryGrpc { + if destinationSpec.Registry == specs.RegistryLocal || destinationSpec.Registry == specs.RegistryGRPC { _, destPath = path.Split(destinationSpec.Path) } syncSummary.Destinations = append(syncSummary.Destinations, &analytics.Destination{ diff --git a/cli/cmd/registry.go b/cli/cmd/registry.go index 95812d4e420ef2..aed6ddc20964af 100644 --- a/cli/cmd/registry.go +++ b/cli/cmd/registry.go @@ -9,11 +9,11 @@ import ( func SpecRegistryToPlugin(registry specs.Registry) managedplugin.Registry { switch registry { - case specs.RegistryGithub: + case specs.RegistryGitHub: return managedplugin.RegistryGithub case specs.RegistryLocal: return managedplugin.RegistryLocal - case specs.RegistryGrpc: + case specs.RegistryGRPC: return managedplugin.RegistryGrpc case specs.RegistryDocker: return managedplugin.RegistryDocker diff --git a/cli/cmd/specs.go b/cli/cmd/specs.go index a3564340c81061..e8ea2b3eaf2dc5 100644 --- a/cli/cmd/specs.go +++ b/cli/cmd/specs.go @@ -9,11 +9,11 @@ import ( func CLIRegistryToPbRegistry(registry specs.Registry) pbSpecs.Registry { switch registry { - case specs.RegistryGithub: + case specs.RegistryGitHub: return pbSpecs.RegistryGithub case specs.RegistryLocal: return pbSpecs.RegistryLocal - case specs.RegistryGrpc: + case specs.RegistryGRPC: return pbSpecs.RegistryGrpc case specs.RegistryCloudQuery: return pbSpecs.RegistryCloudQuery diff --git a/cli/go.mod b/cli/go.mod index 0e100c62f0fe60..a48d6954ceb49c 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -7,6 +7,7 @@ require ( github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.3 + github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-pb-go v1.16.2 github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/distribution/reference v0.5.0 @@ -16,6 +17,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 + github.com/invopop/jsonschema v0.11.0 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/rs/zerolog v1.31.0 @@ -23,6 +25,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.4 github.com/thoas/go-funk v0.9.3 + github.com/wk8/go-ordered-map/v2 v2.1.8 golang.org/x/term v0.15.0 google.golang.org/grpc v1.60.1 google.golang.org/protobuf v1.31.0 @@ -42,7 +45,9 @@ require ( 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 + github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect @@ -106,6 +111,7 @@ require ( github.com/prometheus/procfs v0.6.0 // indirect github.com/rivo/uniseg v0.4.4 // 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/spf13/pflag v1.0.5 // indirect @@ -133,3 +139,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/cli/go.sum b/cli/go.sum index d512fd343c71dc..5a855c6dc19f8b 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -35,6 +35,8 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc= 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/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -42,6 +44,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r 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= @@ -60,6 +64,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= github.com/cloudquery/cloudquery-api-go v1.6.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-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.2 h1:Uj9cDsp/meAa7KEZglOFTHNIJDftmp7iUGj0ri1EUj4= github.com/cloudquery/plugin-pb-go v1.16.2/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= @@ -306,6 +314,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo= github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk= github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE= @@ -358,6 +368,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/cli/internal/specs/v0/destination.go b/cli/internal/specs/v0/destination.go index 80feee7d54ea1a..37b3d9884e5e21 100644 --- a/cli/internal/specs/v0/destination.go +++ b/cli/internal/specs/v0/destination.go @@ -7,13 +7,21 @@ import ( "strings" ) +// Destination plugin spec type Destination struct { Metadata - WriteMode WriteMode `json:"write_mode,omitempty"` - MigrateMode MigrateMode `json:"migrate_mode,omitempty"` - PKMode PKMode `json:"pk_mode,omitempty"` - Spec map[string]any `json:"spec,omitempty"` + // Destination plugin write mode + WriteMode WriteMode `json:"write_mode,omitempty" jsonschema:"default=overwrite-delete-stale"` + + // Destination plugin migrate mode + MigrateMode MigrateMode `json:"migrate_mode,omitempty" jsonschema:"default=safe"` + + // Destination plugin PK mode + PKMode PKMode `json:"pk_mode,omitempty" jsonschema:"default=default"` + + // Destination plugin own (nested) spec + Spec map[string]any `json:"spec,omitempty"` } func (*Destination) GetWarnings() Warnings { @@ -44,7 +52,7 @@ func (d *Destination) Validate() error { } func (d Destination) VersionString() string { - if d.Registry != RegistryGithub { + if d.Registry != RegistryGitHub { return fmt.Sprintf("%s (%s@%s)", d.Name, d.Registry, d.Path) } pathParts := strings.Split(d.Path, "/") diff --git a/cli/internal/specs/v0/destination_test.go b/cli/internal/specs/v0/destination_test.go index 32b8e9557468f0..fff831debc3ff6 100644 --- a/cli/internal/specs/v0/destination_test.go +++ b/cli/internal/specs/v0/destination_test.go @@ -3,6 +3,7 @@ package specs import ( "testing" + "github.com/cloudquery/codegen/jsonschema" "github.com/stretchr/testify/require" ) @@ -128,7 +129,7 @@ spec: &Destination{ Metadata: Metadata{ Name: "test", - Registry: RegistryGrpc, + Registry: RegistryGRPC, Path: "localhost:9999", }, Spec: map[string]any{}, @@ -185,7 +186,7 @@ spec: &Destination{ Metadata: Metadata{ Name: "test", - Registry: RegistryGithub, + Registry: RegistryGitHub, Path: "cloudquery/test", Version: "v1.1.0", }, @@ -231,7 +232,7 @@ func TestDestination_VersionString(t *testing.T) { Name: "aws", Version: "v10.0.0", Path: "cloudquery/aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "aws (v10.0.0)", }, @@ -241,7 +242,7 @@ func TestDestination_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "cloudquery/aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "my-aws-spec (aws@v10.0.0)", }, @@ -251,7 +252,7 @@ func TestDestination_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "localhost:7777", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, want: "my-aws-spec (grpc@localhost:7777)", }, @@ -261,7 +262,7 @@ func TestDestination_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "my-aws-spec (aws@v10.0.0)", }, @@ -275,3 +276,43 @@ func TestDestination_VersionString(t *testing.T) { }) } } + +func TestDestination_JSONSchema(t *testing.T) { + data, err := jsonschema.Generate(new(Destination)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `[]`, + }, + { + Name: "missing spec", + Spec: `{"name":"a","path":"b","registry":"local"}`, + }, + { + Name: "empty spec", + Spec: `{"name":"a","path":"b","registry":"local","spec":{}}`, + }, + { + Name: "null spec", + Spec: `{"name":"a","path":"b","registry":"local","spec":null}`, + }, + { + Name: "bad spec type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","spec":[]}`, + }, + // write_mode, migrate_mode & pk_mode are tested separately + }) +} diff --git a/cli/internal/specs/v0/doc.go b/cli/internal/specs/v0/doc.go index db22d708627883..bd6548f1cede3c 100644 --- a/cli/internal/specs/v0/doc.go +++ b/cli/internal/specs/v0/doc.go @@ -1,3 +1,3 @@ -// Package specs specs for source and destination plugins including +// Package specs includes specs for source and destination plugins including // parsers and readers. package specs diff --git a/cli/internal/specs/v0/gen/main.go b/cli/internal/specs/v0/gen/main.go new file mode 100644 index 00000000000000..d8e7088d4f904d --- /dev/null +++ b/cli/internal/specs/v0/gen/main.go @@ -0,0 +1,40 @@ +package main + +import ( + "fmt" + "log" + "path" + "reflect" + "runtime" + + "github.com/cloudquery/cloudquery/cli/internal/specs/v0" + cqgen_jsonschema "github.com/cloudquery/codegen/jsonschema" + "github.com/invopop/jsonschema" +) + +func main() { + fmt.Println("Generating JSON schema for CLI spec") + specsType := reflect.TypeOf(specs.Spec{}) + cqgen_jsonschema.GenerateIntoFile(new(specs.Spec), path.Join(currDir(), "..", "schema.json"), + cqgen_jsonschema.WithAddGoComments("github.com/cloudquery/cloudquery/cli/internal/specs/v0", path.Join(currDir(), "..")), + func(r *jsonschema.Reflector) { + r.AdditionalFields = func(t reflect.Type) []reflect.StructField { + if t == specsType { // we need to add the extra fields, as the `spec` field is just `any` + return reflect.VisibleFields(reflect.TypeOf(struct { + Source specs.Source + Destination specs.Destination + }{})) + } + return nil + } + }, + ) +} + +func currDir() string { + _, filename, _, ok := runtime.Caller(0) + if !ok { + log.Fatal("Failed to get caller information") + } + return path.Dir(filename) +} diff --git a/cli/internal/specs/v0/kind.go b/cli/internal/specs/v0/kind.go new file mode 100644 index 00000000000000..ff2560faeb5e1d --- /dev/null +++ b/cli/internal/specs/v0/kind.go @@ -0,0 +1,62 @@ +package specs + +import ( + "bytes" + "encoding/json" + "fmt" + + "github.com/invopop/jsonschema" +) + +type Kind int + +const ( + KindSource Kind = iota + KindDestination +) + +var ( + AllKinds = [...]string{ + KindSource: "source", + KindDestination: "destination", + } +) + +func (k Kind) String() string { + return AllKinds[k] +} + +func (k Kind) MarshalJSON() ([]byte, error) { + buffer := bytes.NewBufferString(`"`) + buffer.WriteString(k.String()) + buffer.WriteString(`"`) + return buffer.Bytes(), nil +} + +func (k *Kind) UnmarshalJSON(data []byte) (err error) { + var kind string + if err := json.Unmarshal(data, &kind); err != nil { + return err + } + if *k, err = KindFromString(kind); err != nil { + return err + } + return nil +} + +func (Kind) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = make([]any, len(AllKinds)) + for i, k := range AllKinds { + sc.Enum[i] = k + } +} + +func KindFromString(s string) (Kind, error) { + for k, str := range AllKinds { + if s == str { + return Kind(k), nil + } + } + return KindSource, fmt.Errorf("unknown kind %s", s) +} diff --git a/cli/internal/specs/v0/kind_test.go b/cli/internal/specs/v0/kind_test.go new file mode 100644 index 00000000000000..e6fb86f488bfa6 --- /dev/null +++ b/cli/internal/specs/v0/kind_test.go @@ -0,0 +1,61 @@ +package specs + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" +) + +func TestKindFromString(t *testing.T) { + k, err := KindFromString("source") + require.NoError(t, err) + require.Equal(t, KindSource, k) + + k, err = KindFromString("destination") + require.NoError(t, err) + require.Equal(t, KindDestination, k) + + k, err = KindFromString("Destination") + require.Error(t, err) + require.Equal(t, KindSource, k) + + k, err = KindFromString("") + require.Error(t, err) + require.Equal(t, KindSource, k) +} + +func TestKind_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(Kind)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `""`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "bad value", + Err: true, + Spec: `"extra"`, + }, + { + Name: "source", + Spec: `"source"`, + }, + { + Name: "destination", + Spec: `"destination"`, + }, + }) +} diff --git a/cli/internal/specs/v0/metadata.go b/cli/internal/specs/v0/metadata.go index 4b037b584bd85a..ac6bfc58625cd1 100644 --- a/cli/internal/specs/v0/metadata.go +++ b/cli/internal/specs/v0/metadata.go @@ -4,6 +4,9 @@ import ( "fmt" "slices" "strings" + + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" ) // Spec part to define exact plugin: name, version & location. @@ -69,6 +72,33 @@ func (m *Metadata) Validate() error { return nil } +// JSONSchemaExtend has to be in sync with Registry.NeedVersion +func (Metadata) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.If = &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := orderedmap.New[string, *jsonschema.Schema]() + registry := *sc.Properties.Value("registry") + registry.Enum = []any{RegistryUnset.String(), RegistryGitHub.String(), RegistryCloudQuery.String()} + registry.Description = "" + registry.Default = nil + properties.Set("registry", ®istry) + return properties + }(), + } + sc.Then = &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := orderedmap.New[string, *jsonschema.Schema]() + version := *sc.Properties.Value("version") + version.Pattern = `^v.*$` // v1.2.3, v1, v0 + version.Description = "" + version.Default = nil + properties.Set("version", &version) + return properties + }(), + Required: []string{"version"}, + } +} + func (m *Metadata) SetDefaults() { if m.Registry == RegistryUnset { m.Registry = RegistryCloudQuery diff --git a/cli/internal/specs/v0/metadata_test.go b/cli/internal/specs/v0/metadata_test.go new file mode 100644 index 00000000000000..11493d3b08ba27 --- /dev/null +++ b/cli/internal/specs/v0/metadata_test.go @@ -0,0 +1,161 @@ +package specs + +import ( + "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" +) + +func TestMetadata_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(Metadata)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, // name & path are always required + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "minimal", + Spec: `{"name":"a","path":"b","registry":"docker"}`, + }, + { + Name: "empty name", + Err: true, + Spec: `{"name":"","path":"b","registry":"docker"}`, + }, + { + Name: "null name", + Err: true, + Spec: `{"name":null,"path":"b","registry":"docker"}`, + }, + { + Name: "bad name type", + Err: true, + Spec: `{"name":123,"path":"b","registry":"docker"}`, + }, + { + Name: "empty path", + Err: true, + Spec: `{"name":"a","path":"","registry":"docker"}`, + }, + { + Name: "null path", + Err: true, + Spec: `{"name":"a","path":null,"registry":"docker"}`, + }, + { + Name: "bad path type", + Err: true, + Spec: `{"name":"a","path":123,"registry":"docker"}`, + }, + { + Name: "null registry", + Err: true, + Spec: `{"name":"a","path":"b","registry":null}`, + }, + { + Name: "bad registry type", + Err: true, + Spec: `{"name":"a","path":"b","registry":123}`, + }, + { + Name: "registry", + Err: true, + Spec: `{"name":"a","path":"b","registry":123}`, + }, + { + Name: "empty registry without version", + Err: true, // this will imply CQ, but CQ requires version + Spec: `{"name":"a","path":"b","registry":""}`, + }, + { + Name: "empty registry with version", + Spec: `{"name":"a","path":"b","registry":"","version":"v0"}`, + }, + { + Name: "github registry without version", + Err: true, // this requires version + Spec: `{"name":"a","path":"b","registry":"github"}`, + }, + { + Name: "github registry with version", + Spec: `{"name":"a","path":"b","registry":"github","version":"v0"}`, + }, + { + Name: "local registry without version", + Spec: `{"name":"a","path":"b","registry":"local"}`, + }, + { + Name: "local registry with version", // we just ignore version + Spec: `{"name":"a","path":"b","registry":"local","version":"v0"}`, + }, + { + Name: "grpc registry without version", + Spec: `{"name":"a","path":"b","registry":"grpc"}`, + }, + { + Name: "grpc registry with version", // we just ignore version + Spec: `{"name":"a","path":"b","registry":"grpc","version":"v0"}`, + }, + { + Name: "docker registry without version", + Spec: `{"name":"a","path":"b","registry":"docker"}`, + }, + { + Name: "docker registry with version", // we just ignore version + Spec: `{"name":"a","path":"b","registry":"docker","version":"v0"}`, + }, + { + Name: "cloudquery registry without version", + Err: true, // this requires version + Spec: `{"name":"a","path":"b","registry":"cloudquery"}`, + }, + { + Name: "cloudquery registry with version", + Spec: `{"name":"a","path":"b","registry":"cloudquery","version":"v0"}`, + }, + { + Name: "empty version", + Spec: `{"name":"a","path":"b","registry":"local","version":""}`, + }, + { + Name: "null version", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","version":null}`, + }, + { + Name: "bad version type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","version":123}`, + }, + { + Name: "bad version format when ignored", // we ignore version for registry: local + Spec: `{"name":"a","path":"b","registry":"local","version":"a"}`, + }, + { + Name: "proper version format when ignored", // we ignore version for registry: local + Spec: `{"name":"a","path":"b","registry":"local","version":"v0"}`, + }, + { + Name: "bad version format when accounted for", + Err: true, + Spec: `{"name":"a","path":"b","registry":"","version":"a"}`, + }, + { + Name: "proper version format when accounted for", + Spec: `{"name":"a","path":"b","registry":"","version":"v0"}`, + }, + }) +} diff --git a/cli/internal/specs/v0/migrate_mode.go b/cli/internal/specs/v0/migrate_mode.go index f821b0c2e86dff..d55a0da1fac4f2 100644 --- a/cli/internal/specs/v0/migrate_mode.go +++ b/cli/internal/specs/v0/migrate_mode.go @@ -4,6 +4,8 @@ import ( "bytes" "encoding/json" "fmt" + + "github.com/invopop/jsonschema" ) type MigrateMode int @@ -14,11 +16,14 @@ const ( ) var ( - migrateModeStrings = []string{"safe", "forced"} + AllMigrateModes = [...]string{ + MigrateModeSafe: "safe", + MigrateModeForced: "forced", + } ) func (m MigrateMode) String() string { - return migrateModeStrings[m] + return AllMigrateModes[m] } func (m MigrateMode) MarshalJSON() ([]byte, error) { @@ -39,12 +44,19 @@ func (m *MigrateMode) UnmarshalJSON(data []byte) (err error) { return nil } +func (MigrateMode) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = make([]any, len(AllMigrateModes)) + for i, k := range AllMigrateModes { + sc.Enum[i] = k + } +} + func MigrateModeFromString(s string) (MigrateMode, error) { - switch s { - case "safe": - return MigrateModeSafe, nil - case "forced": - return MigrateModeForced, nil + for m, str := range AllMigrateModes { + if s == str { + return MigrateMode(m), nil + } } - return 0, fmt.Errorf("invalid migrate mode: %s", s) + return MigrateModeSafe, fmt.Errorf("invalid migrate mode: %s", s) } diff --git a/cli/internal/specs/v0/migrate_mode_test.go b/cli/internal/specs/v0/migrate_mode_test.go index 34bc2efbb94bde..3dd12c029e038d 100644 --- a/cli/internal/specs/v0/migrate_mode_test.go +++ b/cli/internal/specs/v0/migrate_mode_test.go @@ -2,26 +2,66 @@ package specs import ( "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" ) func TestMigrateModeFromString(t *testing.T) { - var migrateMode MigrateMode - if err := migrateMode.UnmarshalJSON([]byte(`"forced"`)); err != nil { - t.Fatal(err) - } - if migrateMode != MigrateModeForced { - t.Fatalf("expected MigrateModeForced, got %v", migrateMode) - } - if err := migrateMode.UnmarshalJSON([]byte(`"safe"`)); err != nil { - t.Fatal(err) - } - if migrateMode != MigrateModeSafe { - t.Fatalf("expected MigrateModeSafe, got %v", migrateMode) - } + m, err := MigrateModeFromString("safe") + require.NoError(t, err) + require.Equal(t, MigrateModeSafe, m) + + m, err = MigrateModeFromString("forced") + require.NoError(t, err) + require.Equal(t, MigrateModeForced, m) + + m, err = MigrateModeFromString("Forced") + require.Error(t, err) + require.Equal(t, MigrateModeSafe, m) + + m, err = MigrateModeFromString("") + require.Error(t, err) + require.Equal(t, MigrateModeSafe, m) +} + +func TestMigrateMode_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(MigrateMode)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `""`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "bad value", + Err: true, + Spec: `"extra"`, + }, + { + Name: "safe", + Spec: `"safe"`, + }, + { + Name: "forced", + Spec: `"forced"`, + }, + }) } -func TestMigrateMode(t *testing.T) { - for _, migrateModeStr := range migrateModeStrings { +func TestMigrateModeRoundTrip(t *testing.T) { + for _, migrateModeStr := range AllMigrateModes { migrateMode, err := MigrateModeFromString(migrateModeStr) if err != nil { t.Fatal(err) diff --git a/cli/internal/specs/v0/pk_mode.go b/cli/internal/specs/v0/pk_mode.go index 38c22bb1b73a74..54bfd272806d26 100644 --- a/cli/internal/specs/v0/pk_mode.go +++ b/cli/internal/specs/v0/pk_mode.go @@ -4,6 +4,8 @@ import ( "bytes" "encoding/json" "fmt" + + "github.com/invopop/jsonschema" ) type PKMode int @@ -14,11 +16,14 @@ const ( ) var ( - pkModeStrings = []string{"default", "cq-id-only"} + AllPKModes = [...]string{ + PKModeDefaultKeys: "default", + PKModeCQID: "cq-id-only", + } ) func (m PKMode) String() string { - return pkModeStrings[m] + return AllPKModes[m] } func (m PKMode) MarshalJSON() ([]byte, error) { @@ -39,12 +44,19 @@ func (m *PKMode) UnmarshalJSON(data []byte) (err error) { return nil } +func (PKMode) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = make([]any, len(AllPKModes)) + for i, k := range AllPKModes { + sc.Enum[i] = k + } +} + func PKModeFromString(s string) (PKMode, error) { - switch s { - case "default": - return PKModeDefaultKeys, nil - case "cq-id-only": - return PKModeCQID, nil + for m, str := range AllPKModes { + if s == str { + return PKMode(m), nil + } } - return 0, fmt.Errorf("invalid pk mode: %s", s) + return PKModeDefaultKeys, fmt.Errorf("invalid pk mode: %s", s) } diff --git a/cli/internal/specs/v0/pk_mode_test.go b/cli/internal/specs/v0/pk_mode_test.go index 198d185ead0b62..c590fd58bd8b30 100644 --- a/cli/internal/specs/v0/pk_mode_test.go +++ b/cli/internal/specs/v0/pk_mode_test.go @@ -2,26 +2,66 @@ package specs import ( "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" ) func TestPKModeFromString(t *testing.T) { - var pkMode PKMode - if err := pkMode.UnmarshalJSON([]byte(`"cq-id-only"`)); err != nil { - t.Fatal(err) - } - if pkMode != PKModeCQID { - t.Fatalf("expected PKModeCQID, got %v", pkMode) - } - if err := pkMode.UnmarshalJSON([]byte(`"default"`)); err != nil { - t.Fatal(err) - } - if pkMode != PKModeDefaultKeys { - t.Fatalf("expected PKModeCompositeKeys, got %v", pkMode) - } + m, err := PKModeFromString("default") + require.NoError(t, err) + require.Equal(t, PKModeDefaultKeys, m) + + m, err = PKModeFromString("cq-id-only") + require.NoError(t, err) + require.Equal(t, PKModeCQID, m) + + m, err = PKModeFromString("Default") + require.Error(t, err) + require.Equal(t, PKModeDefaultKeys, m) + + m, err = PKModeFromString("") + require.Error(t, err) + require.Equal(t, PKModeDefaultKeys, m) +} + +func TestPKMode_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(PKMode)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `""`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "bad value", + Err: true, + Spec: `"extra"`, + }, + { + Name: "default", + Spec: `"default"`, + }, + { + Name: "cq-id-only", + Spec: `"cq-id-only"`, + }, + }) } -func TestPKMode(t *testing.T) { - for _, pkModeStr := range pkModeStrings { +func TestPKModeRoundTrip(t *testing.T) { + for _, pkModeStr := range AllPKModes { pkMode, err := PKModeFromString(pkModeStr) if err != nil { t.Fatal(err) diff --git a/cli/internal/specs/v0/registry.go b/cli/internal/specs/v0/registry.go index 07b41f41478a8f..91f73fef08c153 100644 --- a/cli/internal/specs/v0/registry.go +++ b/cli/internal/specs/v0/registry.go @@ -4,21 +4,34 @@ import ( "bytes" "encoding/json" "fmt" + + "github.com/invopop/jsonschema" ) type Registry int const ( RegistryUnset Registry = iota - RegistryGithub + RegistryGitHub RegistryLocal - RegistryGrpc + RegistryGRPC RegistryDocker RegistryCloudQuery ) +var ( + AllRegistries = [...]string{ + RegistryUnset: "", + RegistryGitHub: "github", + RegistryLocal: "local", + RegistryGRPC: "grpc", + RegistryDocker: "docker", + RegistryCloudQuery: "cloudquery", + } +) + func (r Registry) String() string { - return [...]string{"", "github", "local", "grpc", "docker", "cloudquery"}[r] + return AllRegistries[r] } func (r Registry) MarshalJSON() ([]byte, error) { @@ -39,25 +52,24 @@ func (r *Registry) UnmarshalJSON(data []byte) (err error) { return nil } +func (Registry) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = make([]any, len(AllRegistries)) + for i, k := range AllRegistries { + sc.Enum[i] = k + } +} + +// NeedVersion has to be in sync with Metadata.JSONSchemaExtend func (r Registry) NeedVersion() bool { - return r == RegistryGithub || r == RegistryCloudQuery + return r == RegistryGitHub || r == RegistryCloudQuery } func RegistryFromString(s string) (Registry, error) { - switch s { - case "": - return RegistryUnset, nil - case "github": - return RegistryGithub, nil - case "local": - return RegistryLocal, nil - case "grpc": - return RegistryGrpc, nil - case "docker": - return RegistryDocker, nil - case "cloudquery": - return RegistryCloudQuery, nil - default: - return RegistryGithub, fmt.Errorf("unknown registry %q", s) + for r, str := range AllRegistries { + if s == str { + return Registry(r), nil + } } + return RegistryUnset, fmt.Errorf("unknown registry %q", s) } diff --git a/cli/internal/specs/v0/registry_test.go b/cli/internal/specs/v0/registry_test.go index 1ae64b17cad2c0..fbe1df6e102ad8 100644 --- a/cli/internal/specs/v0/registry_test.go +++ b/cli/internal/specs/v0/registry_test.go @@ -4,11 +4,13 @@ import ( "encoding/json" "testing" + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) func TestRegistryJsonMarshalUnmarshal(t *testing.T) { - b, err := json.Marshal(RegistryGrpc) + b, err := json.Marshal(RegistryGRPC) if err != nil { t.Fatal("failed to marshal registry:", err) } @@ -16,13 +18,13 @@ func TestRegistryJsonMarshalUnmarshal(t *testing.T) { if err := json.Unmarshal(b, ®istry); err != nil { t.Fatal("failed to unmarshal registry:", err) } - if registry != RegistryGrpc { + if registry != RegistryGRPC { t.Fatal("expected registry to be grpc, but got:", registry) } } func TestRegistryYamlMarshalUnmarshal(t *testing.T) { - b, err := yaml.Marshal(RegistryGrpc) + b, err := yaml.Marshal(RegistryGRPC) if err != nil { t.Fatal("failed to marshal registry:", err) } @@ -30,7 +32,87 @@ func TestRegistryYamlMarshalUnmarshal(t *testing.T) { if err := yaml.Unmarshal(b, ®istry); err != nil { t.Fatal("failed to unmarshal registry:", err) } - if registry != RegistryGrpc { + if registry != RegistryGRPC { t.Fatal("expected registry to be github, but got:", registry) } } + +func TestRegistryFromString(t *testing.T) { + r, err := RegistryFromString("") + require.NoError(t, err) + require.Equal(t, RegistryUnset, r) + + r, err = RegistryFromString("github") + require.NoError(t, err) + require.Equal(t, RegistryGitHub, r) + + r, err = RegistryFromString("local") + require.NoError(t, err) + require.Equal(t, RegistryLocal, r) + + r, err = RegistryFromString("grpc") + require.NoError(t, err) + require.Equal(t, RegistryGRPC, r) + + r, err = RegistryFromString("docker") + require.NoError(t, err) + require.Equal(t, RegistryDocker, r) + + r, err = RegistryFromString("cloudquery") + require.NoError(t, err) + require.Equal(t, RegistryCloudQuery, r) + + r, err = RegistryFromString("CloudQuery") + require.Error(t, err) + require.Equal(t, RegistryUnset, r) +} + +func TestRegistry_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(Registry)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Spec: `""`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "bad value", + Err: true, + Spec: `"extra"`, + }, + { + Name: "unset", + Spec: `""`, + }, + { + Name: "github", + Spec: `"github"`, + }, + { + Name: "local", + Spec: `"local"`, + }, + { + Name: "grpc", + Spec: `"grpc"`, + }, + { + Name: "docker", + Spec: `"docker"`, + }, + { + Name: "cloudquery", + Spec: `"cloudquery"`, + }, + }) +} diff --git a/cli/internal/specs/v0/schema.json b/cli/internal/specs/v0/schema.json new file mode 100644 index 00000000000000..7518c80c64e3a7 --- /dev/null +++ b/cli/internal/specs/v0/schema.json @@ -0,0 +1,332 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "https://github.com/cloudquery/cloudquery/cli/internal/specs/v0/spec", + "$ref": "#/$defs/Spec", + "$defs": { + "BackendOptions": { + "properties": { + "table_name": { + "type": "string", + "minLength": 1, + "description": "The name of the table to store the key-value pairs for incremental progress." + }, + "connection": { + "type": "string", + "minLength": 1, + "description": "Connection string for the destination plugin.\nCan be either `@@plugin.name.connection` or a fully-qualified gRPC connection string." + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "table_name", + "connection" + ], + "description": "Backend options to be used in conjunction with incremental tables (stores the incremental progres)" + }, + "Destination": { + "if": { + "properties": { + "registry": { + "type": "string", + "enum": [ + "", + "github", + "cloudquery" + ] + } + } + }, + "then": { + "properties": { + "version": { + "type": "string", + "pattern": "^v.*$" + } + }, + "required": [ + "version" + ] + }, + "properties": { + "name": { + "type": "string", + "minLength": 1, + "description": "Name of the plugin to use" + }, + "version": { + "type": "string", + "description": "Version of the plugin to be used" + }, + "path": { + "type": "string", + "minLength": 1, + "description": "Path is the canonical path to the plugin in a given registry\nFor example:\n* for `registry: github` the `path` will be: `org/repo`\n* for `registry: local` the `path` will be the path to the binary: `./path/to/binary`\n* for `registry: grpc` the `path` will be the address of the gRPC server: `host:port`" + }, + "registry": { + "type": "string", + "enum": [ + "", + "github", + "local", + "grpc", + "docker", + "cloudquery" + ], + "description": "Registry can be \"\", \"github\", \"local\", \"grpc\", \"docker\", \"cloudquery\"", + "default": "cloudquery" + }, + "write_mode": { + "type": "string", + "enum": [ + "overwrite-delete-stale", + "overwrite", + "append" + ], + "description": "Destination plugin write mode", + "default": "overwrite-delete-stale" + }, + "migrate_mode": { + "type": "string", + "enum": [ + "safe", + "forced" + ], + "description": "Destination plugin migrate mode", + "default": "safe" + }, + "pk_mode": { + "type": "string", + "enum": [ + "default", + "cq-id-only" + ], + "description": "Destination plugin PK mode", + "default": "default" + }, + "spec": { + "oneOf": [ + { + "type": "object", + "description": "Destination plugin own (nested) spec" + }, + { + "type": "null" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "name", + "path" + ], + "description": "Destination plugin spec" + }, + "Source": { + "if": { + "properties": { + "registry": { + "type": "string", + "enum": [ + "", + "github", + "cloudquery" + ] + } + } + }, + "then": { + "properties": { + "version": { + "type": "string", + "pattern": "^v.*$" + } + }, + "required": [ + "version" + ] + }, + "properties": { + "name": { + "type": "string", + "minLength": 1, + "description": "Name of the plugin to use" + }, + "version": { + "type": "string", + "description": "Version of the plugin to be used" + }, + "path": { + "type": "string", + "minLength": 1, + "description": "Path is the canonical path to the plugin in a given registry\nFor example:\n* for `registry: github` the `path` will be: `org/repo`\n* for `registry: local` the `path` will be the path to the binary: `./path/to/binary`\n* for `registry: grpc` the `path` will be the address of the gRPC server: `host:port`" + }, + "registry": { + "type": "string", + "enum": [ + "", + "github", + "local", + "grpc", + "docker", + "cloudquery" + ], + "description": "Registry can be \"\", \"github\", \"local\", \"grpc\", \"docker\", \"cloudquery\"", + "default": "cloudquery" + }, + "tables": { + "items": { + "type": "string", + "minLength": 1 + }, + "type": "array", + "minItems": 1, + "description": "Tables to sync from the source plugin" + }, + "skip_tables": { + "oneOf": [ + { + "items": { + "type": "string", + "minLength": 1 + }, + "type": "array", + "description": "SkipTables defines tables to skip when syncing data. Useful if a glob pattern is used in Tables" + }, + { + "type": "null" + } + ] + }, + "skip_dependent_tables": { + "type": "boolean", + "description": "SkipDependentTables changes the matching behavior with regard to dependent tables. If set to true, dependent tables will not be synced unless they are explicitly matched by Tables.", + "default": false + }, + "destinations": { + "items": { + "type": "string", + "minLength": 1 + }, + "type": "array", + "minItems": 1, + "description": "Destinations are the names of destination plugins to send sync data to" + }, + "backend_options": { + "oneOf": [ + { + "$ref": "#/$defs/BackendOptions", + "description": "Optional Backend options for sync operation" + }, + { + "type": "null" + } + ] + }, + "spec": { + "oneOf": [ + { + "type": "object", + "description": "Source plugin own (nested) spec" + }, + { + "type": "null" + } + ] + }, + "deterministic_cq_id": { + "type": "boolean", + "description": "DeterministicCQID is a flag that indicates whether the source plugin should generate a random UUID as the value of `_cq_id`\nor whether it should calculate a UUID that is a hash of the primary keys (if they exist) or the entire resource.", + "default": false + }, + "otel_endpoint": { + "type": "string", + "description": "If specified this will spawn the plugin with `--otel-endpoint`", + "default": "" + }, + "otel_endpoint_insecure": { + "type": "boolean", + "description": "If specified this will spawn the plugin with `--otel-endpoint-insecure`", + "default": false + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "name", + "path", + "tables", + "destinations" + ], + "description": "Source plugin spec" + }, + "Spec": { + "allOf": [ + { + "if": { + "properties": { + "kind": { + "type": "string", + "const": "source", + "description": "CloudQuery plugin kind" + } + } + }, + "then": { + "properties": { + "spec": { + "$ref": "#/$defs/Source" + } + } + } + }, + { + "if": { + "properties": { + "kind": { + "type": "string", + "const": "destination", + "description": "CloudQuery plugin kind" + } + } + }, + "then": { + "properties": { + "spec": { + "$ref": "#/$defs/Destination" + } + } + } + } + ], + "properties": { + "kind": { + "type": "string", + "enum": [ + "source", + "destination" + ], + "description": "CloudQuery plugin kind" + }, + "spec": { + "oneOf": [ + { + "$ref": "#/$defs/Source" + }, + { + "$ref": "#/$defs/Destination" + } + ] + } + }, + "additionalProperties": false, + "type": "object", + "required": [ + "kind", + "spec" + ] + } + } +} diff --git a/cli/internal/specs/v0/source.go b/cli/internal/specs/v0/source.go index ec62d6d0e41a6d..209bbdba6847e3 100644 --- a/cli/internal/specs/v0/source.go +++ b/cli/internal/specs/v0/source.go @@ -6,47 +6,54 @@ import ( "fmt" "slices" "strings" + + "github.com/invopop/jsonschema" ) +// Backend options to be used in conjunction with incremental tables (stores the incremental progres) type BackendOptions struct { - TableName string `json:"table_name,omitempty"` - Connection string `json:"connection,omitempty"` + // The name of the table to store the key-value pairs for incremental progress. + TableName string `json:"table_name,omitempty" jsonschema:"required,minLength=1"` + + // Connection string for the destination plugin. + // Can be either `@@plugin.name.connection` or a fully-qualified gRPC connection string. + Connection string `json:"connection,omitempty" jsonschema:"required,minLength=1"` } -// Source is the spec for a source plugin +// Source plugin spec type Source struct { Metadata // Tables to sync from the source plugin - Tables []string `json:"tables,omitempty"` + Tables []string `json:"tables,omitempty" jsonschema:"required,minItems=1,minLength=1"` // SkipTables defines tables to skip when syncing data. Useful if a glob pattern is used in Tables - SkipTables []string `json:"skip_tables,omitempty"` + SkipTables []string `json:"skip_tables,omitempty" jsonschema:"minLength=1"` // SkipDependentTables changes the matching behavior with regard to dependent tables. If set to true, dependent tables will not be synced unless they are explicitly matched by Tables. - SkipDependentTables bool `json:"skip_dependent_tables,omitempty"` + SkipDependentTables bool `json:"skip_dependent_tables,omitempty" jsonschema:"default=false"` // Destinations are the names of destination plugins to send sync data to - Destinations []string `json:"destinations,omitempty"` + Destinations []string `json:"destinations,omitempty" jsonschema:"required,minItems=1,minLength=1"` // Optional Backend options for sync operation BackendOptions *BackendOptions `json:"backend_options,omitempty"` - // Spec defines plugin specific configuration - // This is different in every source plugin. + // Source plugin own (nested) spec Spec map[string]any `json:"spec,omitempty"` - // DeterministicCQID is a flag that indicates whether the source plugin should generate a random UUID as the value of _cq_id + // DeterministicCQID is a flag that indicates whether the source plugin should generate a random UUID as the value of `_cq_id` // or whether it should calculate a UUID that is a hash of the primary keys (if they exist) or the entire resource. - DeterministicCQID bool `json:"deterministic_cq_id,omitempty"` + DeterministicCQID bool `json:"deterministic_cq_id,omitempty" jsonschema:"default=false"` - // If specified this will spawn the plugin with --otel-endpoint - OtelEndpoint string `json:"otel_endpoint,omitempty"` - // If specified this will spawn the plugin with --otel-endpoint-insecure - OtelEndpointInsecure bool `json:"otel_endpoint_insecure,omitempty"` + // If specified this will spawn the plugin with `--otel-endpoint` + OtelEndpoint string `json:"otel_endpoint,omitempty" jsonschema:"default="` + // If specified this will spawn the plugin with `--otel-endpoint-insecure` + OtelEndpointInsecure bool `json:"otel_endpoint_insecure,omitempty" jsonschema:"default=false"` } // GetWarnings returns a list of deprecated options that were used in the source config. This should be // called before SetDefaults. func (s *Source) GetWarnings() Warnings { warnings := make(map[string]string) + if s.SkipDependentTables && slices.Contains(s.Tables, "*") { warnings["skip_dependent_tables"] = "the `skip_dependent_tables` option is ineffective when used with '*' `tables`" } @@ -76,6 +83,16 @@ func (s *Source) UnmarshalSpec(out any) error { return dec.Decode(out) } +func (Source) JSONSchemaExtend(sc *jsonschema.Schema) { + tables := sc.Properties.Value("tables") + *tables = *tables.OneOf[0] // only value + + destinations := sc.Properties.Value("destinations") + *destinations = *destinations.OneOf[0] // only value + + Metadata{}.JSONSchemaExtend(sc) // have to call manually +} + func (s *Source) Validate() error { if err := s.Metadata.Validate(); err != nil { return err @@ -93,7 +110,7 @@ func (s *Source) Validate() error { } func (s Source) VersionString() string { - if s.Registry != RegistryGithub { + if s.Registry != RegistryGitHub { return fmt.Sprintf("%s (%s@%s)", s.Name, s.Registry, s.Path) } pathParts := strings.Split(s.Path, "/") diff --git a/cli/internal/specs/v0/source_test.go b/cli/internal/specs/v0/source_test.go index 0d32a9dd3832a1..424066bd6865ce 100644 --- a/cli/internal/specs/v0/source_test.go +++ b/cli/internal/specs/v0/source_test.go @@ -3,6 +3,7 @@ package specs import ( "testing" + "github.com/cloudquery/codegen/jsonschema" "github.com/stretchr/testify/require" ) @@ -129,30 +130,6 @@ spec: "at least one destination is required", nil, }, - { - "valid_scheduler", - `kind: source -spec: - name: test - path: cloudquery/test - version: v1.1.0 - destinations: ["test"] - tables: ["test"] -`, - "", - &Source{ - Metadata: Metadata{ - Name: "test", - Registry: RegistryCloudQuery, - Path: "cloudquery/test", - Version: "v1.1.0", - registryInferred: true, - }, - Destinations: []string{"test"}, - Tables: []string{"test"}, - Spec: map[string]any{}, - }, - }, { "success", `kind: source @@ -192,7 +169,7 @@ spec: &Source{ Metadata: Metadata{ Name: "test", - Registry: RegistryGithub, + Registry: RegistryGitHub, Path: "cloudquery/test", Version: "v1.1.0", }, @@ -238,7 +215,7 @@ func TestSpec_VersionString(t *testing.T) { Name: "aws", Version: "v10.0.0", Path: "cloudquery/aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "aws (v10.0.0)", }, @@ -248,7 +225,7 @@ func TestSpec_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "cloudquery/aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "my-aws-spec (aws@v10.0.0)", }, @@ -258,7 +235,7 @@ func TestSpec_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "localhost:7777", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, want: "my-aws-spec (grpc@localhost:7777)", }, @@ -268,7 +245,7 @@ func TestSpec_VersionString(t *testing.T) { Name: "my-aws-spec", Version: "v10.0.0", Path: "aws", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, want: "my-aws-spec (aws@v10.0.0)", }, @@ -282,3 +259,387 @@ func TestSpec_VersionString(t *testing.T) { }) } } + +func TestBackendOptions_JSONSchema(t *testing.T) { + data, err := jsonschema.Generate(new(BackendOptions)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, + }, + { + Name: "missing table_name", + Err: true, + Spec: `{"connection":"a"}`, + }, + { + Name: "empty table_name", + Err: true, + Spec: `{"table_name":"","connection":"a"}`, + }, + { + Name: "null table_name", + Err: true, + Spec: `{"table_name":null,"connection":"a"}`, + }, + { + Name: "bad table_name type", + Err: true, + Spec: `{"table_name":123,"connection":"a"}`, + }, + { + Name: "missing connection", + Err: true, + Spec: `{"table_name":"a"}`, + }, + { + Name: "empty connection", + Err: true, + Spec: `{"table_name":"a","connection":""}`, + }, + { + Name: "null connection", + Err: true, + Spec: `{"table_name":"a","connection":null}`, + }, + { + Name: "bad connection type", + Err: true, + Spec: `{"table_name":"a","connection":123}`, + }, + { + Name: "proper", + Spec: `{"table_name":"a","connection":"b"}`, + }, + }) +} + +func TestSource_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(Source)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `[]`, + }, + { + Name: "missing spec", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"]}`, + }, + { + Name: "empty spec", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"],"spec":{}}`, + }, + { + Name: "null spec", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"],"spec":null}`, + }, + { + Name: "bad spec type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"],"spec":[]}`, + }, + { + Name: "missing tables", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"]}`, + }, + { + Name: "empty tables", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":[] +}`, + }, + { + Name: "null tables", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":null +}`, + }, + { + Name: "bad tables type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":123 +}`, + }, + { + Name: "empty tables entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":[""] +}`, + }, + { + Name: "null tables entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":[null] +}`, + }, + { + Name: "bad tables entry type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":[123] +}`, + }, + { + Name: "proper tables", + Spec: `{"name":"a","path":"b","registry":"local","destinations":["a"], +"tables":["*"] +}`, + }, + { + Name: "missing destinations", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"]}`, + }, + { + Name: "empty destinations", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":[] +}`, + }, + { + Name: "null destinations", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":null +}`, + }, + { + Name: "bad destinations type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":123 +}`, + }, + { + Name: "empty destinations entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":[""] +}`, + }, + { + Name: "null destinations entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":[null] +}`, + }, + { + Name: "bad destinations entry type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":[123] +}`, + }, + { + Name: "proper destinations", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"], +"destinations":["a"] +}`, + }, + { + Name: "empty skip_tables", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":[] +}`, + }, + { + Name: "null skip_tables", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":null +}`, + }, + { + Name: "bad skip_tables type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":123 +}`, + }, + { + Name: "empty skip_tables entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":[""] +}`, + }, + { + Name: "null skip_tables entry", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":[null] +}`, + }, + { + Name: "bad skip_tables entry type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":[123] +}`, + }, + { + Name: "proper skip_tables", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_tables":["a"] +}`, + }, + { + Name: "null skip_dependent_tables", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_dependent_tables":null +}`, + }, + { + Name: "bad skip_dependent_tables type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_dependent_tables":123 +}`, + }, + { + Name: "skip_dependent_tables:true", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_dependent_tables":true +}`, + }, + { + Name: "skip_dependent_tables:false", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"skip_dependent_tables":false +}`, + }, + // backend_options is tested in depth separately + { + Name: "null backend_options", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"backend_options":null +}`, + }, + { + Name: "bad backend_options type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"backend_options":123 +}`, + }, + { + Name: "empty spec", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"spec":{} +}`, + }, + { + Name: "null spec", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"spec":null +}`, + }, + { + Name: "bad spec type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"spec":123 +}`, + }, + { + Name: "null deterministic_cq_id", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"deterministic_cq_id":null +}`, + }, + { + Name: "bad deterministic_cq_id type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"deterministic_cq_id":123 +}`, + }, + { + Name: "deterministic_cq_id:true", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"deterministic_cq_id":true +}`, + }, + { + Name: "deterministic_cq_id:false", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"deterministic_cq_id":false +}`, + }, + { + Name: "empty otel_endpoint", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint":"" +}`, + }, + { + Name: "null otel_endpoint", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint":null +}`, + }, + { + Name: "bad otel_endpoint type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint":123 +}`, + }, + { + Name: "proper otel_endpoint", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint":"a" +}`, + }, + { + Name: "null otel_endpoint_insecure", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint_insecure":null +}`, + }, + { + Name: "bad otel_endpoint_insecure type", + Err: true, + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint_insecure":123 +}`, + }, + { + Name: "otel_endpoint_insecure:true", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint_insecure":true +}`, + }, + { + Name: "otel_endpoint_insecure:false", + Spec: `{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a"], +"otel_endpoint_insecure":false +}`, + }, + }) +} diff --git a/cli/internal/specs/v0/spec.go b/cli/internal/specs/v0/spec.go index 6f087b7e13bbe0..1639f3d4bb2bad 100644 --- a/cli/internal/specs/v0/spec.go +++ b/cli/internal/specs/v0/spec.go @@ -6,54 +6,19 @@ import ( "fmt" "github.com/ghodss/yaml" + "github.com/invopop/jsonschema" + orderedmap "github.com/wk8/go-ordered-map/v2" ) // Warnings is a map of field name to string, used mainly for deprecation notices. type Warnings map[string]string -type Kind int - type Spec struct { - Kind Kind `json:"kind"` - Spec any `json:"spec"` -} - -const ( - KindSource Kind = iota - KindDestination -) - -func (k Kind) String() string { - return [...]string{"source", "destination"}[k] -} - -func (k Kind) MarshalJSON() ([]byte, error) { - buffer := bytes.NewBufferString(`"`) - buffer.WriteString(k.String()) - buffer.WriteString(`"`) - return buffer.Bytes(), nil -} - -func (k *Kind) UnmarshalJSON(data []byte) (err error) { - var kind string - if err := json.Unmarshal(data, &kind); err != nil { - return err - } - if *k, err = KindFromString(kind); err != nil { - return err - } - return nil -} + // CloudQuery plugin kind + Kind Kind `json:"kind" jsonschema:"required"` -func KindFromString(s string) (Kind, error) { - switch s { - case "source": - return KindSource, nil - case "destination": - return KindDestination, nil - default: - return KindSource, fmt.Errorf("unknown kind %s", s) - } + // CloudQuery plugin (top-level) spec + Spec any `json:"spec" jsonschema:"required"` } func (s *Spec) UnmarshalJSON(data []byte) error { @@ -86,11 +51,58 @@ func (s *Spec) UnmarshalJSON(data []byte) error { return dec.Decode(s.Spec) } -func UnmarshalJSONStrict(b []byte, out any) error { - dec := json.NewDecoder(bytes.NewReader(b)) - dec.DisallowUnknownFields() - dec.UseNumber() - return dec.Decode(out) +func (Spec) JSONSchemaExtend(sc *jsonschema.Schema) { + // delete & obtain the values + source, _ := sc.Properties.Delete("Source") + destination, _ := sc.Properties.Delete("Destination") + + // update `spec` property + spec := sc.Properties.Value("spec") + // we can use `one_of because source & destination specs are mutually exclusive based on the kind + spec.OneOf = []*jsonschema.Schema{source, destination} + + sc.AllOf = []*jsonschema.Schema{ + { + // `kind: source` implies source spec + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + kind := *sc.Properties.Value("kind") + kind.Const = "source" + kind.Enum = nil + properties.Set("kind", &kind) + return properties + }(), + }, + Then: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("spec", source) + return properties + }(), + }, + }, + { + // `kind: destination` implies destination spec + If: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + kind := *sc.Properties.Value("kind") + kind.Const = "destination" + kind.Enum = nil + properties.Set("kind", &kind) + return properties + }(), + }, + Then: &jsonschema.Schema{ + Properties: func() *orderedmap.OrderedMap[string, *jsonschema.Schema] { + properties := jsonschema.NewProperties() + properties.Set("spec", destination) + return properties + }(), + }, + }, + } } func SpecUnmarshalYamlStrict(b []byte, spec *Spec) error { diff --git a/cli/internal/specs/v0/spec_reader_test.go b/cli/internal/specs/v0/spec_reader_test.go index 8595b37bfc2b82..7970ba8a8e401a 100644 --- a/cli/internal/specs/v0/spec_reader_test.go +++ b/cli/internal/specs/v0/spec_reader_test.go @@ -70,7 +70,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}, @@ -80,7 +80,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.0.0", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, WriteMode: WriteModeOverwrite, }, @@ -120,7 +120,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "postgresqlv2", Path: "cloudquery/postgresql", Version: "v1.0.0", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, WriteMode: WriteModeOverwrite, Spec: map[string]any{"credentials": "mytestcreds"}, @@ -130,7 +130,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.0.0", - Registry: RegistryGrpc, + Registry: RegistryGRPC, }, WriteMode: WriteModeOverwrite, }, @@ -270,7 +270,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "aws", Path: "cloudquery/aws", Version: "v1", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, Destinations: []string{"postgresql"}, Tables: []string{"test"}, @@ -280,7 +280,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "azure", Path: "cloudquery/azure", Version: "v1.3.3", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, Destinations: []string{"postgresql", "postgresql"}, Tables: []string{"test"}, @@ -292,7 +292,7 @@ var specLoaderTestCases = []specLoaderTestCase{ Name: "postgresql", Path: "cloudquery/postgresql", Version: "v1.6.3", - Registry: RegistryGithub, + Registry: RegistryGitHub, }, Spec: map[string]any{}, }, @@ -317,7 +317,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Registry: RegistryCloudQuery, registryInferred: true, }, - Destinations: []string{"postgresql"}, Tables: []string{"test"}, + Destinations: []string{"postgresql"}, + Tables: []string{"test"}, }, }, destinations: []*Destination{ @@ -382,7 +383,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Registry: RegistryCloudQuery, registryInferred: true, }, - Destinations: []string{"0987654321"}, Tables: []string{"test"}, + Destinations: []string{"0987654321"}, + Tables: []string{"test"}, }, { Metadata: Metadata{ @@ -392,7 +394,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Registry: RegistryCloudQuery, registryInferred: true, }, - Destinations: []string{"0987654321"}, Tables: []string{"test"}, + Destinations: []string{"0987654321"}, + Tables: []string{"test"}, }, }, destinations: []*Destination{ @@ -426,7 +429,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Version: "v1.0.0", registryInferred: true, }, - Destinations: []string{"bigquery"}, Tables: []string{"*"}, + Destinations: []string{"bigquery"}, + Tables: []string{"*"}, }, }, destinations: []*Destination{ @@ -457,7 +461,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Version: "v1.0.0", registryInferred: true, }, - Destinations: []string{"bigquery"}, Tables: []string{"*"}, + Destinations: []string{"bigquery"}, + Tables: []string{"*"}, }, }, destinations: []*Destination{ @@ -469,7 +474,8 @@ var specLoaderTestCases = []specLoaderTestCase{ Version: "v3.1.0", registryInferred: true, }, - Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}}, + Spec: map[string]any{"service_account_key_json": getExpectedApplicationDefaultCredentials()}, + }, }, }, } diff --git a/cli/internal/specs/v0/spec_test.go b/cli/internal/specs/v0/spec_test.go new file mode 100644 index 00000000000000..f9b7e3337403db --- /dev/null +++ b/cli/internal/specs/v0/spec_test.go @@ -0,0 +1,92 @@ +package specs + +import ( + _ "embed" + "testing" + + "github.com/cloudquery/codegen/jsonschema" +) + +//go:embed schema.json +var schema string + +func TestSpec_JSONSchemaExtend(t *testing.T) { + jsonschema.TestJSONSchema(t, schema, []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `{}`, + }, + { + Name: "missing kind", + Err: true, + Spec: `{"spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "empty kind", + Err: true, + Spec: `{"kind":"","spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "null kind", + Err: true, + Spec: `{"kind":null,"spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "bad kind", + Err: true, + Spec: `{"kind":123,"spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "bad kind value", + Err: true, + Spec: `{"kind":"123","spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "kind:source", + Spec: `{"kind":"source","spec":{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a","b","c"]}}`, + }, + { + Name: "kind:destination", + Spec: `{"kind":"destination","spec":{"name":"a","path":"b","registry":"local"}}`, + }, + { + Name: "missing spec", + Err: true, + Spec: `{"kind":"source"}`, + }, + { + Name: "empty spec", + Err: true, + Spec: `{"kind":"source","spec":{}}`, + }, + { + Name: "null spec", + Err: true, + Spec: `{"kind":"source","spec":null}`, + }, + { + Name: "bad spec", + Err: true, + Spec: `{"kind":"source","spec":123}`, + }, + { + Name: "kind:destination,spec:destination", + Spec: `{"kind":"destination","spec":{"name":"a","path":"b","registry":"local","write_mode":"append"}}`, + }, + { + Name: "kind:source,spec:destination", + Err: true, + Spec: `{"kind":"source","spec":{"name":"a","path":"b","registry":"local","write_mode":"append"}}`, + }, + { + Name: "kind:destination,spec:source", + Err: true, + Spec: `{"kind":"destination","spec":{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a","b","c"]}}`, + }, + { + Name: "kind:source,spec:source", + Spec: `{"kind":"source","spec":{"name":"a","path":"b","registry":"local","tables":["*"],"destinations":["a","b","c"]}}`, + }, + }) +} diff --git a/cli/internal/specs/v0/write_mode.go b/cli/internal/specs/v0/write_mode.go index 546e21c8e4215c..eb2fc340062911 100644 --- a/cli/internal/specs/v0/write_mode.go +++ b/cli/internal/specs/v0/write_mode.go @@ -4,6 +4,8 @@ import ( "bytes" "encoding/json" "fmt" + + "github.com/invopop/jsonschema" ) type WriteMode int @@ -15,11 +17,15 @@ const ( ) var ( - writeModeStrings = []string{"overwrite-delete-stale", "overwrite", "append"} + AllWriteModes = [...]string{ + WriteModeOverwriteDeleteStale: "overwrite-delete-stale", + WriteModeOverwrite: "overwrite", + WriteModeAppend: "append", + } ) func (m WriteMode) String() string { - return writeModeStrings[m] + return AllWriteModes[m] } func (m WriteMode) MarshalJSON() ([]byte, error) { @@ -40,14 +46,19 @@ func (m *WriteMode) UnmarshalJSON(data []byte) (err error) { return nil } +func (WriteMode) JSONSchemaExtend(sc *jsonschema.Schema) { + sc.Type = "string" + sc.Enum = make([]any, len(AllWriteModes)) + for i, k := range AllWriteModes { + sc.Enum[i] = k + } +} + func WriteModeFromString(s string) (WriteMode, error) { - switch s { - case "append": - return WriteModeAppend, nil - case "overwrite": - return WriteModeOverwrite, nil - case "overwrite-delete-stale": - return WriteModeOverwriteDeleteStale, nil + for m, str := range AllWriteModes { + if s == str { + return WriteMode(m), nil + } } - return 0, fmt.Errorf("invalid write mode: %s", s) + return WriteModeOverwriteDeleteStale, fmt.Errorf("invalid write mode: %s", s) } diff --git a/cli/internal/specs/v0/write_mode_test.go b/cli/internal/specs/v0/write_mode_test.go index 289c66c213e7af..3d3ad63ce96578 100644 --- a/cli/internal/specs/v0/write_mode_test.go +++ b/cli/internal/specs/v0/write_mode_test.go @@ -2,26 +2,74 @@ package specs import ( "testing" + + "github.com/cloudquery/codegen/jsonschema" + "github.com/stretchr/testify/require" ) func TestWriteModeFromString(t *testing.T) { - var writeMode WriteMode - if err := writeMode.UnmarshalJSON([]byte(`"append"`)); err != nil { - t.Fatal(err) - } - if writeMode != WriteModeAppend { - t.Fatalf("expected WriteModeAppend, got %v", writeMode) - } - if err := writeMode.UnmarshalJSON([]byte(`"overwrite"`)); err != nil { - t.Fatal(err) - } - if writeMode != WriteModeOverwrite { - t.Fatalf("expected WriteModeOverwrite, got %v", writeMode) - } + m, err := WriteModeFromString("overwrite-delete-stale") + require.NoError(t, err) + require.Equal(t, WriteModeOverwriteDeleteStale, m) + + m, err = WriteModeFromString("overwrite") + require.NoError(t, err) + require.Equal(t, WriteModeOverwrite, m) + + m, err = WriteModeFromString("append") + require.NoError(t, err) + require.Equal(t, WriteModeAppend, m) + + m, err = WriteModeFromString("Append") + require.Error(t, err) + require.Equal(t, WriteModeOverwriteDeleteStale, m) + + m, err = WriteModeFromString("") + require.Error(t, err) + require.Equal(t, WriteModeOverwriteDeleteStale, m) +} + +func TestWriteMode_JSONSchemaExtend(t *testing.T) { + data, err := jsonschema.Generate(new(WriteMode)) + require.NoError(t, err) + jsonschema.TestJSONSchema(t, string(data), []jsonschema.TestCase{ + { + Name: "empty", + Err: true, + Spec: `""`, + }, + { + Name: "null", + Err: true, + Spec: `null`, + }, + { + Name: "bad type", + Err: true, + Spec: `123`, + }, + { + Name: "bad value", + Err: true, + Spec: `"extra"`, + }, + { + Name: "overwrite-delete-stale", + Spec: `"overwrite-delete-stale"`, + }, + { + Name: "overwrite", + Spec: `"overwrite"`, + }, + { + Name: "append", + Spec: `"append"`, + }, + }) } -func TestWriteMode(t *testing.T) { - for _, writeModeStr := range writeModeStrings { +func TestWriteModeRoundTrip(t *testing.T) { + for _, writeModeStr := range AllWriteModes { writeMode, err := WriteModeFromString(writeModeStr) if err != nil { t.Fatal(err) From 79f91e200b72b2a315f84f0a9e4290b06fd64707 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Wed, 3 Jan 2024 19:02:40 +0200 Subject: [PATCH 058/166] fix: Allow using `OCI_CLI_` prefixed environment variables (#16003) --- plugins/source/oracle/client/client.go | 5 ++- .../source/oracle/client/oracle_clients.go | 9 +++++ .../oracle/client/oracle_clients_test.go | 38 +++++++++++++++++++ plugins/source/oracle/docs/_authentication.md | 15 ++++---- 4 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 plugins/source/oracle/client/oracle_clients_test.go diff --git a/plugins/source/oracle/client/client.go b/plugins/source/oracle/client/client.go index 64f565804f2b35..7becbf460e8a48 100644 --- a/plugins/source/oracle/client/client.go +++ b/plugins/source/oracle/client/client.go @@ -41,7 +41,10 @@ func New(ctx context.Context, logger zerolog.Logger, _ spec.Spec) (schema.Client defaultRetryPolicy := common.DefaultRetryPolicy() common.GlobalRetry = &defaultRetryPolicy - configProvider := common.DefaultConfigProvider() + configProvider, err := getConfigProvider() + if err != nil { + return nil, err + } tenancyOcid, err := configProvider.TenancyOCID() if err != nil { diff --git a/plugins/source/oracle/client/oracle_clients.go b/plugins/source/oracle/client/oracle_clients.go index 36323221614598..9404ac8df2bea3 100644 --- a/plugins/source/oracle/client/oracle_clients.go +++ b/plugins/source/oracle/client/oracle_clients.go @@ -1568,3 +1568,12 @@ func initOracleClientsInAllRegions( return oracleClients, nil } + +func getConfigProvider() (common.ConfigurationProvider, error) { + return common.ComposingConfigurationProvider( + []common.ConfigurationProvider{ + common.ConfigurationProviderEnvironmentVariables("OCI_CLI", ""), + common.DefaultConfigProvider(), + }, + ) +} diff --git a/plugins/source/oracle/client/oracle_clients_test.go b/plugins/source/oracle/client/oracle_clients_test.go new file mode 100644 index 00000000000000..63ad9ba190c13b --- /dev/null +++ b/plugins/source/oracle/client/oracle_clients_test.go @@ -0,0 +1,38 @@ +package client + +import ( + "os" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestOCIConfigurationProvider(t *testing.T) { + configProvider, err := getConfigProvider() + require.NoError(t, err) + + prefixes := []string{"TF_VAR", "OCI_CLI"} + for _, pfx := range prefixes { + t.Run(pfx, func(t *testing.T) { + envRegion, ok := os.LookupEnv(pfx + "_region") + require.False(t, ok) + require.Empty(t, envRegion) + + sdkRegion, err := configProvider.Region() + require.Error(t, err) + require.Empty(t, sdkRegion) + + require.NoError(t, os.Setenv(pfx+"_region", "region_"+pfx)) + + envRegion, ok = os.LookupEnv(pfx + "_region") + require.True(t, ok) + require.Equal(t, "region_"+pfx, envRegion) + + sdkRegion, err = configProvider.Region() + require.NoError(t, err) + require.Equal(t, "region_"+pfx, sdkRegion) + + require.NoError(t, os.Unsetenv(pfx+"_region")) + }) + } +} diff --git a/plugins/source/oracle/docs/_authentication.md b/plugins/source/oracle/docs/_authentication.md index c44c95edafd891..3013bcb094b031 100644 --- a/plugins/source/oracle/docs/_authentication.md +++ b/plugins/source/oracle/docs/_authentication.md @@ -21,15 +21,16 @@ Note that CloudQuery will `sync` information from all regions - not only the reg ### Option 2: Environment variables -Environment variables are configured the same way as for the terraform provider, and should therefore be prefixed with `TF_VAR_` (e.g. `TF_VAR_tenancy_ocid`). See the [documentation](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm) for a full list of available variables. +Environment variables can be either prefixed with `OCI_CLI` or `TF_VAR` (e.g. `OCI_CLI_tenancy_ocid` or `TF_VAR_tenancy_ocid`). +See the [documentation](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm) for a full list of available variables. Example environment variables: ```bash copy -export TF_VAR_security_token_file=/path/to/token/file -export TF_VAR_fingerprint="" -export TF_VAR_tenancy_ocid="ocid1.tenancy.oc1.." -export TF_VAR_user_ocid="ocid1.user.oc1.." -export TF_VAR_region="us-ashburn-1" -export TF_VAR_private_key_path="~/.oci/oci_api_key.pem" +export OCI_CLI_security_token_file=/path/to/token/file +export OCI_CLI_fingerprint="" +export OCI_CLI_tenancy_ocid="ocid1.tenancy.oc1.." +export OCI_CLI_user_ocid="ocid1.user.oc1.." +export OCI_CLI_region="us-ashburn-1" +export OCI_CLI_private_key_path="~/.oci/oci_api_key.pem" ``` \ No newline at end of file From f337f944aeba52e1fba06cc4ebcd25cccafbf16f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 3 Jan 2024 19:12:26 +0200 Subject: [PATCH 059/166] fix(deps): Update dependency cloudquery-plugin-sdk to v0.1.12 (#16007) 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.11` -> `==0.1.12` | --- > [!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.12`](https://togithub.com/cloudquery/plugin-sdk-python/blob/HEAD/CHANGELOG.md#0112-2024-01-03) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-python/compare/v0.1.11...v0.1.12) ##### Bug Fixes - Rename docker registry host ([#​113](https://togithub.com/cloudquery/plugin-sdk-python/issues/113)) ([b783921](https://togithub.com/cloudquery/plugin-sdk-python/commit/b783921b1439252797b55dcc2f16a26cb65d7f7b))
--- ### 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 | 2 +- plugins/source/typeform/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/source/square/requirements.txt b/plugins/source/square/requirements.txt index 49faa67bc10046..9020e3f9a2c054 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.11 +cloudquery-plugin-sdk==0.1.12 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 3b4558ecfd442a..3898ef8f1db9f0 100644 --- a/plugins/source/typeform/requirements.txt +++ b/plugins/source/typeform/requirements.txt @@ -1,4 +1,4 @@ -cloudquery-plugin-sdk==0.1.11 +cloudquery-plugin-sdk==0.1.12 pyarrow==14.0.2 requests==2.31.0 pytest==7.4.4 From 12b3d028235ce704016bde526d69417356dfb688 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Wed, 3 Jan 2024 18:24:03 +0100 Subject: [PATCH 060/166] chore: Use Node.js 20 in source_airtable.yml (#16004) #### Summary Since https://github.com/cloudquery/cloudquery/pull/15721/files#diff-a1b22c80628ca652952e2c245e1e591636ad67549f7b8180b3552faeb83316e1R75 the plugin requires Node.js 20 so the CI should reflect it 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 ++-- scaffold/cmd/templates/source/go.mod.tpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index a48d6954ceb49c..618fb4d7dba9da 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -8,7 +8,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.3 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-pb-go v1.16.2 + github.com/cloudquery/plugin-pb-go v1.16.3 github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible diff --git a/cli/go.sum b/cli/go.sum index 5a855c6dc19f8b..29492baa8bb407 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.2 h1:Uj9cDsp/meAa7KEZglOFTHNIJDftmp7iUGj0ri1EUj4= -github.com/cloudquery/plugin-pb-go v1.16.2/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index 9846215f2cfeaa..acb40d98de76cb 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.2 + github.com/cloudquery/plugin-pb-go v1.16.3 github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/rs/zerolog v1.29.0 ) From 4ded58e49ecffd9686e36dcb73f3820f9bc72171 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Wed, 3 Jan 2024 20:07:54 +0100 Subject: [PATCH 064/166] chore: Fix Website dependency grouping (#16010) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary With the current configuration renovate groups JavaScript Plugin SDK updates with Website updates. This PR fixes it --- .github/renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index c33717a98e54a7..5dbb094f21427c 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -14,7 +14,7 @@ }, ], packageRules: [ - { matchManagers: ["npm"], groupName: "Website" }, + { matchFileNames: ["website/**"], groupName: "Website" }, { matchPackageNames: ["github.com/jackc/pgx/v4"], allowedVersions: "<5", From 8a2c285c4dac39dc1a42d67575be90428c515aff Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 3 Jan 2024 21:16:53 +0200 Subject: [PATCH 065/166] fix(deps): Update dependency @cloudquery/plugin-sdk-javascript to v0.1.4 (#16011) 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.0` -> `0.1.4`](https://renovatebot.com/diffs/npm/@cloudquery%2fplugin-sdk-javascript/0.1.0/0.1.4) | --- > [!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.4`](https://togithub.com/cloudquery/plugin-sdk-javascript/blob/HEAD/CHANGELOG.md#014-2024-01-03) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-javascript/compare/v0.1.3...v0.1.4) ##### Bug Fixes - Rename registry ([#​121](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/121)) ([b9f6d6b](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/b9f6d6bf3346a2d42c38ded4cabd3deb3a7bc77b)) ### [`v0.1.3`](https://togithub.com/cloudquery/plugin-sdk-javascript/blob/HEAD/CHANGELOG.md#013-2024-01-02) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-javascript/compare/v0.1.2...v0.1.3) ##### Bug Fixes - **deps:** Update dependency [@​cloudquery/plugin-pb-javascript](https://togithub.com/cloudquery/plugin-pb-javascript) to ^0.0.13 ([#​119](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/119)) ([e1779b5](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/e1779b5a69d1777542abc9cf0418b94b3c484ec4)) ### [`v0.1.2`](https://togithub.com/cloudquery/plugin-sdk-javascript/blob/HEAD/CHANGELOG.md#012-2024-01-02) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-javascript/compare/v0.1.1...v0.1.2) ##### Bug Fixes - **deps:** Update actions/setup-node action to v4 ([#​118](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/118)) ([be808e4](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/be808e40bbea67afb0a77762c141291902b98d60)) - **deps:** Update dependency eslint to v8.56.0 ([#​113](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/113)) ([6ecdd53](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/6ecdd538384092b650308aaa802d0b5acb9f4517)) - **deps:** Update dependency eslint-plugin-import to v2.29.1 ([#​110](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/110)) ([4bb02e1](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/4bb02e1c8179fbb3116aaf035e8fbfd5ece1d72b)) - **deps:** Update dependency eslint-plugin-n to v16.6.0 ([#​114](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/114)) ([7e856e5](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/7e856e5e3557cd9e2ee9cc6964976c82cc0c70ab)) - **deps:** Update dependency eslint-plugin-prettier to v5.1.2 ([#​115](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/115)) ([6017ce7](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/6017ce731af9a969cdd26c5cea7a55a50691dc23)) - **deps:** Update dependency p-map to v7.0.1 ([#​111](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/111)) ([dac1c46](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/dac1c4634a63132e0dd546054f55197c2fee0f37)) - **deps:** Update typescript-eslint monorepo to v6.16.0 ([#​116](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/116)) ([80a2b95](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/80a2b95c2d7d49e87af64bade9bc518df70bfa1e)) ### [`v0.1.1`](https://togithub.com/cloudquery/plugin-sdk-javascript/blob/HEAD/CHANGELOG.md#011-2023-12-29) [Compare Source](https://togithub.com/cloudquery/plugin-sdk-javascript/compare/v0.1.0...v0.1.1) ##### Bug Fixes - Add --license placeholder for future use ([#​108](https://togithub.com/cloudquery/plugin-sdk-javascript/issues/108)) ([0537d45](https://togithub.com/cloudquery/plugin-sdk-javascript/commit/0537d45a7581fee932ca043467cad2fdb32ebeb0))
--- ### 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 48f94fe1ada811..abbff14c378eab 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.11", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-pb-javascript/-/plugin-pb-javascript-0.0.11.tgz", - "integrity": "sha512-gJva5mw/QtSWEp4Q4YokONouE/KfPGdF2/TOruw8IwNxSf1bZRgUv3mCLvAbESSC9AeobhJ0UAiUDSUwt+Q1uQ==", + "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==", "dependencies": { "google-protobuf": "^3.21.2" }, @@ -210,12 +210,12 @@ } }, "node_modules/@cloudquery/plugin-sdk-javascript": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@cloudquery/plugin-sdk-javascript/-/plugin-sdk-javascript-0.1.0.tgz", - "integrity": "sha512-PUpSeBOLx3S2wMwr/vN7p6NLrVYDWXzEzMRuVtQFFaPZ2YpLHWDwkj3Okdj7l5vvey0O9GQYHRpFVNWh+gpkoQ==", + "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==", "dependencies": { "@apache-arrow/esnext-esm": "^12.0.1", - "@cloudquery/plugin-pb-javascript": "^0.0.11", + "@cloudquery/plugin-pb-javascript": "^0.0.13", "@grpc/grpc-js": "^1.9.0", "@types/luxon": "^3.3.1", "ajv": "^8.12.0", From 129b7c2d92db70bb782177cdaa26abc0c8e83d3e Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Wed, 3 Jan 2024 20:43:34 +0100 Subject: [PATCH 066/166] fix: Add `X-Meta-User-Team-Name` during docker push (#16013) #### Summary The requirement for this header was added recently in the backend to track downloads, so the backend needs to know the team that's downloading the plugin. It's less relevant for the push operation though, but still needed. It's ok to use the team from the manifest - it just has to be any team the user is a part of. During push we already verify the token used to push has access to the team.

... (truncated)

Changelog

Sourced from @​babel/traverse's changelog.

v7.23.7 (2023-12-29)

:bug: Bug Fix

:house: Internal

  • babel-helper-create-class-features-plugin
  • babel-helper-create-class-features-plugin, babel-plugin-proposal-decorators

v7.23.6 (2023-12-11)

:eyeglasses: Spec Compliance

  • babel-generator, babel-parser, babel-types
  • babel-helpers, babel-plugin-proposal-decorators, babel-plugin-transform-class-properties, babel-plugin-transform-class-static-block, babel-plugin-transform-runtime, babel-preset-env, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-types

:bug: Bug Fix

  • babel-generator
  • babel-helpers, babel-plugin-proposal-explicit-resource-management
  • babel-plugin-proposal-decorators, babel-plugin-transform-class-properties
    • #16161 Ensure the [[@@toPrimitive]] call of a decorated class member key is invoked once (@​JLHwung)
    • #16148 Support named evaluation for decorated anonymous class exp (@​JLHwung)
  • babel-plugin-transform-for-of, babel-preset-env
  • babel-helpers, babel-plugin-proposal-decorators, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime
  • babel-plugin-transform-typescript

:microscope: Output optimization

  • babel-helper-create-class-features-plugin, babel-plugin-transform-class-properties
  • babel-helpers, babel-plugin-proposal-decorators

v7.23.5 (2023-11-29)

:eyeglasses: Spec Compliance

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@babel/traverse&package-manager=npm_and_yarn&previous-version=7.21.4&new-version=7.23.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cloudquery/cloudquery/network/alerts).
--- website/package-lock.json | 179 +++++++++++++++++++++----------------- 1 file changed, 99 insertions(+), 80 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index ddb7ce9a489614..db0b513ea7922e 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -60,17 +60,53 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { "version": "7.21.4", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz", @@ -111,12 +147,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz", - "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, "dependencies": { - "@babel/types": "^7.21.4", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -160,35 +196,34 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.20.7", - "@babel/types": "^7.21.0" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -240,34 +275,31 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -296,34 +328,24 @@ } }, "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/@babel/helper-validator-identifier": { - "version": "7.18.6", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/highlight/node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -338,7 +360,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -348,7 +369,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -357,9 +377,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz", - "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", + "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -391,35 +411,34 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz", - "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.21.4", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.4", - "@babel/types": "^7.21.4", - "debug": "^4.1.0", + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", + "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -436,13 +455,13 @@ } }, "node_modules/@babel/types": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz", - "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { From 6edb232815fc65aa0830c2a7b526901731e9e872 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:51:51 +0200 Subject: [PATCH 119/166] chore: Update plugin `destination-neo4j` version to v5.0.5 (#16047) Updates the `destination-neo4j` plugin latest version to v5.0.5 --- website/versions/destination-neo4j.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-neo4j.json b/website/versions/destination-neo4j.json index 47504a92e05692..f9caa9d4629d2e 100644 --- a/website/versions/destination-neo4j.json +++ b/website/versions/destination-neo4j.json @@ -1 +1 @@ -{ "latest": "plugins-destination-neo4j-v5.0.4" } +{ "latest": "plugins-destination-neo4j-v5.0.5" } From bc72237eb92247c67f9dc4b723cf48047f1e3e98 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:56:27 +0200 Subject: [PATCH 120/166] chore: Update plugin `destination-postgresql` version to v7.1.5 (#16048) Updates the `destination-postgresql` plugin latest version to v7.1.5 --- 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 c76f07cca79ad9..e0b8b3e2efbe53 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v7.1.4" } +{ "latest": "plugins-destination-postgresql-v7.1.5" } From a0896bd5a8107d22ca5fb26d02a964c28ca7849c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:25:24 +0200 Subject: [PATCH 121/166] chore: Update plugin `destination-snowflake` version to v3.3.8 (#16049) Updates the `destination-snowflake` plugin latest version to v3.3.8 --- 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 bee1eef9cfb39e..5b75482a549192 100644 --- a/website/versions/destination-snowflake.json +++ b/website/versions/destination-snowflake.json @@ -1 +1 @@ -{ "latest": "plugins-destination-snowflake-v3.3.7" } +{ "latest": "plugins-destination-snowflake-v3.3.8" } From 09d6865329a4da54f5be44d1e744a8743e9147d4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:30:00 +0200 Subject: [PATCH 122/166] chore: Update plugin `destination-sqlite` version to v2.4.20 (#16050) Updates the `destination-sqlite` plugin latest version to v2.4.20 --- 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 0e648ba7532500..fa3db825e93c97 100644 --- a/website/versions/destination-sqlite.json +++ b/website/versions/destination-sqlite.json @@ -1 +1 @@ -{ "latest": "plugins-destination-sqlite-v2.4.19" } +{ "latest": "plugins-destination-sqlite-v2.4.20" } From 7f180fceab7d67d599e9904790876b185b8d0800 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:33:52 +0200 Subject: [PATCH 123/166] chore(deps): Update dependency destination-postgresql to v7.1.5 (#16051) 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.1.4` -> `v7.1.5` | --- > [!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 c109b7bd17e800..2e7ff0c6592c01 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.1.4" # latest version of postgresql plugin + version: "v7.1.5" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From 6e6a58a8ccd46d5567bfc3ca22c8a4a31a7cba84 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:05:54 +0200 Subject: [PATCH 124/166] chore(main): Release plugins-source-github v7.6.3 (#15987) :robot: I have created a release *beep* *boop* --- ## [7.6.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-github-v7.6.2...plugins-source-github-v7.6.3) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/github/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 746a638e642111..aa093914d9cf28 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -11,7 +11,7 @@ "plugins/source/digitalocean+FILLER": "0.0.0", "plugins/source/gcp": "10.0.0", "plugins/source/gcp+FILLER": "0.0.0", - "plugins/source/github": "7.6.2", + "plugins/source/github": "7.6.3", "plugins/source/github+FILLER": "0.0.0", "plugins/source/k8s": "5.2.5", "plugins/source/k8s+FILLER": "0.0.0", diff --git a/plugins/source/github/CHANGELOG.md b/plugins/source/github/CHANGELOG.md index f81c297cf14a3d..0a3244e4c6aa11 100644 --- a/plugins/source/github/CHANGELOG.md +++ b/plugins/source/github/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.6.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-github-v7.6.2...plugins-source-github-v7.6.3) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [7.6.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-github-v7.6.1...plugins-source-github-v7.6.2) (2024-01-02) From 5b95470e248c3e5add3fd41aa2aba788d754387c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:14:19 +0200 Subject: [PATCH 125/166] chore: Update plugin `source-github` version to v7.6.3 (#16052) Updates the `source-github` plugin latest version to v7.6.3 --- website/versions/source-github.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-github.json b/website/versions/source-github.json index 912f1b72404766..d9a15b377263e9 100644 --- a/website/versions/source-github.json +++ b/website/versions/source-github.json @@ -1 +1 @@ -{ "latest": "plugins-source-github-v7.6.2" } +{ "latest": "plugins-source-github-v7.6.3" } From 8cfeacfb51c058bdbe7b6954111c73d44a21cae0 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:32:23 +0200 Subject: [PATCH 126/166] chore(main): Release plugins-destination-test v2.2.18 (#15981) :robot: I have created a release *beep* *boop* --- ## [2.2.18](https://github.com/cloudquery/cloudquery/compare/plugins-destination-test-v2.2.17...plugins-destination-test-v2.2.18) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/test/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index aa093914d9cf28..244ae2fe388515 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -23,7 +23,7 @@ "plugins/source/test+FILLER": "0.0.0", "plugins/destination/postgresql": "7.1.5", "plugins/destination/postgresql+FILLER": "0.0.0", - "plugins/destination/test": "2.2.17", + "plugins/destination/test": "2.2.18", "plugins/destination/test+FILLER": "0.0.0", "plugins/destination/sqlite": "2.4.20", "plugins/destination/sqlite+FILLER": "0.0.0", diff --git a/plugins/destination/test/CHANGELOG.md b/plugins/destination/test/CHANGELOG.md index abe71c0993fe4e..e82594f2f2d371 100644 --- a/plugins/destination/test/CHANGELOG.md +++ b/plugins/destination/test/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.2.18](https://github.com/cloudquery/cloudquery/compare/plugins-destination-test-v2.2.17...plugins-destination-test-v2.2.18) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [2.2.17](https://github.com/cloudquery/cloudquery/compare/plugins-destination-test-v2.2.16...plugins-destination-test-v2.2.17) (2024-01-02) From 4c735c8c3a46c810276e0c24fa7e64fe6d0ff089 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:39:25 +0200 Subject: [PATCH 127/166] chore(main): Release plugins-source-pagerduty v3.1.3 (#15994) :robot: I have created a release *beep* *boop* --- ## [3.1.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v3.1.2...plugins-source-pagerduty-v3.1.3) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/pagerduty/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 244ae2fe388515..af5eef129c3085 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -33,7 +33,7 @@ "plugins/source/datadog+FILLER": "0.0.0", "plugins/destination/bigquery": "3.3.13", "plugins/destination/bigquery+FILLER": "0.0.0", - "plugins/source/pagerduty": "3.1.2", + "plugins/source/pagerduty": "3.1.3", "plugins/source/pagerduty+FILLER": "0.0.0", "plugins/destination/mongodb": "2.2.21", "plugins/destination/mongodb+FILLER": "0.0.0", diff --git a/plugins/source/pagerduty/CHANGELOG.md b/plugins/source/pagerduty/CHANGELOG.md index 006e482349ac26..618ac44d1e8ce0 100644 --- a/plugins/source/pagerduty/CHANGELOG.md +++ b/plugins/source/pagerduty/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.1.3](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v3.1.2...plugins-source-pagerduty-v3.1.3) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [3.1.2](https://github.com/cloudquery/cloudquery/compare/plugins-source-pagerduty-v3.1.1...plugins-source-pagerduty-v3.1.2) (2024-01-02) From fd538e5d8f7a478edcd7e13990ec5363ca20f602 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:44:07 +0200 Subject: [PATCH 128/166] chore(main): Release plugins-source-notion v1.0.9 (#15992) :robot: I have created a release *beep* *boop* --- ## [1.0.9](https://github.com/cloudquery/cloudquery/compare/plugins-source-notion-v1.0.8...plugins-source-notion-v1.0.9) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/notion/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index af5eef129c3085..efa34a225b9593 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -103,5 +103,5 @@ "plugins/source/airtable+FILLER": "0.0.0", "plugins/source/bitbucket": "1.0.5", "plugins/source/bitbucket+FILLER": "0.0.0", - "plugins/source/notion": "1.0.8" + "plugins/source/notion": "1.0.9" } diff --git a/plugins/source/notion/CHANGELOG.md b/plugins/source/notion/CHANGELOG.md index 3e2866b538fdf2..d8bd98d7765f56 100644 --- a/plugins/source/notion/CHANGELOG.md +++ b/plugins/source/notion/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.0.9](https://github.com/cloudquery/cloudquery/compare/plugins-source-notion-v1.0.8...plugins-source-notion-v1.0.9) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [1.0.8](https://github.com/cloudquery/cloudquery/compare/plugins-source-notion-v1.0.7...plugins-source-notion-v1.0.8) (2024-01-02) From 4125dcf639fa9a6a6f1992fdaeb78ecd5d31b292 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:47:52 +0200 Subject: [PATCH 129/166] chore(main): Release plugins-source-k8s v5.2.6 (#15991) :robot: I have created a release *beep* *boop* --- ## [5.2.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-k8s-v5.2.5...plugins-source-k8s-v5.2.6) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/k8s/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index efa34a225b9593..7ff2ac4d26988c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -13,7 +13,7 @@ "plugins/source/gcp+FILLER": "0.0.0", "plugins/source/github": "7.6.3", "plugins/source/github+FILLER": "0.0.0", - "plugins/source/k8s": "5.2.5", + "plugins/source/k8s": "5.2.6", "plugins/source/k8s+FILLER": "0.0.0", "plugins/source/okta": "3.2.17", "plugins/source/okta+FILLER": "0.0.0", diff --git a/plugins/source/k8s/CHANGELOG.md b/plugins/source/k8s/CHANGELOG.md index 63b227da984fc1..fecc95d235e947 100644 --- a/plugins/source/k8s/CHANGELOG.md +++ b/plugins/source/k8s/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [5.2.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-k8s-v5.2.5...plugins-source-k8s-v5.2.6) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [5.2.5](https://github.com/cloudquery/cloudquery/compare/plugins-source-k8s-v5.2.4...plugins-source-k8s-v5.2.5) (2024-01-02) From 4a315b8dbbf76c2d7bdf870513a9e2972343fb7e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:49:39 +0200 Subject: [PATCH 130/166] chore(main): Release plugins-source-hackernews v3.0.20 (#15989) :robot: I have created a release *beep* *boop* --- ## [3.0.20](https://github.com/cloudquery/cloudquery/compare/plugins-source-hackernews-v3.0.19...plugins-source-hackernews-v3.0.20) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/hackernews/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7ff2ac4d26988c..59716a5ab58181 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -51,7 +51,7 @@ "plugins/destination/neo4j+FILLER": "0.0.0", "plugins/destination/kafka": "3.2.19", "plugins/destination/kafka+FILLER": "0.0.0", - "plugins/source/hackernews": "3.0.19", + "plugins/source/hackernews": "3.0.20", "plugins/source/hackernews+FILLER": "0.0.0", "scaffold": "2.1.22", "scaffold+FILLER": "0.0.0", diff --git a/plugins/source/hackernews/CHANGELOG.md b/plugins/source/hackernews/CHANGELOG.md index 31f365476864a7..d70b639f11b785 100644 --- a/plugins/source/hackernews/CHANGELOG.md +++ b/plugins/source/hackernews/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.0.20](https://github.com/cloudquery/cloudquery/compare/plugins-source-hackernews-v3.0.19...plugins-source-hackernews-v3.0.20) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [3.0.19](https://github.com/cloudquery/cloudquery/compare/plugins-source-hackernews-v3.0.18...plugins-source-hackernews-v3.0.19) (2024-01-02) From 8ed3a584df88175e8cd19d62d854116a0e696b4d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:51:27 +0200 Subject: [PATCH 131/166] chore(main): Release plugins-source-datadog v4.2.7 (#15985) :robot: I have created a release *beep* *boop* --- ## [4.2.7](https://github.com/cloudquery/cloudquery/compare/plugins-source-datadog-v4.2.6...plugins-source-datadog-v4.2.7) (2024-01-04) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) --- 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/datadog/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 59716a5ab58181..7c278dab2a39cc 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -29,7 +29,7 @@ "plugins/destination/sqlite+FILLER": "0.0.0", "plugins/destination/snowflake": "3.3.8", "plugins/destination/snowflake+FILLER": "0.0.0", - "plugins/source/datadog": "4.2.6", + "plugins/source/datadog": "4.2.7", "plugins/source/datadog+FILLER": "0.0.0", "plugins/destination/bigquery": "3.3.13", "plugins/destination/bigquery+FILLER": "0.0.0", diff --git a/plugins/source/datadog/CHANGELOG.md b/plugins/source/datadog/CHANGELOG.md index 31368020321449..11db72db16eec0 100644 --- a/plugins/source/datadog/CHANGELOG.md +++ b/plugins/source/datadog/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [4.2.7](https://github.com/cloudquery/cloudquery/compare/plugins-source-datadog-v4.2.6...plugins-source-datadog-v4.2.7) (2024-01-04) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) + ## [4.2.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-datadog-v4.2.5...plugins-source-datadog-v4.2.6) (2024-01-02) From 5c734223287d4a9beb54fe5f33116e4eb8850ee2 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:52:28 +0200 Subject: [PATCH 132/166] chore: Update plugin `destination-test` version to v2.2.18 (#16053) Updates the `destination-test` plugin latest version to v2.2.18 --- website/versions/destination-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-test.json b/website/versions/destination-test.json index fe489c73aece66..c89673c4deb5ca 100644 --- a/website/versions/destination-test.json +++ b/website/versions/destination-test.json @@ -1 +1 @@ -{ "latest": "plugins-destination-test-v2.2.17" } +{ "latest": "plugins-destination-test-v2.2.18" } From 809f61e273b799f21062a9190069f73e391353cb Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:55:25 +0200 Subject: [PATCH 133/166] chore: Update plugin `source-pagerduty` version to v3.1.3 (#16054) Updates the `source-pagerduty` plugin latest version to v3.1.3 --- website/versions/source-pagerduty.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-pagerduty.json b/website/versions/source-pagerduty.json index 079fc46a540872..a446e74955f160 100644 --- a/website/versions/source-pagerduty.json +++ b/website/versions/source-pagerduty.json @@ -1 +1 @@ -{ "latest": "plugins-source-pagerduty-v3.1.2" } +{ "latest": "plugins-source-pagerduty-v3.1.3" } From d105b67d2baceda76b9dda29bef2b81e2d6496c7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:59:01 +0200 Subject: [PATCH 134/166] chore: Update plugin `source-notion` version to v1.0.9 (#16055) Updates the `source-notion` plugin latest version to v1.0.9 --- website/versions/source-notion.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-notion.json b/website/versions/source-notion.json index bd082ce55f6bcd..6982467eb0338b 100644 --- a/website/versions/source-notion.json +++ b/website/versions/source-notion.json @@ -1 +1 @@ -{ "latest": "plugins-source-notion-v1.0.8" } +{ "latest": "plugins-source-notion-v1.0.9" } From 84587bfff7f44b1fe35cf02ca7939b02bbabc7d4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 01:02:02 +0200 Subject: [PATCH 135/166] chore: Update plugin `source-k8s` version to v5.2.6 (#16056) Updates the `source-k8s` plugin latest version to v5.2.6 --- website/versions/source-k8s.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-k8s.json b/website/versions/source-k8s.json index 7c8496c7f85e6e..2d208e08ef9490 100644 --- a/website/versions/source-k8s.json +++ b/website/versions/source-k8s.json @@ -1 +1 @@ -{ "latest": "plugins-source-k8s-v5.2.5" } +{ "latest": "plugins-source-k8s-v5.2.6" } From ddf72e6864bef0e0b1ce074cfaee4e8a4bb3f4bc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 01:04:16 +0200 Subject: [PATCH 136/166] chore: Update plugin `source-hackernews` version to v3.0.20 (#16057) Updates the `source-hackernews` plugin latest version to v3.0.20 --- website/versions/source-hackernews.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-hackernews.json b/website/versions/source-hackernews.json index 3c68e5238cea49..6f71e7446f1c5b 100644 --- a/website/versions/source-hackernews.json +++ b/website/versions/source-hackernews.json @@ -1 +1 @@ -{ "latest": "plugins-source-hackernews-v3.0.19" } +{ "latest": "plugins-source-hackernews-v3.0.20" } From 71b62ccbf4e1d3dd1291bee94a6902885abd6190 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 01:08:44 +0200 Subject: [PATCH 137/166] chore: Update plugin `source-datadog` version to v4.2.7 (#16058) Updates the `source-datadog` plugin latest version to v4.2.7 --- website/versions/source-datadog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-datadog.json b/website/versions/source-datadog.json index 78a5ce26a6f099..c45a906fa8a1d0 100644 --- a/website/versions/source-datadog.json +++ b/website/versions/source-datadog.json @@ -1 +1 @@ -{ "latest": "plugins-source-datadog-v4.2.6" } +{ "latest": "plugins-source-datadog-v4.2.7" } From 7862f0157e110448c289502cef8d6a4bc76edc2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 07:23:32 +0000 Subject: [PATCH 138/166] chore(deps): Bump zod from 3.20.2 to 3.22.4 in /website (#16041) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [zod](https://github.com/colinhacks/zod) from 3.20.2 to 3.22.4.
Release notes

Sourced from zod's releases.

v3.22.4

Commits:

  • d931ea3f0f15a6ae64f5f68e3c03912dffb2269d Lint
  • 8e634bd600093b7161487bed705279c892395118 Fix prettier
  • 4018d88f0e94992b2987428c4fda387b99ae2a53 docs: add @​sanity-typed/zod to ecosystem (#2731)
  • 15ba5a4d4cb5be5af23771de0ba1346b4ba20a0e docs: add zod-sandbox to README ecosystem links (#2707)
  • 699ccae13b875d4fcadac268fd789c93b6ce8aef Export jsdoc with @deprecated when building (#2717)
  • dfe3719eae250ab3eca2d276da6c292867899cc6 Fix sanity-typed links (#2840)
  • cd7991e04a550868bfcb5b5d46e5eb5bc7edf5f3 fix ulid regex (#2225)
  • 7cb4ba2f85dd6b28290dda5de80ed54dfd2a793c Remove stalebot
  • 9340fd51e48576a75adc919bff65dbc4a5d4c99b Lazy emojiRegex
  • e7a9b9b3033991be6b4225f1be21da39c250bbb0 3.22.4

v3.22.3

Commits:

  • 1e23990bcdd33d1e81b31e40e77a031fcfd87ce1 Commit
  • 9bd3879b482f139fd03d5025813ee66a04195cdd docs: remove obsolete text about readonly types (#2676)
  • f59be093ec21430d9f32bbcb628d7e39116adf34 clarify datetime ISO 8601 (#2673)
  • 64dcc8e2b16febe48fa8e3c82c47c92643e6c9e3 Update sponsors
  • 18115a8f128680b4526df58ce96deab7dce93b93 Formatting
  • 28c19273658b164c53c149785fa7a8187c428ad4 Update sponsors
  • ad2ee9ccf723c4388158ff6b8669c2a6cdc85643 2718 Updated Custom Schemas documentation example to use type narrowing (#2778)
  • ae0f7a2c15e7741ee1b23c03a3bfb9acebd86551 docs: update ref to discriminated-unions docs (#2485)
  • 2ba00fe2377f4d53947a84b8cdb314a63bbd6dd4 [2609] fix ReDoS vulnerability in email regex (#2824)
  • 1e61d76cdec05de9271fc0df58798ddf9ce94923 3.22.3

v3.22.2

Commits:

  • 13d9e6bda286cbd4c1b177171273695d8309e5de Fix lint
  • 0d49f10b3c25a8e4cbb6534cc0773b195c56d06d docs: add typeschema to ecosystem (#2626)
  • 8e4af7b56df6f2e3daf0dd825b986f1d963025ce X to Zod: add app.quicktype.io (#2668)
  • 792b3ef0d41c144cd10641c6966b98dae1222d82 Fix superrefine types

v3.22.1

Commits:

Fix handing of this in ZodFunction schemas. The parse logic for function schemas now requires the Reflect API.

const methodObject = z.object({
  property: z.number(),
  method: z.function().args(z.string()).returns(z.number()),
});
const methodInstance = {
  property: 3,
  method: function (s: string) {
    return s.length + this.property;
</tr></table>

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=zod&package-manager=npm_and_yarn&previous-version=3.20.2&new-version=3.22.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cloudquery/cloudquery/network/alerts).
--- website/package-lock.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index db0b513ea7922e..f2a6bdc8d7f826 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -8769,8 +8769,9 @@ } }, "node_modules/zod": { - "version": "3.20.2", - "license": "MIT", + "version": "3.22.4", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", + "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", "funding": { "url": "https://github.com/sponsors/colinhacks" } From 9a3bd80bcff57c4db18aea84d653a4ec11d973c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 07:31:38 +0000 Subject: [PATCH 139/166] chore(deps): Bump github.com/dvsekhvalnov/jose2go from 1.5.0 to 1.6.0 in /plugins/destination/snowflake (#16040) Bumps [github.com/dvsekhvalnov/jose2go](https://github.com/dvsekhvalnov/jose2go) from 1.5.0 to 1.6.0.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/dvsekhvalnov/jose2go&package-manager=go_modules&previous-version=1.5.0&new-version=1.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cloudquery/cloudquery/network/alerts).
--- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index 8a986a83d665bc..c03a91f74ca697 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -55,7 +55,7 @@ require ( github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deepmap/oapi-codegen v1.16.2 // indirect - github.com/dvsekhvalnov/jose2go v1.5.0 // 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 diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 23e10e17fc8e7f..6f07b125989dea 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -120,8 +120,8 @@ github.com/deepmap/oapi-codegen v1.16.2 h1:xGHx0dNqYfy9gE8a7AVgVM8Sd5oF9SEgePzP+ github.com/deepmap/oapi-codegen v1.16.2/go.mod h1:rdYoEA2GE+riuZ91DvpmBX9hJbQpuY9wchXpfQ3n+ho= 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.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= -github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +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= From 7fc52eb37f7b4e74b169305b6fbe6254c67c2891 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 07:36:27 +0000 Subject: [PATCH 140/166] chore(deps): Bump next from 13.1.5 to 13.5.1 in /website (#16042) Bumps [next](https://github.com/vercel/next.js) from 13.1.5 to 13.5.1.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=13.1.5&new-version=13.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cloudquery/cloudquery/network/alerts).
--- website/package-lock.json | 219 +++++++++++++++++--------------------- website/package.json | 2 +- 2 files changed, 100 insertions(+), 121 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index f2a6bdc8d7f826..0c49a6ddebac13 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -17,7 +17,7 @@ "gray-matter": "^4.0.3", "hastscript": "^8.0.0", "locate-path": "^7.2.0", - "next": "^13.1.5", + "next": "^13.5.1", "next-seo": "^5.15.0", "next-sitemap": "^4.0.0", "nextra": "^2.2.16", @@ -891,9 +891,9 @@ } }, "node_modules/@next/env": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.5.tgz", - "integrity": "sha512-0Ry4NhJy6qLbXhvxPRUQ1H6RzgtryGdUto7hfgAK0Iw/bScgeVjwLZdfhm2iT7qsOS32apo9cWzLCxjc6iGPsA==" + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.1.tgz", + "integrity": "sha512-CIMWiOTyflFn/GFx33iYXkgLSQsMQZV4jB91qaj/TfxGaGOXxn8C1j72TaUSPIyN7ziS/AYG46kGmnvuk1oOpg==" }, "node_modules/@next/eslint-plugin-next": { "version": "13.1.5", @@ -924,40 +924,10 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@next/swc-android-arm-eabi": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.5.tgz", - "integrity": "sha512-QAEf3YM9U0qWVQTxgF3Tsh4OeCN1i9Smsf6cVlwZsPzoLyj2nQ879joCoN+ONqDknkBgG6OG/ajefywL3jw9Cg==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-android-arm64": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.5.tgz", - "integrity": "sha512-ZmtGPTghRuT5YKL0nNcC2bBVSiG1O0is16eIZ2rWSP/hRW64ZCcAew6pxw2rihntNp22UfequjSTHd91WE/tyQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/@next/swc-darwin-arm64": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.5.tgz", - "integrity": "sha512-aeFXK+M/zmG/CNdMJ0tGNs0MWcLueUe7vZ2V6fa+2yz/ZgYJLI7fEfFvVh1p1yBMzupSbZDowvMuCSFTaeg3MA==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.1.tgz", + "integrity": "sha512-Bcd0VFrLHZnMmJy6LqV1CydZ7lYaBao8YBEdQUVzV8Ypn/l5s//j5ffjfvMzpEQ4mzlAj3fIY+Bmd9NxpWhACw==", "cpu": [ "arm64" ], @@ -970,9 +940,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.5.tgz", - "integrity": "sha512-6mPX0GNRg8NzjV70at8I8pD9YBnPHDpxJCoMuIqysdTjtQhd09Xk6GUhquNhp1kEJzzVk7OW5l2ch4XIJjtY3A==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.1.tgz", + "integrity": "sha512-uvTZrZa4D0bdWa1jJ7X1tBGIxzpqSnw/ATxWvoRO9CVBvXSx87JyuISY+BWsfLFF59IRodESdeZwkWM2l6+Kjg==", "cpu": [ "x64" ], @@ -984,40 +954,10 @@ "node": ">= 10" } }, - "node_modules/@next/swc-freebsd-x64": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.5.tgz", - "integrity": "sha512-nR4a/SNblG0w8hhYRflTZjk4yD99ld18w/FCftw99ziw8sgciBlOXRICJIiRIaMRU8UH7QLSgBOQVnfNcVNKMA==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@next/swc-linux-arm-gnueabihf": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.5.tgz", - "integrity": "sha512-EzkltCVKg3gUzamoeKPhGeSgXTTLAhSzc7v/+g1Y+HQa7JKMrlzdRkrJf+H4LJXcz7lnxgNKHGRyZBSXnmJKJw==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.5.tgz", - "integrity": "sha512-E7HMkdoxStmTUJU4KzBUU4vZ5DHT4Gd327tC3KFZS5lda0NRerJAOCfsRg+fBj22FvCb1UWsX6XI+weL6xhyeQ==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.1.tgz", + "integrity": "sha512-/52ThlqdORPQt3+AlMoO+omicdYyUEDeRDGPAj86ULpV4dg+/GCFCKAmFWT0Q4zChFwsAoZUECLcKbRdcc0SNg==", "cpu": [ "arm64" ], @@ -1030,9 +970,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.5.tgz", - "integrity": "sha512-qlO0Fd3GQwJS6YpbF9NyL5NGHVZ43dKtZDC/jP4vdeMIYDtSu13HcY/nmA1NdW+RpMwDxSCpx4WKsCCEZGIX8Q==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.1.tgz", + "integrity": "sha512-L4qNXSOHeu1hEAeeNsBgIYVnvm0gg9fj2O2Yx/qawgQEGuFBfcKqlmIE/Vp8z6gwlppxz5d7v6pmHs1NB6R37w==", "cpu": [ "arm64" ], @@ -1045,9 +985,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.5.tgz", - "integrity": "sha512-GftSBFAay2nocGl+KNqFsj6EVSvomaM/bp86hzezbKsTwQmu76PjOCVcejI1gE+4k7f5zPDgCuorF6F04BV0HQ==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.1.tgz", + "integrity": "sha512-QVvMrlrFFYvLtABk092kcZ5Mzlmsk2+SV3xYuAu8sbTuIoh0U2+HGNhVklmuYCuM3DAAxdiMQTNlRQmNH11udw==", "cpu": [ "x64" ], @@ -1060,9 +1000,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.5.tgz", - "integrity": "sha512-UD+3lxU4yuAjd+uBkCDfBpAcbGAVfEcE8mX/efIxUGIImmzN0QzgTHYEpKFnY3Lxu02dIBcwQRT3Q5mfO4obng==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.1.tgz", + "integrity": "sha512-bBnr+XuWc28r9e8gQ35XBtyi5KLHLhTbEvrSgcWna8atI48sNggjIK8IyiEBO3KIrcUVXYkldAzGXPEYMnKt1g==", "cpu": [ "x64" ], @@ -1075,9 +1015,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.5.tgz", - "integrity": "sha512-uzsvkQY+K3EbL+97IUHPWZPwjsCmCkdH/O5Cf9wCnh0k0gaj7ob1mGKqr1vNNak+9U7HloGwuHcXnZpijWSP7w==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.1.tgz", + "integrity": "sha512-EQGeE4S5c9v06jje9gr4UlxqUEA+zrsgPi6kg9VwR+dQHirzbnVJISF69UfKVkmLntknZJJI9XpWPB6q0Z7mTg==", "cpu": [ "arm64" ], @@ -1090,9 +1030,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.5.tgz", - "integrity": "sha512-v0NaC1w8mPf620GlJaHBdEm3dm4G4AEQMasDqjzQvo0yCRrvtvzMgCIe8MocBxFHzaF6868NybMqvumxP5YxEg==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.1.tgz", + "integrity": "sha512-1y31Q6awzofVjmbTLtRl92OX3s+W0ZfO8AP8fTnITcIo9a6ATDc/eqa08fd6tSpFu6IFpxOBbdevOjwYTGx/AQ==", "cpu": [ "ia32" ], @@ -1105,9 +1045,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.5.tgz", - "integrity": "sha512-IZHwvd649ccbWyLCfu92IXEpR250NpmBkaRelPV+WVm4jrd62FKRFCNdqdCXq6TrEg9wN8cK4YG8tm44uEZqLA==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.1.tgz", + "integrity": "sha512-+9XBQizy7X/GuwNegq+5QkkxAPV7SBsIwapVRQd9WSvvU20YO23B3bZUpevdabi4fsd25y9RJDDncljy/V54ww==", "cpu": [ "x64" ], @@ -1193,9 +1133,9 @@ "license": "MIT" }, "node_modules/@swc/helpers": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", + "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", "dependencies": { "tslib": "^2.4.0" } @@ -1870,6 +1810,17 @@ "ieee754": "^1.1.13" } }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -3520,6 +3471,11 @@ "node": ">= 6" } }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, "node_modules/glob/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -5948,49 +5904,44 @@ "license": "MIT" }, "node_modules/next": { - "version": "13.1.5", - "resolved": "https://registry.npmjs.org/next/-/next-13.1.5.tgz", - "integrity": "sha512-rmpYZFCxxWAi2nJCT9sSqMLGC3cu+Pf689hx9clcyP0KbVIhh/7Dus5QcKrVd/PrAd6AjsuogSRR1mCP7BoYRw==", + "version": "13.5.1", + "resolved": "https://registry.npmjs.org/next/-/next-13.5.1.tgz", + "integrity": "sha512-GIudNR7ggGUZoIL79mSZcxbXK9f5pwAIPZxEM8+j2yLqv5RODg4TkmUlaKSYVqE1bPQueamXSqdC3j7axiTSEg==", "dependencies": { - "@next/env": "13.1.5", - "@swc/helpers": "0.4.14", + "@next/env": "13.5.1", + "@swc/helpers": "0.5.2", + "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", "postcss": "8.4.14", - "styled-jsx": "5.1.1" + "styled-jsx": "5.1.1", + "watchpack": "2.4.0", + "zod": "3.21.4" }, "bin": { "next": "dist/bin/next" }, "engines": { - "node": ">=14.6.0" + "node": ">=16.14.0" }, "optionalDependencies": { - "@next/swc-android-arm-eabi": "13.1.5", - "@next/swc-android-arm64": "13.1.5", - "@next/swc-darwin-arm64": "13.1.5", - "@next/swc-darwin-x64": "13.1.5", - "@next/swc-freebsd-x64": "13.1.5", - "@next/swc-linux-arm-gnueabihf": "13.1.5", - "@next/swc-linux-arm64-gnu": "13.1.5", - "@next/swc-linux-arm64-musl": "13.1.5", - "@next/swc-linux-x64-gnu": "13.1.5", - "@next/swc-linux-x64-musl": "13.1.5", - "@next/swc-win32-arm64-msvc": "13.1.5", - "@next/swc-win32-ia32-msvc": "13.1.5", - "@next/swc-win32-x64-msvc": "13.1.5" + "@next/swc-darwin-arm64": "13.5.1", + "@next/swc-darwin-x64": "13.5.1", + "@next/swc-linux-arm64-gnu": "13.5.1", + "@next/swc-linux-arm64-musl": "13.5.1", + "@next/swc-linux-x64-gnu": "13.5.1", + "@next/swc-linux-x64-musl": "13.5.1", + "@next/swc-win32-arm64-msvc": "13.5.1", + "@next/swc-win32-ia32-msvc": "13.5.1", + "@next/swc-win32-x64-msvc": "13.5.1" }, "peerDependencies": { - "fibers": ">= 3.1.0", - "node-sass": "^6.0.0 || ^7.0.0", + "@opentelemetry/api": "^1.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", "sass": "^1.3.0" }, "peerDependenciesMeta": { - "fibers": { - "optional": true - }, - "node-sass": { + "@opentelemetry/api": { "optional": true }, "sass": { @@ -6102,6 +6053,14 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/next/node_modules/zod": { + "version": "3.21.4", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", + "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, "node_modules/nextra": { "version": "2.2.16", "resolved": "https://registry.npmjs.org/nextra/-/nextra-2.2.16.tgz", @@ -7705,6 +7664,14 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "license": "BSD-3-Clause" }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/streamx": { "version": "2.15.5", "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz", @@ -8660,6 +8627,18 @@ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz", "integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==" }, + "node_modules/watchpack": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/web-namespaces": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz", diff --git a/website/package.json b/website/package.json index 5e6ad54e3b4f75..1fbd656cce004e 100644 --- a/website/package.json +++ b/website/package.json @@ -23,7 +23,7 @@ "gray-matter": "^4.0.3", "hastscript": "^8.0.0", "locate-path": "^7.2.0", - "next": "^13.1.5", + "next": "^13.5.1", "next-seo": "^5.15.0", "next-sitemap": "^4.0.0", "nextra": "^2.2.16", From ca71111de4c0b7c56ea96801ec5d487a1433d6c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 08:10:29 +0000 Subject: [PATCH 141/166] chore(deps): Bump zod and next in /website (#16059) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [zod](https://github.com/colinhacks/zod) to 3.22.4 and updates ancestor dependency [next](https://github.com/vercel/next.js). These dependencies need to be updated together. Updates `zod` from 3.21.4 to 3.22.4
Release notes

Sourced from zod's releases.

v3.22.4

Commits:

  • d931ea3f0f15a6ae64f5f68e3c03912dffb2269d Lint
  • 8e634bd600093b7161487bed705279c892395118 Fix prettier
  • 4018d88f0e94992b2987428c4fda387b99ae2a53 docs: add @​sanity-typed/zod to ecosystem (#2731)
  • 15ba5a4d4cb5be5af23771de0ba1346b4ba20a0e docs: add zod-sandbox to README ecosystem links (#2707)
  • 699ccae13b875d4fcadac268fd789c93b6ce8aef Export jsdoc with @deprecated when building (#2717)
  • dfe3719eae250ab3eca2d276da6c292867899cc6 Fix sanity-typed links (#2840)
  • cd7991e04a550868bfcb5b5d46e5eb5bc7edf5f3 fix ulid regex (#2225)
  • 7cb4ba2f85dd6b28290dda5de80ed54dfd2a793c Remove stalebot
  • 9340fd51e48576a75adc919bff65dbc4a5d4c99b Lazy emojiRegex
  • e7a9b9b3033991be6b4225f1be21da39c250bbb0 3.22.4

v3.22.3

Commits:

  • 1e23990bcdd33d1e81b31e40e77a031fcfd87ce1 Commit
  • 9bd3879b482f139fd03d5025813ee66a04195cdd docs: remove obsolete text about readonly types (#2676)
  • f59be093ec21430d9f32bbcb628d7e39116adf34 clarify datetime ISO 8601 (#2673)
  • 64dcc8e2b16febe48fa8e3c82c47c92643e6c9e3 Update sponsors
  • 18115a8f128680b4526df58ce96deab7dce93b93 Formatting
  • 28c19273658b164c53c149785fa7a8187c428ad4 Update sponsors
  • ad2ee9ccf723c4388158ff6b8669c2a6cdc85643 2718 Updated Custom Schemas documentation example to use type narrowing (#2778)
  • ae0f7a2c15e7741ee1b23c03a3bfb9acebd86551 docs: update ref to discriminated-unions docs (#2485)
  • 2ba00fe2377f4d53947a84b8cdb314a63bbd6dd4 [2609] fix ReDoS vulnerability in email regex (#2824)
  • 1e61d76cdec05de9271fc0df58798ddf9ce94923 3.22.3

v3.22.2

Commits:

  • 13d9e6bda286cbd4c1b177171273695d8309e5de Fix lint
  • 0d49f10b3c25a8e4cbb6534cc0773b195c56d06d docs: add typeschema to ecosystem (#2626)
  • 8e4af7b56df6f2e3daf0dd825b986f1d963025ce X to Zod: add app.quicktype.io (#2668)
  • 792b3ef0d41c144cd10641c6966b98dae1222d82 Fix superrefine types

v3.22.1

Commits:

Fix handing of this in ZodFunction schemas. The parse logic for function schemas now requires the Reflect API.

const methodObject = z.object({
  property: z.number(),
  method: z.function().args(z.string()).returns(z.number()),
});
const methodInstance = {
  property: 3,
  method: function (s: string) {
    return s.length + this.property;
</tr></table>

... (truncated)

Commits

Updates `next` from 13.5.1 to 13.5.6
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cloudquery/cloudquery/network/alerts).
--- website/package-lock.json | 2173 +++++++++++++++++++++++++++++-------- website/package.json | 6 +- 2 files changed, 1715 insertions(+), 464 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index 0c49a6ddebac13..f5a3b812fb130d 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -17,11 +17,11 @@ "gray-matter": "^4.0.3", "hastscript": "^8.0.0", "locate-path": "^7.2.0", - "next": "^13.5.1", + "next": "^13.5.6", "next-seo": "^5.15.0", "next-sitemap": "^4.0.0", - "nextra": "^2.2.16", - "nextra-theme-docs": "^2.2.16", + "nextra": "^2.13.2", + "nextra-theme-docs": "^2.13.2", "prism-react-renderer": "1.3.5", "prismjs": "1.29.0", "react": "18.2.0", @@ -468,6 +468,11 @@ "node": ">=6.9.0" } }, + "node_modules/@braintree/sanitize-url": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz", + "integrity": "sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==" + }, "node_modules/@corex/deepmerge": { "version": "4.0.37", "resolved": "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-4.0.37.tgz", @@ -640,10 +645,9 @@ } }, "node_modules/@mdx-js/mdx": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.2.1.tgz", - "integrity": "sha512-hZ3ex7exYLJn6FfReq8yTvA6TE53uW9UHJQM9IlSauOuS55J9y8RtA7W+dzp6Yrzr00/U1sd7q+Wf61q6SfiTQ==", - "license": "MIT", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.3.0.tgz", + "integrity": "sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==", "dependencies": { "@types/estree-jsx": "^1.0.0", "@types/mdx": "^2.0.0", @@ -683,10 +687,9 @@ } }, "node_modules/@mdx-js/react": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.2.1.tgz", - "integrity": "sha512-YdXcMcEnqZhzql98RNrqYo9cEhTTesBiCclEtoiQUbJwx87q9453GTapYU6kJ8ZZ2ek1Vp25SiAXEFy5O/eAPw==", - "license": "MIT", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-2.3.0.tgz", + "integrity": "sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==", "dependencies": { "@types/mdx": "^2.0.0", "@types/react": ">=16" @@ -700,30 +703,30 @@ } }, "node_modules/@napi-rs/simple-git": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git/-/simple-git-0.1.8.tgz", - "integrity": "sha512-BvOMdkkofTz6lEE35itJ/laUokPhr/5ToMGlOH25YnhLD2yN1KpRAT4blW9tT8281/1aZjW3xyi73bs//IrDKA==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git/-/simple-git-0.1.9.tgz", + "integrity": "sha512-qKzDS0+VjMvVyU28px+C6zlD1HKy83NIdYzfMQWa/g/V1iG/Ic8uwrS2ihHfm7mp7X0PPrmINLiTTi6ieUIKfw==", "engines": { "node": ">= 10" }, "optionalDependencies": { - "@napi-rs/simple-git-android-arm-eabi": "0.1.8", - "@napi-rs/simple-git-android-arm64": "0.1.8", - "@napi-rs/simple-git-darwin-arm64": "0.1.8", - "@napi-rs/simple-git-darwin-x64": "0.1.8", - "@napi-rs/simple-git-linux-arm-gnueabihf": "0.1.8", - "@napi-rs/simple-git-linux-arm64-gnu": "0.1.8", - "@napi-rs/simple-git-linux-arm64-musl": "0.1.8", - "@napi-rs/simple-git-linux-x64-gnu": "0.1.8", - "@napi-rs/simple-git-linux-x64-musl": "0.1.8", - "@napi-rs/simple-git-win32-arm64-msvc": "0.1.8", - "@napi-rs/simple-git-win32-x64-msvc": "0.1.8" + "@napi-rs/simple-git-android-arm-eabi": "0.1.9", + "@napi-rs/simple-git-android-arm64": "0.1.9", + "@napi-rs/simple-git-darwin-arm64": "0.1.9", + "@napi-rs/simple-git-darwin-x64": "0.1.9", + "@napi-rs/simple-git-linux-arm-gnueabihf": "0.1.9", + "@napi-rs/simple-git-linux-arm64-gnu": "0.1.9", + "@napi-rs/simple-git-linux-arm64-musl": "0.1.9", + "@napi-rs/simple-git-linux-x64-gnu": "0.1.9", + "@napi-rs/simple-git-linux-x64-musl": "0.1.9", + "@napi-rs/simple-git-win32-arm64-msvc": "0.1.9", + "@napi-rs/simple-git-win32-x64-msvc": "0.1.9" } }, "node_modules/@napi-rs/simple-git-android-arm-eabi": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-android-arm-eabi/-/simple-git-android-arm-eabi-0.1.8.tgz", - "integrity": "sha512-JJCejHBB1G6O8nxjQLT4quWCcvLpC3oRdJJ9G3MFYSCoYS8i1bWCWeU+K7Br+xT+D6s1t9q8kNJAwJv9Ygpi0g==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-android-arm-eabi/-/simple-git-android-arm-eabi-0.1.9.tgz", + "integrity": "sha512-9D4JnfePMpgL4pg9aMUX7/TIWEUQ+Tgx8n3Pf8TNCMGjUbImJyYsDSLJzbcv9wH7srgn4GRjSizXFJHAPjzEug==", "cpu": [ "arm" ], @@ -736,9 +739,9 @@ } }, "node_modules/@napi-rs/simple-git-android-arm64": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-android-arm64/-/simple-git-android-arm64-0.1.8.tgz", - "integrity": "sha512-mraHzwWBw3tdRetNOS5KnFSjvdAbNBnjFLA8I4PwTCPJj3Q4txrigcPp2d59cJ0TC51xpnPXnZjYdNwwSI9g6g==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-android-arm64/-/simple-git-android-arm64-0.1.9.tgz", + "integrity": "sha512-Krilsw0gPrrASZzudNEl9pdLuNbhoTK0j7pUbfB8FRifpPdFB/zouwuEm0aSnsDXN4ftGrmGG82kuiR/2MeoPg==", "cpu": [ "arm64" ], @@ -751,13 +754,12 @@ } }, "node_modules/@napi-rs/simple-git-darwin-arm64": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-darwin-arm64/-/simple-git-darwin-arm64-0.1.8.tgz", - "integrity": "sha512-ufy/36eI/j4UskEuvqSH7uXtp3oXeLDmjQCfKJz3u5Vx98KmOMKrqAm2H81AB2WOtCo5mqS6PbBeUXR8BJX8lQ==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-darwin-arm64/-/simple-git-darwin-arm64-0.1.9.tgz", + "integrity": "sha512-H/F09nDgYjv4gcFrZBgdTKkZEepqt0KLYcCJuUADuxkKupmjLdecMhypXLk13AzvLW4UQI7NlLTLDXUFLyr2BA==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "darwin" @@ -767,9 +769,9 @@ } }, "node_modules/@napi-rs/simple-git-darwin-x64": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-darwin-x64/-/simple-git-darwin-x64-0.1.8.tgz", - "integrity": "sha512-Vb21U+v3tPJNl+8JtIHHT8HGe6WZ8o1Tq3f6p+Jx9Cz71zEbcIiB9FCEMY1knS/jwQEOuhhlI9Qk7d4HY+rprA==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-darwin-x64/-/simple-git-darwin-x64-0.1.9.tgz", + "integrity": "sha512-jBR2xS9nVPqmHv0TWz874W0m/d453MGrMeLjB+boK5IPPLhg3AWIZj0aN9jy2Je1BGVAa0w3INIQJtBBeB6kFA==", "cpu": [ "x64" ], @@ -782,9 +784,9 @@ } }, "node_modules/@napi-rs/simple-git-linux-arm-gnueabihf": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm-gnueabihf/-/simple-git-linux-arm-gnueabihf-0.1.8.tgz", - "integrity": "sha512-6BPTJ7CzpSm2t54mRLVaUr3S7ORJfVJoCk2rQ8v8oDg0XAMKvmQQxOsAgqKBo9gYNHJnqrOx3AEuEgvB586BuQ==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm-gnueabihf/-/simple-git-linux-arm-gnueabihf-0.1.9.tgz", + "integrity": "sha512-3n0+VpO4YfZxndZ0sCvsHIvsazd+JmbSjrlTRBCnJeAU1/sfos3skNZtKGZksZhjvd+3o+/GFM8L7Xnv01yggA==", "cpu": [ "arm" ], @@ -797,13 +799,12 @@ } }, "node_modules/@napi-rs/simple-git-linux-arm64-gnu": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm64-gnu/-/simple-git-linux-arm64-gnu-0.1.8.tgz", - "integrity": "sha512-qfESqUCAA/XoQpRXHptSQ8gIFnETCQt1zY9VOkplx6tgYk9PCeaX4B1Xuzrh3eZamSCMJFn+1YB9Ut8NwyGgAA==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm64-gnu/-/simple-git-linux-arm64-gnu-0.1.9.tgz", + "integrity": "sha512-lIzf0KHU2SKC12vMrWwCtysG2Sdt31VHRPMUiz9lD9t3xwVn8qhFSTn5yDkTeG3rgX6o0p5EKalfQN5BXsJq2w==", "cpu": [ "arm64" ], - "hasInstallScript": true, "optional": true, "os": [ "linux" @@ -813,13 +814,12 @@ } }, "node_modules/@napi-rs/simple-git-linux-arm64-musl": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm64-musl/-/simple-git-linux-arm64-musl-0.1.8.tgz", - "integrity": "sha512-G80BQPpaRmQpn8dJGHp4I2/YVhWDUNJwcCrJAtAdbKFDCMyCHJBln2ERL/+IEUlIAT05zK/c1Z5WEprvXEdXow==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-arm64-musl/-/simple-git-linux-arm64-musl-0.1.9.tgz", + "integrity": "sha512-KQozUoNXrxrB8k741ncWXSiMbjl1AGBGfZV21PANzUM8wH4Yem2bg3kfglYS/QIx3udspsT35I9abu49n7D1/w==", "cpu": [ "arm64" ], - "hasInstallScript": true, "optional": true, "os": [ "linux" @@ -829,13 +829,12 @@ } }, "node_modules/@napi-rs/simple-git-linux-x64-gnu": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-x64-gnu/-/simple-git-linux-x64-gnu-0.1.8.tgz", - "integrity": "sha512-NI6o1sZYEf6vPtNWJAm9w8BxJt+LlSFW0liSjYe3lc3e4dhMfV240f0ALeqlwdIldRPaDFwZSJX5/QbS7nMzhw==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-x64-gnu/-/simple-git-linux-x64-gnu-0.1.9.tgz", + "integrity": "sha512-O/Niui5mnHPcK3iYC3ui8wgERtJWsQ3Y74W/09t0bL/3dgzGMl4oQt0qTj9dWCsnoGsIEYHPzwCBp/2vqYp/pw==", "cpu": [ "x64" ], - "hasInstallScript": true, "optional": true, "os": [ "linux" @@ -845,13 +844,12 @@ } }, "node_modules/@napi-rs/simple-git-linux-x64-musl": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-x64-musl/-/simple-git-linux-x64-musl-0.1.8.tgz", - "integrity": "sha512-wljGAEOW41er45VTiU8kXJmO480pQKzsgRCvPlJJSCaEVBbmo6XXbFIXnZy1a2J3Zyy2IOsRB4PVkUZaNuPkZQ==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-linux-x64-musl/-/simple-git-linux-x64-musl-0.1.9.tgz", + "integrity": "sha512-L9n+e8Wn3hKr3RsIdY8GaB+ry4xZ4BaGwyKExgoB8nDGQuRUY9oP6p0WA4hWfJvJnU1H6hvo36a5UFPReyBO7A==", "cpu": [ "x64" ], - "hasInstallScript": true, "optional": true, "os": [ "linux" @@ -861,9 +859,9 @@ } }, "node_modules/@napi-rs/simple-git-win32-arm64-msvc": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-win32-arm64-msvc/-/simple-git-win32-arm64-msvc-0.1.8.tgz", - "integrity": "sha512-QuV4QILyKPfbWHoQKrhXqjiCClx0SxbCTVogkR89BwivekqJMd9UlMxZdoCmwLWutRx4z9KmzQqokvYI5QeepA==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-win32-arm64-msvc/-/simple-git-win32-arm64-msvc-0.1.9.tgz", + "integrity": "sha512-Z6Ja/SZK+lMvRWaxj7wjnvSbAsGrH006sqZo8P8nxKUdZfkVvoCaAWr1r0cfkk2Z3aijLLtD+vKeXGlUPH6gGQ==", "cpu": [ "arm64" ], @@ -876,9 +874,9 @@ } }, "node_modules/@napi-rs/simple-git-win32-x64-msvc": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-win32-x64-msvc/-/simple-git-win32-x64-msvc-0.1.8.tgz", - "integrity": "sha512-UzNS4JtjhZhZ5hRLq7BIUq+4JOwt1ThIKv11CsF1ag2l99f0123XvfEpjczKTaa94nHtjXYc2Mv9TjccBqYOew==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@napi-rs/simple-git-win32-x64-msvc/-/simple-git-win32-x64-msvc-0.1.9.tgz", + "integrity": "sha512-VAZj1UvC+R2MjKOD3I/Y7dmQlHWAYy4omhReQJRpbCf+oGCBi9CWiIduGqeYEq723nLIKdxP7XjaO0wl1NnUww==", "cpu": [ "x64" ], @@ -891,9 +889,9 @@ } }, "node_modules/@next/env": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.1.tgz", - "integrity": "sha512-CIMWiOTyflFn/GFx33iYXkgLSQsMQZV4jB91qaj/TfxGaGOXxn8C1j72TaUSPIyN7ziS/AYG46kGmnvuk1oOpg==" + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", + "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==" }, "node_modules/@next/eslint-plugin-next": { "version": "13.1.5", @@ -925,9 +923,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.1.tgz", - "integrity": "sha512-Bcd0VFrLHZnMmJy6LqV1CydZ7lYaBao8YBEdQUVzV8Ypn/l5s//j5ffjfvMzpEQ4mzlAj3fIY+Bmd9NxpWhACw==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", + "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", "cpu": [ "arm64" ], @@ -940,9 +938,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.1.tgz", - "integrity": "sha512-uvTZrZa4D0bdWa1jJ7X1tBGIxzpqSnw/ATxWvoRO9CVBvXSx87JyuISY+BWsfLFF59IRodESdeZwkWM2l6+Kjg==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", + "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", "cpu": [ "x64" ], @@ -955,9 +953,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.1.tgz", - "integrity": "sha512-/52ThlqdORPQt3+AlMoO+omicdYyUEDeRDGPAj86ULpV4dg+/GCFCKAmFWT0Q4zChFwsAoZUECLcKbRdcc0SNg==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", + "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", "cpu": [ "arm64" ], @@ -970,9 +968,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.1.tgz", - "integrity": "sha512-L4qNXSOHeu1hEAeeNsBgIYVnvm0gg9fj2O2Yx/qawgQEGuFBfcKqlmIE/Vp8z6gwlppxz5d7v6pmHs1NB6R37w==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", + "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", "cpu": [ "arm64" ], @@ -985,9 +983,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.1.tgz", - "integrity": "sha512-QVvMrlrFFYvLtABk092kcZ5Mzlmsk2+SV3xYuAu8sbTuIoh0U2+HGNhVklmuYCuM3DAAxdiMQTNlRQmNH11udw==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", + "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", "cpu": [ "x64" ], @@ -1000,9 +998,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.1.tgz", - "integrity": "sha512-bBnr+XuWc28r9e8gQ35XBtyi5KLHLhTbEvrSgcWna8atI48sNggjIK8IyiEBO3KIrcUVXYkldAzGXPEYMnKt1g==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", + "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", "cpu": [ "x64" ], @@ -1015,9 +1013,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.1.tgz", - "integrity": "sha512-EQGeE4S5c9v06jje9gr4UlxqUEA+zrsgPi6kg9VwR+dQHirzbnVJISF69UfKVkmLntknZJJI9XpWPB6q0Z7mTg==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", + "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", "cpu": [ "arm64" ], @@ -1030,9 +1028,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.1.tgz", - "integrity": "sha512-1y31Q6awzofVjmbTLtRl92OX3s+W0ZfO8AP8fTnITcIo9a6ATDc/eqa08fd6tSpFu6IFpxOBbdevOjwYTGx/AQ==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", + "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", "cpu": [ "ia32" ], @@ -1045,9 +1043,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.1.tgz", - "integrity": "sha512-+9XBQizy7X/GuwNegq+5QkkxAPV7SBsIwapVRQd9WSvvU20YO23B3bZUpevdabi4fsd25y9RJDDncljy/V54ww==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", + "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", "cpu": [ "x64" ], @@ -1140,6 +1138,27 @@ "tslib": "^2.4.0" } }, + "node_modules/@theguild/remark-mermaid": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@theguild/remark-mermaid/-/remark-mermaid-0.0.5.tgz", + "integrity": "sha512-e+ZIyJkEv9jabI4m7q29wZtZv+2iwPGsXJ2d46Zi7e+QcFudiyuqhLhHG/3gX3ZEB+hxTch+fpItyMS8jwbIcw==", + "dependencies": { + "mermaid": "^10.2.2", + "unist-util-visit": "^5.0.0" + }, + "peerDependencies": { + "react": "^18.2.0" + } + }, + "node_modules/@theguild/remark-npm2yarn": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@theguild/remark-npm2yarn/-/remark-npm2yarn-0.2.1.tgz", + "integrity": "sha512-jUTFWwDxtLEFtGZh/TW/w30ySaDJ8atKWH8dq2/IiQF61dPrGfETpl0WxD0VdBfuLOeU14/kop466oBSRO/5CA==", + "dependencies": { + "npm-to-yarn": "^2.1.0", + "unist-util-visit": "^5.0.0" + } + }, "node_modules/@typeform/embed": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/@typeform/embed/-/embed-2.16.1.tgz", @@ -1172,6 +1191,24 @@ "@types/estree": "*" } }, + "node_modules/@types/d3-scale": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", + "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==", + "dependencies": { + "@types/d3-time": "*" + } + }, + "node_modules/@types/d3-scale-chromatic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz", + "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==" + }, + "node_modules/@types/d3-time": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz", + "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==" + }, "node_modules/@types/debug": { "version": "4.1.7", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz", @@ -1377,9 +1414,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1414,6 +1451,11 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" + }, "node_modules/acorn": { "version": "8.8.0", "license": "MIT", @@ -1461,9 +1503,9 @@ } }, "node_modules/ansi-sequence-parser": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.0.tgz", - "integrity": "sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz", + "integrity": "sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==" }, "node_modules/ansi-styles": { "version": "3.2.1", @@ -1856,9 +1898,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001473", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz", - "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==", + "version": "1.0.30001574", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz", + "integrity": "sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg==", "funding": [ { "type": "opencollective", @@ -2023,10 +2065,9 @@ } }, "node_modules/clsx": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", - "license": "MIT", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", "engines": { "node": ">=6" } @@ -2141,6 +2182,14 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/cose-base": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz", + "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==", + "dependencies": { + "layout-base": "^1.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2175,194 +2224,709 @@ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", "license": "MIT" }, - "node_modules/damerau-levenshtein": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "license": "MIT", + "node_modules/cytoscape": { + "version": "3.28.1", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz", + "integrity": "sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==", "dependencies": { - "ms": "2.1.2" + "heap": "^0.2.6", + "lodash": "^4.17.21" }, "engines": { - "node": ">=6.0" + "node": ">=0.10" + } + }, + "node_modules/cytoscape-cose-bilkent": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz", + "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==", + "dependencies": { + "cose-base": "^1.0.0" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "peerDependencies": { + "cytoscape": "^3.2.0" } }, - "node_modules/decode-named-character-reference": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz", - "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==", - "license": "MIT", + "node_modules/cytoscape-fcose": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", + "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", "dependencies": { - "character-entities": "^2.0.0" + "cose-base": "^2.2.0" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "peerDependencies": { + "cytoscape": "^3.2.0" } }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "node_modules/cytoscape-fcose/node_modules/cose-base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", + "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", "dependencies": { - "mimic-response": "^3.1.0" + "layout-base": "^2.0.0" + } + }, + "node_modules/cytoscape-fcose/node_modules/layout-base": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", + "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==" + }, + "node_modules/d3": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz", + "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==", + "dependencies": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "4", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dependencies": { + "internmap": "1 - 2" + }, "engines": { - "node": ">=4.0.0" + "node": ">=12" } }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/define-lazy-prop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "dev": true, + "node_modules/d3-axis": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", + "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==", "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "dev": true, - "license": "MIT", + "node_modules/d3-brush": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", + "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "3", + "d3-transition": "3" }, "engines": { - "node": ">= 0.4" + "node": ">=12" + } + }, + "node_modules/d3-chord": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", + "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", + "dependencies": { + "d3-path": "1 - 3" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=12" } }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "license": "MIT", + "node_modules/d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", "engines": { - "node": ">=6" + "node": ">=12" } }, - "node_modules/detect-libc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", - "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", + "node_modules/d3-contour": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz", + "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==", + "dependencies": { + "d3-array": "^3.2.0" + }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/didyoumean": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", - "dev": true, - "license": "Apache-2.0" + "node_modules/d3-delaunay": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz", + "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==", + "dependencies": { + "delaunator": "5" + }, + "engines": { + "node": ">=12" + } }, - "node_modules/diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", - "license": "BSD-3-Clause", + "node_modules/d3-dispatch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", + "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", "engines": { - "node": ">=0.3.1" + "node": ">=12" } }, - "node_modules/dir-glob": { + "node_modules/d3-drag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", + "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-selection": "3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", "dependencies": { - "path-type": "^4.0.0" + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json.js", + "csv2tsv": "bin/dsv2dsv.js", + "dsv2dsv": "bin/dsv2dsv.js", + "dsv2json": "bin/dsv2json.js", + "json2csv": "bin/json2dsv.js", + "json2dsv": "bin/json2dsv.js", + "json2tsv": "bin/json2dsv.js", + "tsv2csv": "bin/dsv2dsv.js", + "tsv2json": "bin/dsv2json.js" }, "engines": { - "node": ">=8" + "node": ">=12" } }, - "node_modules/dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", - "dev": true, - "license": "MIT" + "node_modules/d3-dsv/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } }, - "node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "license": "Apache-2.0", + "node_modules/d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-fetch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", + "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", "dependencies": { - "esutils": "^2.0.2" + "d3-dsv": "1 - 3" }, "engines": { - "node": ">=0.10.0" + "node": ">=12" } }, - "node_modules/electron-to-chromium": { - "version": "1.4.284", - "dev": true, - "license": "ISC" + "node_modules/d3-force": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", + "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-quadtree": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + } }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" + "node_modules/d3-format": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "engines": { + "node": ">=12" + } }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "node_modules/d3-geo": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz", + "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==", "dependencies": { - "once": "^1.4.0" + "d3-array": "2.5.0 - 3" + }, + "engines": { + "node": ">=12" } }, - "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", - "dev": true, + "node_modules/d3-hierarchy": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" + "d3-color": "1 - 3" }, "engines": { - "node": ">=10.13.0" + "node": ">=12" + } + }, + "node_modules/d3-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-polygon": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", + "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-quadtree": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", + "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-random": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", + "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-sankey": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.12.3.tgz", + "integrity": "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==", + "dependencies": { + "d3-array": "1 - 2", + "d3-shape": "^1.2.0" + } + }, + "node_modules/d3-sankey/node_modules/d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "dependencies": { + "internmap": "^1.0.0" + } + }, + "node_modules/d3-sankey/node_modules/d3-path": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz", + "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==" + }, + "node_modules/d3-sankey/node_modules/d3-shape": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz", + "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==", + "dependencies": { + "d3-path": "1" + } + }, + "node_modules/d3-sankey/node_modules/internmap": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", + "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==" + }, + "node_modules/d3-scale": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", + "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "dependencies": { + "d3-array": "2.10.0 - 3", + "d3-format": "1 - 3", + "d3-interpolate": "1.2.0 - 3", + "d3-time": "2.1.1 - 3", + "d3-time-format": "2 - 4" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "dependencies": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-selection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-shape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", + "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", + "dependencies": { + "d3-path": "^3.1.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", + "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", + "dependencies": { + "d3-array": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "dependencies": { + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-timer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-transition": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "dependencies": { + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "d3-selection": "2 - 3" + } + }, + "node_modules/d3-zoom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "dependencies": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/dagre-d3-es": { + "version": "7.0.10", + "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.10.tgz", + "integrity": "sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==", + "dependencies": { + "d3": "^7.8.2", + "lodash-es": "^4.17.21" + } + }, + "node_modules/damerau-levenshtein": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", + "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/dayjs": { + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decode-named-character-reference": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz", + "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==", + "license": "MIT", + "dependencies": { + "character-entities": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/define-properties": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delaunator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz", + "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==", + "dependencies": { + "robust-predicates": "^3.0.0" + } + }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/detect-libc": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/devlop": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", + "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", + "dependencies": { + "dequal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/didyoumean": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/diff": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", + "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true, + "license": "MIT" + }, + "node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dompurify": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.7.tgz", + "integrity": "sha512-BViYTZoqP3ak/ULKOc101y+CtHDUvBsVgSxIF1ku0HmK6BRf+C03MC+tArMvOPtVtZp83DDh5puywKDu4sbVjQ==" + }, + "node_modules/electron-to-chromium": { + "version": "1.4.284", + "dev": true, + "license": "ISC" + }, + "node_modules/elkjs": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.8.2.tgz", + "integrity": "sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enhanced-resolve": { + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/es-abstract": { @@ -3259,8 +3823,9 @@ "license": "ISC" }, "node_modules/flexsearch": { - "version": "0.7.21", - "license": "Apache-2.0" + "version": "0.7.31", + "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.7.31.tgz", + "integrity": "sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==" }, "node_modules/focus-visible": { "version": "5.2.0", @@ -3579,10 +4144,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "license": "ISC" + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/grapheme-splitter": { "version": "1.0.4", @@ -3711,77 +4275,246 @@ "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hash-obj": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/hash-obj/-/hash-obj-4.0.0.tgz", + "integrity": "sha512-FwO1BUVWkyHasWDW4S8o0ssQXjvyghLV2rfVhnN36b2bbcj45eGiuzdn9XOvOpjV3TKQD7Gm2BWNXdE9V4KKYg==", + "dependencies": { + "is-obj": "^3.0.0", + "sort-keys": "^5.0.0", + "type-fest": "^1.0.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hash-obj/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hast-util-from-dom": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/hast-util-from-dom/-/hast-util-from-dom-5.0.0.tgz", + "integrity": "sha512-d6235voAp/XR3Hh5uy7aGLbM3S4KamdW0WEgOaU1YoewnuYw4HXb5eRtv9g65m/RFGEfUY1Mw4UqCc5Y8L4Stg==", + "dependencies": { + "@types/hast": "^3.0.0", + "hastscript": "^8.0.0", + "web-namespaces": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-dom/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-from-html": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hast-util-from-html/-/hast-util-from-html-2.0.1.tgz", + "integrity": "sha512-RXQBLMl9kjKVNkJTIO6bZyb2n+cUH8LFaSSzo82jiLT6Tfc+Pt7VQCS+/h3YwG4jaNE2TA2sdJisGWR+aJrp0g==", + "dependencies": { + "@types/hast": "^3.0.0", + "devlop": "^1.1.0", + "hast-util-from-parse5": "^8.0.0", + "parse5": "^7.0.0", + "vfile": "^6.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-html-isomorphic": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hast-util-from-html-isomorphic/-/hast-util-from-html-isomorphic-2.0.0.tgz", + "integrity": "sha512-zJfpXq44yff2hmE0XmwEOzdWin5xwH+QIhMLOScpX91e/NSGPsAzNCvLQDIEPyO2TXi+lBmU6hjLIhV8MwP2kw==", + "dependencies": { + "@types/hast": "^3.0.0", + "hast-util-from-dom": "^5.0.0", + "hast-util-from-html": "^2.0.0", + "unist-util-remove-position": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-html-isomorphic/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-from-html-isomorphic/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/hast-util-from-html-isomorphic/node_modules/unist-util-remove-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz", + "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-html/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-from-html/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/hast-util-from-html/node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-html/node_modules/vfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", + "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-html/node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-from-parse5": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.1.tgz", + "integrity": "sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "devlop": "^1.0.0", + "hastscript": "^8.0.0", + "property-information": "^6.0.0", + "vfile": "^6.0.0", + "vfile-location": "^5.0.0", + "web-namespaces": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, - "node_modules/hash-obj": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/hash-obj/-/hash-obj-4.0.0.tgz", - "integrity": "sha512-FwO1BUVWkyHasWDW4S8o0ssQXjvyghLV2rfVhnN36b2bbcj45eGiuzdn9XOvOpjV3TKQD7Gm2BWNXdE9V4KKYg==", + "node_modules/hast-util-from-parse5/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", "dependencies": { - "is-obj": "^3.0.0", - "sort-keys": "^5.0.0", - "type-fest": "^1.0.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "@types/unist": "*" } }, - "node_modules/hash-obj/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "engines": { - "node": ">=10" + "node_modules/hast-util-from-parse5/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/hast-util-from-parse5/node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dependencies": { + "@types/unist": "^3.0.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, - "node_modules/hast-util-from-parse5": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.1.tgz", - "integrity": "sha512-R6PoNcUs89ZxLJmMWsVbwSWuz95/9OriyQZ3e2ybwqGsRXzhA6gv49rgGmQvLbZuSNDv9fCg7vV7gXUsvtUFaA==", - "license": "MIT", + "node_modules/hast-util-from-parse5/node_modules/vfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", + "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", "dependencies": { - "@types/hast": "^2.0.0", - "@types/unist": "^2.0.0", - "hastscript": "^7.0.0", - "property-information": "^6.0.0", - "vfile": "^5.0.0", - "vfile-location": "^4.0.0", - "web-namespaces": "^2.0.0" + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0", + "vfile-message": "^4.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, - "node_modules/hast-util-from-parse5/node_modules/hast-util-parse-selector": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-3.1.1.tgz", - "integrity": "sha512-jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA==", + "node_modules/hast-util-from-parse5/node_modules/vfile-location": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz", + "integrity": "sha512-NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg==", "dependencies": { - "@types/hast": "^2.0.0" + "@types/unist": "^3.0.0", + "vfile": "^6.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, - "node_modules/hast-util-from-parse5/node_modules/hastscript": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-7.2.0.tgz", - "integrity": "sha512-TtYPq24IldU8iKoJQqvZOuhi5CyCQRAbvDOX0x1eW6rsHSxa/1i2CCiptNTotGHJ3VoHRGmqiv6/D3q113ikkw==", + "node_modules/hast-util-from-parse5/node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", "dependencies": { - "@types/hast": "^2.0.0", - "comma-separated-tokens": "^2.0.0", - "hast-util-parse-selector": "^3.0.0", - "property-information": "^6.0.0", - "space-separated-tokens": "^2.0.0" + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" }, "funding": { "type": "opencollective", @@ -3789,19 +4522,25 @@ } }, "node_modules/hast-util-is-element": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.3.tgz", - "integrity": "sha512-O1bKah6mhgEq2WtVMk+Ta5K7pPMqsBBlmzysLdcwKVrqzZQ0CHqUPiIVspNhAG1rvxpvJjtGee17XfauZYKqVA==", - "license": "MIT", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz", + "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==", "dependencies": { - "@types/hast": "^2.0.0", - "@types/unist": "^2.0.0" + "@types/hast": "^3.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, + "node_modules/hast-util-is-element/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/hast-util-parse-selector": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz", @@ -3822,6 +4561,205 @@ "@types/unist": "*" } }, + "node_modules/hast-util-raw": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.0.1.tgz", + "integrity": "sha512-5m1gmba658Q+lO5uqL5YNGQWeh1MYWZbZmWrM5lncdcuiXuo5E2HT/CIOp0rLF8ksfSwiCVJ3twlgVRyTGThGA==", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "@ungap/structured-clone": "^1.0.0", + "hast-util-from-parse5": "^8.0.0", + "hast-util-to-parse5": "^8.0.0", + "html-void-elements": "^3.0.0", + "mdast-util-to-hast": "^13.0.0", + "parse5": "^7.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "vfile": "^6.0.0", + "web-namespaces": "^2.0.0", + "zwitch": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-raw/node_modules/@types/mdast": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz", + "integrity": "sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-raw/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/hast-util-raw/node_modules/mdast-util-to-hast": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.0.2.tgz", + "integrity": "sha512-U5I+500EOOw9e3ZrclN3Is3fRpw8c19SMyNZlZ2IS+7vLsNzb2Om11VpIVOR+/0137GhZsFEF6YiKD5+0Hr2Og==", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/mdast": "^4.0.0", + "@ungap/structured-clone": "^1.0.0", + "devlop": "^1.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "trim-lines": "^3.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw/node_modules/micromark-util-character": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.0.1.tgz", + "integrity": "sha512-3wgnrmEAJ4T+mGXAUfMvMAbxU9RDG43XmGce4j6CwPtVxB3vfwXSZ6KhFwDzZ3mZHhmPimMAXg71veiBGzeAZw==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/hast-util-raw/node_modules/micromark-util-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz", + "integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, + "node_modules/hast-util-raw/node_modules/micromark-util-sanitize-uri": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz", + "integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-encode": "^2.0.0", + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/hast-util-raw/node_modules/micromark-util-symbol": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz", + "integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, + "node_modules/hast-util-raw/node_modules/micromark-util-types": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz", + "integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==", + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, + "node_modules/hast-util-raw/node_modules/unist-util-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", + "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw/node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw/node_modules/vfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", + "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-raw/node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/hast-util-to-estree": { "version": "2.1.0", "license": "MIT", @@ -3847,22 +4785,60 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/hast-util-to-parse5": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz", + "integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==", + "dependencies": { + "@types/hast": "^3.0.0", + "comma-separated-tokens": "^2.0.0", + "devlop": "^1.0.0", + "property-information": "^6.0.0", + "space-separated-tokens": "^2.0.0", + "web-namespaces": "^2.0.0", + "zwitch": "^2.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-to-parse5/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/hast-util-to-text": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-3.1.2.tgz", - "integrity": "sha512-tcllLfp23dJJ+ju5wCCZHVpzsQQ43+moJbqVX3jNWPB7z/KFC4FyZD6R7y94cHL6MQ33YtMZL8Z0aIXXI4XFTw==", - "license": "MIT", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-4.0.0.tgz", + "integrity": "sha512-EWiE1FSArNBPUo1cKWtzqgnuRQwEeQbQtnFJRYV1hb1BWDgrAlBU0ExptvZMM/KSA82cDpm2sFGf3Dmc5Mza3w==", "dependencies": { - "@types/hast": "^2.0.0", - "@types/unist": "^2.0.0", - "hast-util-is-element": "^2.0.0", - "unist-util-find-after": "^4.0.0" + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "hast-util-is-element": "^3.0.0", + "unist-util-find-after": "^5.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, + "node_modules/hast-util-to-text/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/hast-util-to-text/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, "node_modules/hast-util-whitespace": { "version": "2.0.0", "license": "MIT", @@ -3895,6 +4871,31 @@ "@types/unist": "*" } }, + "node_modules/heap": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz", + "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==" + }, + "node_modules/html-void-elements": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", + "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -3991,6 +4992,14 @@ "node": ">= 0.4" } }, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "engines": { + "node": ">=12" + } + }, "node_modules/intersection-observer": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.12.2.tgz", @@ -4517,21 +5526,25 @@ } }, "node_modules/katex": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.4.tgz", - "integrity": "sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==", + "version": "0.16.9", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz", + "integrity": "sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==", "funding": [ "https://opencollective.com/katex", "https://github.com/sponsors/katex" ], - "license": "MIT", "dependencies": { - "commander": "^8.0.0" + "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, + "node_modules/khroma": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz", + "integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==" + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -4565,6 +5578,11 @@ "language-subtag-registry": "~0.3.2" } }, + "node_modules/layout-base": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", + "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==" + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -4609,6 +5627,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -5031,6 +6059,33 @@ "node": ">= 8" } }, + "node_modules/mermaid": { + "version": "10.6.1", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.6.1.tgz", + "integrity": "sha512-Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A==", + "dependencies": { + "@braintree/sanitize-url": "^6.0.1", + "@types/d3-scale": "^4.0.3", + "@types/d3-scale-chromatic": "^3.0.0", + "cytoscape": "^3.23.0", + "cytoscape-cose-bilkent": "^4.1.0", + "cytoscape-fcose": "^2.1.0", + "d3": "^7.4.0", + "d3-sankey": "^0.12.3", + "dagre-d3-es": "7.0.10", + "dayjs": "^1.11.7", + "dompurify": "^3.0.5", + "elkjs": "^0.8.2", + "khroma": "^2.0.0", + "lodash-es": "^4.17.21", + "mdast-util-from-markdown": "^1.3.0", + "non-layered-tidy-tree-layout": "^2.0.2", + "stylis": "^4.1.3", + "ts-dedent": "^2.2.0", + "uuid": "^9.0.0", + "web-worker": "^1.2.0" + } + }, "node_modules/micromark": { "version": "3.0.10", "funding": [ @@ -5904,18 +6959,17 @@ "license": "MIT" }, "node_modules/next": { - "version": "13.5.1", - "resolved": "https://registry.npmjs.org/next/-/next-13.5.1.tgz", - "integrity": "sha512-GIudNR7ggGUZoIL79mSZcxbXK9f5pwAIPZxEM8+j2yLqv5RODg4TkmUlaKSYVqE1bPQueamXSqdC3j7axiTSEg==", + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", + "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", "dependencies": { - "@next/env": "13.5.1", + "@next/env": "13.5.6", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", - "postcss": "8.4.14", + "postcss": "8.4.31", "styled-jsx": "5.1.1", - "watchpack": "2.4.0", - "zod": "3.21.4" + "watchpack": "2.4.0" }, "bin": { "next": "dist/bin/next" @@ -5924,15 +6978,15 @@ "node": ">=16.14.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "13.5.1", - "@next/swc-darwin-x64": "13.5.1", - "@next/swc-linux-arm64-gnu": "13.5.1", - "@next/swc-linux-arm64-musl": "13.5.1", - "@next/swc-linux-x64-gnu": "13.5.1", - "@next/swc-linux-x64-musl": "13.5.1", - "@next/swc-win32-arm64-msvc": "13.5.1", - "@next/swc-win32-ia32-msvc": "13.5.1", - "@next/swc-win32-x64-msvc": "13.5.1" + "@next/swc-darwin-arm64": "13.5.6", + "@next/swc-darwin-x64": "13.5.6", + "@next/swc-linux-arm64-gnu": "13.5.6", + "@next/swc-linux-arm64-musl": "13.5.6", + "@next/swc-linux-x64-gnu": "13.5.6", + "@next/swc-linux-x64-musl": "13.5.6", + "@next/swc-win32-arm64-msvc": "13.5.6", + "@next/swc-win32-ia32-msvc": "13.5.6", + "@next/swc-win32-x64-msvc": "13.5.6" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", @@ -6029,63 +7083,40 @@ "react-dom": "*" } }, - "node_modules/next/node_modules/postcss": { - "version": "8.4.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", - "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/next/node_modules/zod": { - "version": "3.21.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", - "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==", - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, "node_modules/nextra": { - "version": "2.2.16", - "resolved": "https://registry.npmjs.org/nextra/-/nextra-2.2.16.tgz", - "integrity": "sha512-rGtCgurEDZ6afzb6gfug/9PZnEEfi981wK5e9XmKMT8sX2ECNJKb2rcg7FpUL4CC01507ibejn1r3WQ8x8M+zw==", + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nextra/-/nextra-2.13.2.tgz", + "integrity": "sha512-pIgOSXNUqTz1laxV4ChFZOU7lzJAoDHHaBPj8L09PuxrLKqU1BU/iZtXAG6bQeKCx8EPdBsoXxEuENnL9QGnGA==", "dependencies": { - "@mdx-js/mdx": "^2.2.1", - "@mdx-js/react": "^2.2.1", - "@napi-rs/simple-git": "^0.1.8", + "@headlessui/react": "^1.7.10", + "@mdx-js/mdx": "^2.3.0", + "@mdx-js/react": "^2.3.0", + "@napi-rs/simple-git": "^0.1.9", + "@theguild/remark-mermaid": "^0.0.5", + "@theguild/remark-npm2yarn": "^0.2.0", + "clsx": "^2.0.0", "github-slugger": "^2.0.0", - "graceful-fs": "^4.2.10", + "graceful-fs": "^4.2.11", "gray-matter": "^4.0.3", - "katex": "^0.16.4", + "katex": "^0.16.9", "lodash.get": "^4.4.2", "next-mdx-remote": "^4.2.1", "p-limit": "^3.1.0", - "rehype-katex": "^6.0.2", - "rehype-pretty-code": "0.9.3", + "rehype-katex": "^7.0.0", + "rehype-pretty-code": "0.9.11", + "rehype-raw": "^7.0.0", "remark-gfm": "^3.0.1", "remark-math": "^5.1.1", "remark-reading-time": "^2.0.1", - "shiki": "^0.14.0", + "shiki": "^0.14.3", "slash": "^3.0.0", "title": "^3.5.3", - "unist-util-remove": "^3.1.0", - "unist-util-visit": "^4.1.1" + "unist-util-remove": "^4.0.0", + "unist-util-visit": "^5.0.0", + "zod": "^3.22.3" + }, + "engines": { + "node": ">=16" }, "peerDependencies": { "next": ">=9.5.3", @@ -6094,41 +7125,50 @@ } }, "node_modules/nextra-theme-docs": { - "version": "2.2.16", - "resolved": "https://registry.npmjs.org/nextra-theme-docs/-/nextra-theme-docs-2.2.16.tgz", - "integrity": "sha512-yVGYZCB1nB9eRhFmXL/rSw6ks1nj8xDNNCyWA6YGAwNgJqlfbwSKrRvVLkzAvCjBv9180mEZwNurub9+RH+F1A==", + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nextra-theme-docs/-/nextra-theme-docs-2.13.2.tgz", + "integrity": "sha512-yE4umXaImp1/kf/sFciPj2+EFrNSwd9Db26hi98sIIiujzGf3+9eUgAz45vF9CwBw50FSXxm1QGRcY+slQ4xQQ==", "dependencies": { "@headlessui/react": "^1.7.10", "@popperjs/core": "^2.11.6", - "clsx": "^1.2.1", - "flexsearch": "^0.7.21", + "clsx": "^2.0.0", + "escape-string-regexp": "^5.0.0", + "flexsearch": "^0.7.31", "focus-visible": "^5.2.0", "git-url-parse": "^13.1.0", "intersection-observer": "^0.12.2", "match-sorter": "^6.3.1", - "next-seo": "^5.5.0", + "next-seo": "^6.0.0", "next-themes": "^0.2.1", "scroll-into-view-if-needed": "^3.0.0", - "zod": "^3.20.2" + "zod": "^3.22.3" }, "peerDependencies": { "next": ">=9.5.3", - "nextra": "2.2.16", + "nextra": "2.13.2", "react": ">=16.13.1", "react-dom": ">=16.13.1" } }, - "node_modules/nextra/node_modules/unist-util-visit": { - "version": "4.1.1", - "license": "MIT", - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0", - "unist-util-visit-parents": "^5.1.1" + "node_modules/nextra-theme-docs/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "engines": { + "node": ">=12" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nextra-theme-docs/node_modules/next-seo": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/next-seo/-/next-seo-6.4.0.tgz", + "integrity": "sha512-XQFxkOL2hw0YE+P100HbI3EAvcludlHPxuzMgaIjKb7kPK0CvjGvLFjd9hszZFEDc5oiQkGFA8+cuWcnip7eYA==", + "peerDependencies": { + "next": "^8.1.1-canary.54 || >=9.0.0", + "react": ">=16.0.0", + "react-dom": ">=16.0.0" } }, "node_modules/node-abi": { @@ -6154,9 +7194,9 @@ } }, "node_modules/node-abi/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -6183,6 +7223,11 @@ "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", "dev": true }, + "node_modules/non-layered-tidy-tree-layout": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz", + "integrity": "sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==" + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -6224,6 +7269,17 @@ "node": ">=4" } }, + "node_modules/npm-to-yarn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/npm-to-yarn/-/npm-to-yarn-2.1.0.tgz", + "integrity": "sha512-2C1IgJLdJngq1bSER7K7CGFszRr9s2rijEwvENPEgI0eK9xlD3tNwDc0UJnRj7FIT2aydWm72jB88uVswAhXHA==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/nebrelbug/npm-to-yarn?sponsor=1" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -6502,10 +7558,15 @@ } }, "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "license": "MIT" + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } }, "node_modules/path-exists": { "version": "4.0.0", @@ -6626,7 +7687,6 @@ "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", - "dev": true, "funding": [ { "type": "opencollective", @@ -7044,65 +8104,99 @@ } }, "node_modules/rehype-katex": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/rehype-katex/-/rehype-katex-6.0.2.tgz", - "integrity": "sha512-C4gDAlS1+l0hJqctyiU64f9CvT00S03qV1T6HiMzbSuLBgWUtcqydWHY9OpKrm0SpkK16FNd62CDKyWLwV2ppg==", - "license": "MIT", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/rehype-katex/-/rehype-katex-7.0.0.tgz", + "integrity": "sha512-h8FPkGE00r2XKU+/acgqwWUlyzve1IiOKwsEkg4pDL3k48PiE0Pt+/uLtVHDVkN1yA4iurZN6UES8ivHVEQV6Q==", "dependencies": { - "@types/hast": "^2.0.0", - "@types/katex": "^0.11.0", - "hast-util-to-text": "^3.1.0", - "katex": "^0.15.0", - "rehype-parse": "^8.0.0", - "unified": "^10.0.0", - "unist-util-remove-position": "^4.0.0", - "unist-util-visit": "^4.0.0" + "@types/hast": "^3.0.0", + "@types/katex": "^0.16.0", + "hast-util-from-html-isomorphic": "^2.0.0", + "hast-util-to-text": "^4.0.0", + "katex": "^0.16.0", + "unist-util-visit-parents": "^6.0.0", + "vfile": "^6.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, - "node_modules/rehype-katex/node_modules/katex": { - "version": "0.15.6", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.15.6.tgz", - "integrity": "sha512-UpzJy4yrnqnhXvRPhjEuLA4lcPn6eRngixW7Q3TJErjg3Aw2PuLFBzTkdUb89UtumxjhHTqL3a5GDGETMSwgJA==", - "funding": [ - "https://opencollective.com/katex", - "https://github.com/sponsors/katex" - ], - "license": "MIT", + "node_modules/rehype-katex/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", "dependencies": { - "commander": "^8.0.0" + "@types/unist": "*" + } + }, + "node_modules/rehype-katex/node_modules/@types/katex": { + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.16.7.tgz", + "integrity": "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==" + }, + "node_modules/rehype-katex/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/rehype-katex/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" }, - "bin": { - "katex": "cli.js" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, - "node_modules/rehype-katex/node_modules/unist-util-visit": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz", - "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==", + "node_modules/rehype-katex/node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0", - "unist-util-visit-parents": "^5.1.1" + "@types/unist": "^3.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" } }, - "node_modules/rehype-parse": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-8.0.4.tgz", - "integrity": "sha512-MJJKONunHjoTh4kc3dsM1v3C9kGrrxvA3U8PxZlP2SjH8RNUSrb+lF7Y0KVaUDnGH2QZ5vAn7ulkiajM9ifuqg==", - "license": "MIT", + "node_modules/rehype-katex/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", "dependencies": { - "@types/hast": "^2.0.0", - "hast-util-from-parse5": "^7.0.0", - "parse5": "^6.0.0", - "unified": "^10.0.0" + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-katex/node_modules/vfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", + "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-katex/node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" }, "funding": { "type": "opencollective", @@ -7110,20 +8204,87 @@ } }, "node_modules/rehype-pretty-code": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/rehype-pretty-code/-/rehype-pretty-code-0.9.3.tgz", - "integrity": "sha512-57i+ifrttqpeQxub0NZ2pRw0aiUPYeBpr234NLWfZ4BfbEaP+29+iCXB1rUMkzoPi6IBC4w4I93mUPgw36IajQ==", + "version": "0.9.11", + "resolved": "https://registry.npmjs.org/rehype-pretty-code/-/rehype-pretty-code-0.9.11.tgz", + "integrity": "sha512-Eq90eCYXQJISktfRZ8PPtwc5SUyH6fJcxS8XOMnHPUQZBtC6RYo67gGlley9X2nR8vlniPj0/7oCDEYHKQa/oA==", "dependencies": { + "@types/hast": "^2.0.0", "hash-obj": "^4.0.0", "parse-numeric-range": "^1.3.0" }, "engines": { - "node": "^12.16.0 || >=13.2.0" + "node": ">=16" }, "peerDependencies": { "shiki": "*" } }, + "node_modules/rehype-raw": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz", + "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==", + "dependencies": { + "@types/hast": "^3.0.0", + "hast-util-raw": "^9.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-raw/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/rehype-raw/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/rehype-raw/node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-raw/node_modules/vfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz", + "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/rehype-raw/node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/remark-directive": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/remark-directive/-/remark-directive-2.0.1.tgz", @@ -7336,6 +8497,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/robust-predicates": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz", + "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==" + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -7360,6 +8526,11 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==" + }, "node_modules/sade": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", @@ -7390,6 +8561,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "node_modules/scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", @@ -7422,11 +8598,10 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -7527,9 +8702,9 @@ } }, "node_modules/shiki": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.1.tgz", - "integrity": "sha512-+Jz4nBkCBe0mEDqo1eKRcCdjRtrCjozmcbTUjbPTX7OOJfEbTZzlUWlZtGe3Gb5oV1/jnojhG//YZc3rs9zSEw==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz", + "integrity": "sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==", "dependencies": { "ansi-sequence-parser": "^1.1.0", "jsonc-parser": "^3.2.0", @@ -7850,6 +9025,11 @@ } } }, + "node_modules/stylis": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" + }, "node_modules/sucrase": { "version": "3.31.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.31.0.tgz", @@ -8183,6 +9363,14 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/ts-dedent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", + "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", + "engines": { + "node": ">=6.10" + } + }, "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", @@ -8348,11 +9536,29 @@ } }, "node_modules/unist-util-find-after": { - "version": "4.0.0", - "license": "MIT", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz", + "integrity": "sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==", "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0" + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-find-after/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/unist-util-find-after/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" }, "funding": { "type": "opencollective", @@ -8398,13 +9604,13 @@ } }, "node_modules/unist-util-remove": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-3.1.1.tgz", - "integrity": "sha512-kfCqZK5YVY5yEa89tvpl7KnBBHu2c6CzMkqHUrlOqaRgGOMp0sMvwWOVrbAtj03KhovQB7i96Gda72v/EFE0vw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-4.0.0.tgz", + "integrity": "sha512-b4gokeGId57UVRX/eVKej5gXqGlc9+trkORhFJpu9raqZkZhU0zm8Doi05+HaiBsMEIJowL+2WtQ5ItjsngPXg==", "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-is": "^5.0.0", - "unist-util-visit-parents": "^5.0.0" + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" }, "funding": { "type": "opencollective", @@ -8437,6 +9643,36 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/unist-util-remove/node_modules/@types/unist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", + "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==" + }, + "node_modules/unist-util-remove/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-remove/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/unist-util-stringify-position": { "version": "3.0.2", "license": "MIT", @@ -8546,6 +9782,18 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, + "node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/uvu": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz", @@ -8643,12 +9891,16 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz", "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==", - "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/web-worker": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz", + "integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==" + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8703,11 +9955,10 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } diff --git a/website/package.json b/website/package.json index 1fbd656cce004e..6dd196e88ac558 100644 --- a/website/package.json +++ b/website/package.json @@ -23,11 +23,11 @@ "gray-matter": "^4.0.3", "hastscript": "^8.0.0", "locate-path": "^7.2.0", - "next": "^13.5.1", + "next": "^13.5.6", "next-seo": "^5.15.0", "next-sitemap": "^4.0.0", - "nextra": "^2.2.16", - "nextra-theme-docs": "^2.2.16", + "nextra": "^2.13.2", + "nextra-theme-docs": "^2.13.2", "prism-react-renderer": "1.3.5", "prismjs": "1.29.0", "react": "18.2.0", From b8089264256108e4587ae616e12b4021486a7616 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Fri, 5 Jan 2024 12:07:58 +0200 Subject: [PATCH 142/166] fix: Change chaining order for OCI config providers (#16060) --- plugins/source/oracle/client/oracle_clients.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/source/oracle/client/oracle_clients.go b/plugins/source/oracle/client/oracle_clients.go index 9404ac8df2bea3..37f2d63bd42ed1 100644 --- a/plugins/source/oracle/client/oracle_clients.go +++ b/plugins/source/oracle/client/oracle_clients.go @@ -1572,8 +1572,8 @@ func initOracleClientsInAllRegions( func getConfigProvider() (common.ConfigurationProvider, error) { return common.ComposingConfigurationProvider( []common.ConfigurationProvider{ + common.DefaultConfigProvider(), // has to be the first as the auth is checked only for the 1st in chain common.ConfigurationProviderEnvironmentVariables("OCI_CLI", ""), - common.DefaultConfigProvider(), }, ) } From fefbe841121149ef5b6852653898e967e80d9526 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:20:03 +0200 Subject: [PATCH 143/166] chore(main): Release plugins-source-oracle v4.2.8 (#16061) :robot: I have created a release *beep* *boop* --- ## [4.2.8](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.7...plugins-source-oracle-v4.2.8) (2024-01-05) ### Bug Fixes * Change chaining order for OCI config providers ([#16060](https://github.com/cloudquery/cloudquery/issues/16060)) ([b808926](https://github.com/cloudquery/cloudquery/commit/b8089264256108e4587ae616e12b4021486a7616)) --- 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/oracle/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7c278dab2a39cc..e9cd4df443b434 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -55,7 +55,7 @@ "plugins/source/hackernews+FILLER": "0.0.0", "scaffold": "2.1.22", "scaffold+FILLER": "0.0.0", - "plugins/source/oracle": "4.2.7", + "plugins/source/oracle": "4.2.8", "plugins/source/oracle+FILLER": "0.0.0", "plugins/source/alicloud": "4.0.19", "plugins/source/alicloud+FILLER": "0.0.0", diff --git a/plugins/source/oracle/CHANGELOG.md b/plugins/source/oracle/CHANGELOG.md index 8aad836616c3fa..6c495b17f2808c 100644 --- a/plugins/source/oracle/CHANGELOG.md +++ b/plugins/source/oracle/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [4.2.8](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.7...plugins-source-oracle-v4.2.8) (2024-01-05) + + +### Bug Fixes + +* Change chaining order for OCI config providers ([#16060](https://github.com/cloudquery/cloudquery/issues/16060)) ([b808926](https://github.com/cloudquery/cloudquery/commit/b8089264256108e4587ae616e12b4021486a7616)) + ## [4.2.7](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.6...plugins-source-oracle-v4.2.7) (2024-01-03) From ec6773c601ec89c039a3609e65fed41760c3ded7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:25:39 +0200 Subject: [PATCH 144/166] chore: Update plugin `source-oracle` version to v4.2.8 (#16062) Updates the `source-oracle` plugin latest version to v4.2.8 --- website/versions/source-oracle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-oracle.json b/website/versions/source-oracle.json index 190d0dac243c5f..6bd008e550fd11 100644 --- a/website/versions/source-oracle.json +++ b/website/versions/source-oracle.json @@ -1 +1 @@ -{ "latest": "plugins-source-oracle-v4.2.7" } +{ "latest": "plugins-source-oracle-v4.2.8" } From 7b3f0c67962f388b3ed1c6c3c9c17d4d3aa35c06 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Fri, 5 Jan 2024 19:24:11 +0200 Subject: [PATCH 145/166] doc: Document dedicated region access (#16063) Closes https://github.com/cloudquery/cloudquery/issues/16015 Tested in https://github.com/cloudquery/cloudquery/issues/16015#issuecomment-1878990809 --- plugins/source/oracle/client/client.go | 3 +-- plugins/source/oracle/docs/overview.md | 19 +++++++++++++++++-- plugins/source/oracle/go.mod | 2 +- .../source/oracle/resources/plugin/client.go | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/source/oracle/client/client.go b/plugins/source/oracle/client/client.go index 7becbf460e8a48..b736eacab5551d 100644 --- a/plugins/source/oracle/client/client.go +++ b/plugins/source/oracle/client/client.go @@ -5,7 +5,6 @@ import ( "fmt" "strings" - "github.com/cloudquery/cloudquery/plugins/source/oracle/client/spec" "github.com/cloudquery/plugin-sdk/v4/schema" "github.com/oracle/oci-go-sdk/v65/common" "github.com/oracle/oci-go-sdk/v65/identity" @@ -36,7 +35,7 @@ type Client struct { logger zerolog.Logger } -func New(ctx context.Context, logger zerolog.Logger, _ spec.Spec) (schema.ClientMeta, error) { +func New(ctx context.Context, logger zerolog.Logger) (schema.ClientMeta, error) { // common.DefaultRetryPolicy handles (409, IncorrectState), (429, TooManyRequests) + 5XX errors defaultRetryPolicy := common.DefaultRetryPolicy() common.GlobalRetry = &defaultRetryPolicy diff --git a/plugins/source/oracle/docs/overview.md b/plugins/source/oracle/docs/overview.md index 489391cae7663c..2cec7d3ea96f9f 100644 --- a/plugins/source/oracle/docs/overview.md +++ b/plugins/source/oracle/docs/overview.md @@ -25,10 +25,25 @@ The following example sets up the Oracle plugin, and connects it to a postgresql See [tables](/docs/plugins/sources/oracle/tables) for a full list of available tables. -## Oracle Spec +### Oracle Spec This is the (nested) spec used by Oracle Source Plugin -- `concurrency` (int, optional, default: 10000): +- `concurrency` (`integer`) (optional) (default: `10000`) + The best effort maximum number of Go routines to use. Lower this number to reduce memory usage. + +## Dedicated regions + +[OCI Dedicated regions](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/dedicatedregions.htm) can be accessed via the following procedure: + +1. Specify the region to be used for the discovery as the dedicated region. + The following options are available: + * Set `OCI_CLI_region` environment variable + * Set `region` value in the configuration file + +2. Specify the dedicated region information: + The following options are available: + * Set `OCI_REGION_METADATA` [environment variable](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Environment_Variable) + * Add information to the [regions config file](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_adding_new_region_endpoints.htm#SDK_Adding_Regions_Config_File) diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index 20fd8c5bb5666f..93d81499371662 100644 --- a/plugins/source/oracle/go.mod +++ b/plugins/source/oracle/go.mod @@ -8,6 +8,7 @@ require ( github.com/cloudquery/plugin-sdk/v4 v4.25.0 github.com/oracle/oci-go-sdk/v65 v65.28.3 github.com/rs/zerolog v1.31.0 + github.com/stretchr/testify v1.8.4 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b ) @@ -88,7 +89,6 @@ 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/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/thoas/go-funk v0.9.3 // indirect diff --git a/plugins/source/oracle/resources/plugin/client.go b/plugins/source/oracle/resources/plugin/client.go index 2ca432a0be8ee3..a2a8aff1489e23 100644 --- a/plugins/source/oracle/resources/plugin/client.go +++ b/plugins/source/oracle/resources/plugin/client.go @@ -38,7 +38,7 @@ func (c *Client) Sync(ctx context.Context, options plugin.SyncOptions, res chan< c.logger.Warn().Msg("State backend not supported in plugin, skipping") } - schedulerClient, err := client.New(ctx, c.logger, c.config) + schedulerClient, err := client.New(ctx, c.logger) if err != nil { return err } From 2e7b7d67ee28cb3b393455accd10e664c7fff62e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 21:15:41 +0200 Subject: [PATCH 146/166] fix(deps): Update module github.com/cloudquery/cloudquery-api-go to v1.6.4 (#16067) 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.6.3` -> `v1.6.4` | --- > [!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.6.4`](https://togithub.com/cloudquery/cloudquery-api-go/releases/tag/v1.6.4) [Compare Source](https://togithub.com/cloudquery/cloudquery-api-go/compare/v1.6.3...v1.6.4) ##### Bug Fixes - Generate CloudQuery Go API Client from `spec.json` ([#​100](https://togithub.com/cloudquery/cloudquery-api-go/issues/100)) ([515b000](https://togithub.com/cloudquery/cloudquery-api-go/commit/515b000bd7472e41066c667e54b5c1b36bf0a5a2)) - Generate CloudQuery Go API Client from `spec.json` ([#​101](https://togithub.com/cloudquery/cloudquery-api-go/issues/101)) ([58275d0](https://togithub.com/cloudquery/cloudquery-api-go/commit/58275d0b0354ed2438c899f6a02bacd8ed50545e)) - Generate CloudQuery Go API Client from `spec.json` ([#​91](https://togithub.com/cloudquery/cloudquery-api-go/issues/91)) ([7de06f2](https://togithub.com/cloudquery/cloudquery-api-go/commit/7de06f2038c275960ad102d00cbf360947c96297)) - Generate CloudQuery Go API Client from `spec.json` ([#​93](https://togithub.com/cloudquery/cloudquery-api-go/issues/93)) ([0d3dea8](https://togithub.com/cloudquery/cloudquery-api-go/commit/0d3dea833f7be08cfa3ca973e829b1e650cddf2b)) - Generate CloudQuery Go API Client from `spec.json` ([#​94](https://togithub.com/cloudquery/cloudquery-api-go/issues/94)) ([e2388ba](https://togithub.com/cloudquery/cloudquery-api-go/commit/e2388ba3f2bf07a96f5a7f4add475365caf2d18c)) - Generate CloudQuery Go API Client from `spec.json` ([#​95](https://togithub.com/cloudquery/cloudquery-api-go/issues/95)) ([0f4d8b5](https://togithub.com/cloudquery/cloudquery-api-go/commit/0f4d8b5a8dccf977a179eaf9168a2d90fbaed4bb)) - Generate CloudQuery Go API Client from `spec.json` ([#​96](https://togithub.com/cloudquery/cloudquery-api-go/issues/96)) ([9a1990c](https://togithub.com/cloudquery/cloudquery-api-go/commit/9a1990ca787a1cbeac65676967dd746352640be3)) - Generate CloudQuery Go API Client from `spec.json` ([#​97](https://togithub.com/cloudquery/cloudquery-api-go/issues/97)) ([46da085](https://togithub.com/cloudquery/cloudquery-api-go/commit/46da0853b105b14c2b084d5a579fbbdea6255aac)) - Generate CloudQuery Go API Client from `spec.json` ([#​98](https://togithub.com/cloudquery/cloudquery-api-go/issues/98)) ([68874b1](https://togithub.com/cloudquery/cloudquery-api-go/commit/68874b1880c3c3fd1abfab834add35caa090b641)) - Generate CloudQuery Go API Client from `spec.json` ([#​99](https://togithub.com/cloudquery/cloudquery-api-go/issues/99)) ([84e8a5a](https://togithub.com/cloudquery/cloudquery-api-go/commit/84e8a5ab339a3ac360faa4443c2b6417057be7ec))
--- ### 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 618fb4d7dba9da..1ea8af90162d43 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -6,7 +6,7 @@ require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/cloudquery-api-go v1.6.3 + github.com/cloudquery/cloudquery-api-go v1.6.4 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-pb-go v1.16.3 github.com/cloudquery/plugin-sdk/v4 v4.25.0 diff --git a/cli/go.sum b/cli/go.sum index 29492baa8bb407..1141468646c41b 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.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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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= From edda65c238b2cb78a7a2078b62557a7d8d822e49 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 5 Jan 2024 22:17:34 +0200 Subject: [PATCH 147/166] fix(deps): Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 (#16069) 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.25.0` -> `v4.25.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.25.1`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.25.1) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.25.0...v4.25.1) ##### Bug Fixes - **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.6.4 ([#​1459](https://togithub.com/cloudquery/plugin-sdk/issues/1459)) ([5ec8f8d](https://togithub.com/cloudquery/plugin-sdk/commit/5ec8f8d9c2f35f937ebe03007bf321a51a368ab1)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.2 ([#​1456](https://togithub.com/cloudquery/plugin-sdk/issues/1456)) ([341d770](https://togithub.com/cloudquery/plugin-sdk/commit/341d770669f8cc4db30edb9c40e44af49eb0ecfe)) - **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.3 ([#​1458](https://togithub.com/cloudquery/plugin-sdk/issues/1458)) ([4dd2130](https://togithub.com/cloudquery/plugin-sdk/commit/4dd2130e8129ea15a5e06eb5a619bcebd6770c44))
--- ### 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 | 6 +++--- plugins/destination/azblob/go.sum | 12 ++++++------ plugins/destination/bigquery/go.mod | 6 +++--- plugins/destination/bigquery/go.sum | 12 ++++++------ plugins/destination/clickhouse/go.mod | 6 +++--- plugins/destination/clickhouse/go.sum | 12 ++++++------ plugins/destination/duckdb/go.mod | 6 +++--- plugins/destination/duckdb/go.sum | 12 ++++++------ plugins/destination/elasticsearch/go.mod | 6 +++--- plugins/destination/elasticsearch/go.sum | 12 ++++++------ plugins/destination/file/go.mod | 6 +++--- plugins/destination/file/go.sum | 12 ++++++------ plugins/destination/firehose/go.mod | 6 +++--- plugins/destination/firehose/go.sum | 12 ++++++------ plugins/destination/gcs/go.mod | 6 +++--- plugins/destination/gcs/go.sum | 12 ++++++------ plugins/destination/gremlin/go.mod | 6 +++--- plugins/destination/gremlin/go.sum | 12 ++++++------ plugins/destination/kafka/go.mod | 6 +++--- plugins/destination/kafka/go.sum | 12 ++++++------ plugins/destination/meilisearch/go.mod | 6 +++--- plugins/destination/meilisearch/go.sum | 12 ++++++------ plugins/destination/mongodb/go.mod | 6 +++--- plugins/destination/mongodb/go.sum | 12 ++++++------ plugins/destination/mssql/go.mod | 6 +++--- plugins/destination/mssql/go.sum | 12 ++++++------ plugins/destination/mysql/go.mod | 6 +++--- plugins/destination/mysql/go.sum | 12 ++++++------ plugins/destination/neo4j/go.mod | 6 +++--- plugins/destination/neo4j/go.sum | 12 ++++++------ plugins/destination/postgresql/go.mod | 6 +++--- plugins/destination/postgresql/go.sum | 12 ++++++------ plugins/destination/s3/go.mod | 6 +++--- plugins/destination/s3/go.sum | 12 ++++++------ plugins/destination/snowflake/go.mod | 6 +++--- plugins/destination/snowflake/go.sum | 12 ++++++------ plugins/destination/sqlite/go.mod | 6 +++--- plugins/destination/sqlite/go.sum | 12 ++++++------ plugins/destination/test/go.mod | 6 +++--- plugins/destination/test/go.sum | 12 ++++++------ plugins/source/alicloud/go.mod | 6 +++--- plugins/source/alicloud/go.sum | 12 ++++++------ plugins/source/awspricing/go.mod | 6 +++--- plugins/source/awspricing/go.sum | 12 ++++++------ plugins/source/cloudflare/go.mod | 6 +++--- plugins/source/cloudflare/go.sum | 12 ++++++------ plugins/source/datadog/go.mod | 6 +++--- plugins/source/datadog/go.sum | 12 ++++++------ plugins/source/digitalocean/go.mod | 6 +++--- plugins/source/digitalocean/go.sum | 12 ++++++------ plugins/source/firestore/go.mod | 6 +++--- plugins/source/firestore/go.sum | 12 ++++++------ plugins/source/github/go.mod | 6 +++--- plugins/source/github/go.sum | 12 ++++++------ plugins/source/gitlab/go.mod | 6 +++--- plugins/source/gitlab/go.sum | 12 ++++++------ plugins/source/hackernews/go.mod | 6 +++--- plugins/source/hackernews/go.sum | 12 ++++++------ plugins/source/hubspot/go.mod | 6 +++--- plugins/source/hubspot/go.sum | 12 ++++++------ plugins/source/k8s/go.mod | 6 +++--- plugins/source/k8s/go.sum | 12 ++++++------ plugins/source/notion/go.mod | 6 +++--- plugins/source/notion/go.sum | 12 ++++++------ plugins/source/okta/go.mod | 6 +++--- plugins/source/okta/go.sum | 12 ++++++------ plugins/source/oracle/go.mod | 6 +++--- plugins/source/oracle/go.sum | 12 ++++++------ plugins/source/pagerduty/go.mod | 6 +++--- plugins/source/pagerduty/go.sum | 12 ++++++------ plugins/source/test/go.mod | 6 +++--- plugins/source/test/go.sum | 12 ++++++------ scaffold/cmd/templates/source/go.mod.tpl | 2 +- 75 files changed, 328 insertions(+), 328 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 1ea8af90162d43..0aa3eb005fe003 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -9,7 +9,7 @@ require ( github.com/cloudquery/cloudquery-api-go v1.6.4 github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-pb-go v1.16.3 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v24.0.7+incompatible diff --git a/cli/go.sum b/cli/go.sum index 1141468646c41b..e93b329331b3e8 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -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.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= -github.com/cloudquery/plugin-sdk/v4 v4.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index a0f2ac4c39db96..e5440cb4fa92d1 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -36,8 +36,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index b96c81d4f1e9b3..0f6c0928e5d1dd 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -61,20 +61,20 @@ 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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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 a60cf7acc16587..44c985787d44e1 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.57.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 golang.org/x/sync v0.5.0 @@ -32,8 +32,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 0f2089e32017b7..5d8aa32f7456cb 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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= diff --git a/plugins/destination/clickhouse/go.mod b/plugins/destination/clickhouse/go.mod index 61b5a2b9cc7b6d..e1e7bd40348733 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -33,8 +33,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/clickhouse/go.sum b/plugins/destination/clickhouse/go.sum index 1e983eb7d80f8d..3a194adc77a1db 100644 --- a/plugins/destination/clickhouse/go.sum +++ b/plugins/destination/clickhouse/go.sum @@ -49,18 +49,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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/duckdb/go.mod b/plugins/destination/duckdb/go.mod index 08ec6ba4d49c3b..3b2a24fac7a412 100644 --- a/plugins/destination/duckdb/go.mod +++ b/plugins/destination/duckdb/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/uuid v1.5.0 github.com/marcboeker/go-duckdb v1.5.6 github.com/rs/zerolog v1.31.0 @@ -27,8 +27,8 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/duckdb/go.sum b/plugins/destination/duckdb/go.sum index 228b53b77dace0..e4abcb7827d482 100644 --- a/plugins/destination/duckdb/go.sum +++ b/plugins/destination/duckdb/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/elasticsearch/go.mod b/plugins/destination/elasticsearch/go.mod index cd90779e42ce7c..5186cd9fd883d2 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-20231229025812-7c3480e2f028 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -28,8 +28,8 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/elasticsearch/go.sum b/plugins/destination/elasticsearch/go.sum index e2b45de132e88b..b9324b805f7dfb 100644 --- a/plugins/destination/elasticsearch/go.sum +++ b/plugins/destination/elasticsearch/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/file/go.mod b/plugins/destination/file/go.mod index 85abab91acc6bf..c0cd2e7b04b443 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -31,8 +31,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 9f7bbd3ada4ae6..514c54fdec9da5 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -49,20 +49,20 @@ 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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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 aa6b1f487f9c73..f557f7c93b9ca2 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.0 github.com/aws/aws-sdk-go-v2/config v1.26.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.23.1 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -39,8 +39,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index 3ac6e2f931618c..5b2dfdb4a8e2c7 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/gcs/go.mod b/plugins/destination/gcs/go.mod index f3b89588a20874..dbecac8d34b42b 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go/storage v1.30.1 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 @@ -35,8 +35,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index a8c24a6cda02d3..bba0574f0a4afb 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -63,20 +63,20 @@ 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.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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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= diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index fe2a3f04be1764..c274cd464b6047 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.0 github.com/aws/aws-sdk-go-v2/config v1.26.2 github.com/cenkalti/backoff/v4 v4.2.1 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 ) @@ -38,8 +38,8 @@ 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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index 005bb485bbd798..9074ac62d3d20c 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/kafka/go.mod b/plugins/destination/kafka/go.mod index 080ea3cf117f06..311d6a07e152a4 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -6,7 +6,7 @@ require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) @@ -29,8 +29,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 952b270322df71..7d98672f4b3e3f 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -53,20 +53,20 @@ 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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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 b5e51ccb218686..6f70e7b6d8db3a 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/meilisearch/meilisearch-go v0.24.0 @@ -29,8 +29,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index f3a88533e9701a..d457bb2321af98 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/mongodb/go.mod b/plugins/destination/mongodb/go.mod index 43b7f4947a6d6a..f275263f6f9a19 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 go.mongodb.org/mongo-driver v1.12.1 @@ -25,8 +25,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index 411ace02521334..c2bb44e30d16a2 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/mssql/go.mod b/plugins/destination/mssql/go.mod index 674aef368993a8..024de5df9c7ff2 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 github.com/microsoft/go-mssqldb v1.5.0 @@ -33,8 +33,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index 9c278f07807760..ef38f3ea7abe25 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/mysql/go.mod b/plugins/destination/mysql/go.mod index a791fcb4b57c29..2a613f6c49c867 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -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.6.3 // indirect - github.com/cloudquery/plugin-pb-go v1.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index 7805e732954e7d..376bf316b5edb8 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/neo4j/go.mod b/plugins/destination/neo4j/go.mod index f597ba355a7b94..12ae47210e9c33 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -25,8 +25,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index 35aad2a9f260f3..b37a9ed7a8d220 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/postgresql/go.mod b/plugins/destination/postgresql/go.mod index e54d6112c83586..06a9738be80585 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -29,8 +29,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 0c5b67a32a983a..07f3974672ac9a 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/s3/go.mod b/plugins/destination/s3/go.mod index ce1e0f2c7c100c..f93ce6979e0798 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 github.com/cloudquery/filetypes/v4 v4.2.4 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 github.com/rs/zerolog v1.31.0 @@ -50,8 +50,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index a2a2bb5ffa6995..43026f17df2611 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -87,20 +87,20 @@ 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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.4 h1:LIdlop1Ao9wCggVH4c3vz7kD9kNkI1tolNdERYAd6U0= github.com/cloudquery/filetypes/v4 v4.2.4/go.mod h1:jM1V/g3nGaEe0rN0KQ10bBSwUqbYeUkFbB1hq1jbqmY= 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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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 c03a91f74ca697..98077d96712e56 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 github.com/snowflakedb/gosnowflake v1.7.1 @@ -49,8 +49,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // indirect github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 6f07b125989dea..01b9ecd50bcc37 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -101,14 +101,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index 917b1cb8da0ab0..c44b3fe21454e1 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.31.0 ) @@ -24,8 +24,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index d8f7cef1f38b7a..83c383192936e8 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/test/go.mod b/plugins/destination/test/go.mod index 7dab4865448122..7abd967c288b61 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) @@ -23,8 +23,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index e007403fc089d9..c91eda79cb260e 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index 8b4e7657d119ec..86603b6ecde597 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.5.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.31.0 @@ -31,8 +31,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index fb19d8418a9ffd..4d79b0cefb7288 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -59,16 +59,16 @@ 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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/awspricing/go.mod b/plugins/source/awspricing/go.mod index b952d4dc273b89..66dfc762b430d2 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.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) @@ -25,8 +25,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/awspricing/go.sum b/plugins/source/awspricing/go.sum index d3255d490e4bbc..029f6f3f6eca40 100644 --- a/plugins/source/awspricing/go.sum +++ b/plugins/source/awspricing/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 632065b5e9c6c9..846f2c90bbf17e 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/cloudflare/cloudflare-go v0.84.0 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/rs/zerolog v1.31.0 github.com/thoas/go-funk v0.9.3 @@ -28,8 +28,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index e7beb68a93a968..4a6794b1fc0bd7 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -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/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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/datadog/go.mod b/plugins/source/datadog/go.mod index 9d68f77d28dcc1..6b5ae13dba2f9c 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/DataDog/datadog-api-client-go/v2 v2.17.0 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.31.0 @@ -32,8 +32,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 613a291924c9b3..0565c0e4cf3cf3 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index 8348d43f8c734b..bebb0d242a1542 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.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 github.com/aws/smithy-go v1.19.0 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/digitalocean/godo v1.99.0 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 @@ -48,8 +48,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index c7ccaa13e3ced3..8b3f4e7447a80d 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/firestore/go.mod b/plugins/source/firestore/go.mod index 50e4e0f1afde8e..d04e3f9ffadcb7 100644 --- a/plugins/source/firestore/go.mod +++ b/plugins/source/firestore/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( cloud.google.com/go/firestore v1.14.0 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 golang.org/x/sync v0.5.0 @@ -31,8 +31,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/firestore/go.sum b/plugins/source/firestore/go.sum index 77f67c70d38379..40e705634a81bc 100644 --- a/plugins/source/firestore/go.sum +++ b/plugins/source/firestore/go.sum @@ -55,14 +55,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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index 0990f69bd89fc7..13e63093891abf 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-20231229025812-7c3480e2f028 github.com/beatlabs/github-auth v0.0.0-20231208231443-3b7665fb4bb8 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -31,8 +31,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index a4b5c831ddc184..c6f60fe4803d07 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index ad557480a57778..ea9c4b8f4d03ba 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 github.com/xanzy/go-gitlab v0.83.0 @@ -27,8 +27,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 3a3b4d0c34ab96..693127ffcc1593 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/hackernews/go.mod b/plugins/source/hackernews/go.mod index ee6dc7324cb025..0201653babf2d2 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/hermanschaaf/hackernews v1.0.1 github.com/rs/zerolog v1.31.0 @@ -30,8 +30,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/hackernews/go.sum b/plugins/source/hackernews/go.sum index aecf58adba815a..e29c09d3ac9c8c 100644 --- a/plugins/source/hackernews/go.sum +++ b/plugins/source/hackernews/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/hubspot/go.mod b/plugins/source/hubspot/go.mod index be0885b361441d..d2fa28f37f24f5 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-20231229025812-7c3480e2f028 github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 golang.org/x/exp v0.0.0-20231226003508-02704c960a9b golang.org/x/time v0.5.0 @@ -28,8 +28,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum index 9fce8c8dd6c558..7d2a8834ecc452 100644 --- a/plugins/source/hubspot/go.sum +++ b/plugins/source/hubspot/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/k8s/go.mod b/plugins/source/k8s/go.mod index 4a14e05f974379..17d2ebe00da0a6 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/google/gnostic v0.6.9 github.com/rs/zerolog v1.31.0 @@ -34,8 +34,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 9061f5db715ff2..7b61d1e33c2cf9 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -53,18 +53,18 @@ 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.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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= diff --git a/plugins/source/notion/go.mod b/plugins/source/notion/go.mod index 84a765efcf3e93..0515db3ca82c94 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.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) @@ -25,8 +25,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/notion/go.sum b/plugins/source/notion/go.sum index d3255d490e4bbc..029f6f3f6eca40 100644 --- a/plugins/source/notion/go.sum +++ b/plugins/source/notion/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/okta/go.mod b/plugins/source/okta/go.mod index bc73f6ace11184..bac7ca85c4f4ae 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -28,8 +28,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index 730e09f0ea4c6a..a6fe330a107936 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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= diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index 93d81499371662..8c9b506c97dcd2 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-20231229025812-7c3480e2f028 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.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 @@ -29,8 +29,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/oracle/go.sum b/plugins/source/oracle/go.sum index cadf9ee898976f..3cf31a259654a1 100644 --- a/plugins/source/oracle/go.sum +++ b/plugins/source/oracle/go.sum @@ -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.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.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/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.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index 0783d51f887745..1e8bcbfc307b25 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 @@ -28,8 +28,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index fb3430433a7768..0a3a5d2f7b048f 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/source/test/go.mod b/plugins/source/test/go.mod index fbce89e441dd90..4a09a7691720bf 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-20231229025812-7c3480e2f028 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) @@ -25,8 +25,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.16.1 // indirect + github.com/cloudquery/cloudquery-api-go v1.6.4 // indirect + github.com/cloudquery/plugin-pb-go v1.16.3 // 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 diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index d3255d490e4bbc..029f6f3f6eca40 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -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.6.3 h1:PnT0S57dN24nE86XGVM+5+ePTtMeXsEQqOR3kT2+YhY= -github.com/cloudquery/cloudquery-api-go v1.6.3/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= -github.com/cloudquery/plugin-pb-go v1.16.1 h1:YbEjKntMK111PHxKOsZRhsCrjMKDr5emruheVij3uIY= -github.com/cloudquery/plugin-pb-go v1.16.1/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/cloudquery-api-go v1.6.4 h1:75S5WdQirq8hR2ZSVPZ2Mrn+nz8DlHUZgj5gwQnoS/Y= +github.com/cloudquery/cloudquery-api-go v1.6.4/go.mod h1:03fojQg0UpdgqXZ9tzZ5gF5CPad/F0sok66bsX6u4RA= +github.com/cloudquery/plugin-pb-go v1.16.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= +github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= 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.25.0 h1:Vh6f7L7+PHrPWtTxO0ZdDbnnHd6mUizLoGIisZpq5kY= -github.com/cloudquery/plugin-sdk/v4 v4.25.0/go.mod h1:Flj/GfXYMowiuPnVKwSA1IiAyduDTvFEh7QkgPhf1ho= +github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= +github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= 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/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index acb40d98de76cb..dedaf7f4edbf50 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.3 - github.com/cloudquery/plugin-sdk/v4 v4.25.0 + github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.29.0 ) From 1029d509c99d58adfaf3f961c6fdcf762d254af7 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 02:22:24 +0200 Subject: [PATCH 148/166] fix(deps): Update aws-sdk-go-v2 monorepo (#16107) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.24.0` -> `v1.24.1` | | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.26.2` -> `v1.26.3` | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.13` -> `v1.16.14` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.14.10` -> `v1.14.11` | | [github.com/aws/aws-sdk-go-v2/internal/configsources](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/internal/endpoints/v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v2.5.9` -> `v2.5.10` | | [github.com/aws/aws-sdk-go-v2/service/firehose](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.23.1` -> `v1.23.2` | | [github.com/aws/aws-sdk-go-v2/service/internal/presigned-url](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.10.9` -> `v1.10.10` | | [github.com/aws/aws-sdk-go-v2/service/sso](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.18.5` -> `v1.18.6` | | [github.com/aws/aws-sdk-go-v2/service/ssooidc](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.21.5` -> `v1.21.6` | | [github.com/aws/aws-sdk-go-v2/service/sts](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.26.6` -> `v1.26.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2) ### [`v1.24.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Saturday" (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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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/firehose/go.mod | 22 +++++++-------- plugins/destination/firehose/go.sum | 44 ++++++++++++++--------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plugins/destination/firehose/go.mod b/plugins/destination/firehose/go.mod index f557f7c93b9ca2..88f7c1a9d7a1be 100644 --- a/plugins/destination/firehose/go.mod +++ b/plugins/destination/firehose/go.mod @@ -4,9 +4,9 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/aws/aws-sdk-go-v2 v1.24.0 - github.com/aws/aws-sdk-go-v2/config v1.26.2 - github.com/aws/aws-sdk-go-v2/service/firehose v1.23.1 + github.com/aws/aws-sdk-go-v2 v1.24.1 + github.com/aws/aws-sdk-go-v2/config v1.26.3 + github.com/aws/aws-sdk-go-v2/service/firehose v1.23.2 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 @@ -23,16 +23,16 @@ require ( 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/aws/aws-sdk-go-v2/credentials v1.16.13 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // 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/ini v1.7.2 // 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/presigned-url v1.10.9 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect + 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/bytedance/sonic v1.10.2 // indirect diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index 5b2dfdb4a8e2c7..c9a741c696794b 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -23,32 +23,32 @@ github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 h1:GxWJMPJYX4 github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/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= -github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= -github.com/aws/aws-sdk-go-v2/config v1.26.2 h1:+RWLEIWQIGgrz2pBPAUoGgNGs1TOyF4Hml7hCnYj2jc= -github.com/aws/aws-sdk-go-v2/config v1.26.2/go.mod h1:l6xqvUxt0Oj7PI/SUXYLNyZ9T/yBPn3YTQcJLLOdtR8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13 h1:WLABQ4Cp4vXtXfOWOS3MEZKr6AAYUpMczLhgKtAjQ/8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13/go.mod h1:Qg6x82FXwW0sJHzYruxGiuApNo31UEtJvXVSZAXeWiw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU= +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/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +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/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.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= -github.com/aws/aws-sdk-go-v2/service/firehose v1.23.1 h1:FJO1MiM000n/3YUAWRW7jbpkQwUuy6+7Z7nMg09T/tw= -github.com/aws/aws-sdk-go-v2/service/firehose v1.23.1/go.mod h1:fI1Diyj3ls4HjwKVx1zX9/qQIORnF9skk5bzRydNbjs= +github.com/aws/aws-sdk-go-v2/service/firehose v1.23.2 h1:6qZsXAR0nIj+X8L0hVb8ENu9B00oZq19v9ZGYPUB3OE= +github.com/aws/aws-sdk-go-v2/service/firehose v1.23.2/go.mod h1:vHumFD15AwENJSM3SsWzcPpMK24s/7vGN1Xp5rLguz0= 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/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 h1:HJeiuZ2fldpd0WqngyMR6KW7ofkXNLyOaHwEIGm39Cs= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU= +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/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/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= From 5610f2f40e54c3900a16b62ae7d838b04104ed29 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 02:26:30 +0200 Subject: [PATCH 149/166] fix(deps): Update aws-sdk-go-v2 monorepo (#16108) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.24.0` -> `v1.24.1` | | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.26.2` -> `v1.26.3` | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.13` -> `v1.16.14` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.14.10` -> `v1.14.11` | | [github.com/aws/aws-sdk-go-v2/internal/configsources](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/internal/endpoints/v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v2.5.9` -> `v2.5.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/presigned-url](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.10.9` -> `v1.10.10` | | [github.com/aws/aws-sdk-go-v2/service/sso](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.18.5` -> `v1.18.6` | | [github.com/aws/aws-sdk-go-v2/service/ssooidc](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.21.5` -> `v1.21.6` | | [github.com/aws/aws-sdk-go-v2/service/sts](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.26.6` -> `v1.26.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2) ### [`v1.24.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Saturday" (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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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/gremlin/go.mod | 20 +++++++-------- plugins/destination/gremlin/go.sum | 40 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index c274cd464b6047..e390c0ccd58db5 100644 --- a/plugins/destination/gremlin/go.mod +++ b/plugins/destination/gremlin/go.mod @@ -5,8 +5,8 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3 - github.com/aws/aws-sdk-go-v2 v1.24.0 - github.com/aws/aws-sdk-go-v2/config v1.26.2 + github.com/aws/aws-sdk-go-v2 v1.24.1 + github.com/aws/aws-sdk-go-v2/config v1.26.3 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 @@ -23,16 +23,16 @@ require ( 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/aws/aws-sdk-go-v2/credentials v1.16.13 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // 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/ini v1.7.2 // 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/presigned-url v1.10.9 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect + 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/bytedance/sonic v1.10.2 // indirect diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index 9074ac62d3d20c..a93488776a72d2 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -26,30 +26,30 @@ github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3 h1:jXN0ZqT972CRu3VSwdj3rpqOA2A7 github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3/go.mod h1:KZ4BFULeKTVqzgX41fiTj2XYTs9meWc/TWQHsICy69I= 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= -github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= -github.com/aws/aws-sdk-go-v2/config v1.26.2 h1:+RWLEIWQIGgrz2pBPAUoGgNGs1TOyF4Hml7hCnYj2jc= -github.com/aws/aws-sdk-go-v2/config v1.26.2/go.mod h1:l6xqvUxt0Oj7PI/SUXYLNyZ9T/yBPn3YTQcJLLOdtR8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13 h1:WLABQ4Cp4vXtXfOWOS3MEZKr6AAYUpMczLhgKtAjQ/8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13/go.mod h1:Qg6x82FXwW0sJHzYruxGiuApNo31UEtJvXVSZAXeWiw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU= +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/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +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/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.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= 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/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 h1:HJeiuZ2fldpd0WqngyMR6KW7ofkXNLyOaHwEIGm39Cs= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU= +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/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/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= From 5004149714f6d56536e910e0868ae14cafb53df6 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 03:39:01 +0200 Subject: [PATCH 150/166] fix(deps): Update aws-sdk-go-v2 monorepo (#16109) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.24.0` -> `v1.24.1` | | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.26.2` -> `v1.26.3` | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.13` -> `v1.16.14` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.14.10` -> `v1.14.11` | | [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.15.9` -> `v1.15.11` | | [github.com/aws/aws-sdk-go-v2/internal/configsources](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/internal/endpoints/v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v2.5.9` -> `v2.5.10` | | [github.com/aws/aws-sdk-go-v2/internal/v4a](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/checksum](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/presigned-url](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.10.9` -> `v1.10.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/s3shared](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.9` -> `v1.16.10` | | [github.com/aws/aws-sdk-go-v2/service/s3](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.47.7` -> `v1.48.0` | | [github.com/aws/aws-sdk-go-v2/service/sso](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.18.5` -> `v1.18.6` | | [github.com/aws/aws-sdk-go-v2/service/ssooidc](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.21.5` -> `v1.21.6` | | [github.com/aws/aws-sdk-go-v2/service/sts](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.26.6` -> `v1.26.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2) ### [`v1.24.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Saturday" (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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/s3/go.mod | 30 +++++++++--------- plugins/destination/s3/go.sum | 60 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index f93ce6979e0798..306c8ad4651467 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -4,10 +4,10 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 - github.com/aws/aws-sdk-go-v2 v1.24.0 - github.com/aws/aws-sdk-go-v2/config v1.26.2 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 - github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 + github.com/aws/aws-sdk-go-v2 v1.24.1 + github.com/aws/aws-sdk-go-v2/config v1.26.3 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11 + github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 @@ -29,19 +29,19 @@ require ( github.com/apache/thrift v0.19.0 // 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 - github.com/aws/aws-sdk-go-v2/credentials v1.16.13 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // 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/ini v1.7.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // 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.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 // 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/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect + 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 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 43026f17df2611..03e2124c8516f9 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -27,42 +27,42 @@ 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/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk= -github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= +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.2 h1:+RWLEIWQIGgrz2pBPAUoGgNGs1TOyF4Hml7hCnYj2jc= -github.com/aws/aws-sdk-go-v2/config v1.26.2/go.mod h1:l6xqvUxt0Oj7PI/SUXYLNyZ9T/yBPn3YTQcJLLOdtR8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13 h1:WLABQ4Cp4vXtXfOWOS3MEZKr6AAYUpMczLhgKtAjQ/8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13/go.mod h1:Qg6x82FXwW0sJHzYruxGiuApNo31UEtJvXVSZAXeWiw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 h1:5zA8qVCXMPGt6YneFnll5B157SfdK2SewU85PH9/yM0= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9/go.mod h1:t4gy210hPxkbtYM8xOzrWdxVq1PyekR76OOKXy3s0Vs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU= +github.com/aws/aws-sdk-go-v2/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +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.11 h1:I6lAa3wBWfCz/cKkOpAcumsETRkFAl70sWi8ItcMEsM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11/go.mod h1:be1NIO30kJA23ORBLqPo1LttEM6tPNSEcjkd1eKzNW0= +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.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM= +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.9 h1:/90OR2XbSYfXucBMJ4U14wrjlfleq/0SB6dZDPncgmo= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9/go.mod h1:dN/Of9/fNZet7UrQQ6kTDo/VSwKPIq94vjlU16bRARc= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 h1:iEAeF6YC3l4FzlJPP9H3Ko1TXpdjdqWffxXjp8SY6uk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9/go.mod h1:kjsXoK23q9Z/tLBrckZLLyvjhZoS+AGrzqzUfEClvMM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 h1:o0ASbVwUAIrfp/WcCac+6jioZt4Hd8k/1X8u7GJ/QeM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7/go.mod h1:vADO6Jn+Rq4nDtfwNjhgR84qkZwiC6FqCaXdw/kYwjA= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 h1:HJeiuZ2fldpd0WqngyMR6KW7ofkXNLyOaHwEIGm39Cs= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU= +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.0 h1:PJTdBMsyvra6FtED7JZtDpQrIAflYDHFoZAu/sKYkwU= +github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/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= From a5c60193fe9026e38e19fd5ccef4a8203c8c3893 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 03:42:02 +0200 Subject: [PATCH 151/166] fix(deps): Update aws-sdk-go-v2 monorepo (#16110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.24.0` -> `v1.24.1` | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.13` -> `v1.16.14` | | [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.15.9` -> `v1.15.11` | | [github.com/aws/aws-sdk-go-v2/internal/configsources](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/internal/endpoints/v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v2.5.9` -> `v2.5.10` | | [github.com/aws/aws-sdk-go-v2/internal/v4a](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/checksum](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/presigned-url](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.10.9` -> `v1.10.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/s3shared](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.9` -> `v1.16.10` | | [github.com/aws/aws-sdk-go-v2/service/s3](https://togithub.com/aws/aws-sdk-go-v2) | indirect | minor | `v1.47.7` -> `v1.48.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2) ### [`v1.24.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Saturday" (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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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/snowflake/go.mod | 20 +++++----- plugins/destination/snowflake/go.sum | 60 ++++++++++++++-------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index 98077d96712e56..bc0c360d74fd40 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -31,18 +31,18 @@ require ( 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/aws/aws-sdk-go-v2 v1.24.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.13 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11 // 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.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 // 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.0 // indirect github.com/aws/smithy-go v1.19.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/bytedance/sonic v1.10.2 // indirect diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 01b9ecd50bcc37..10b9ac698b3caf 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -45,42 +45,42 @@ 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/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk= -github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= +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.2 h1:+RWLEIWQIGgrz2pBPAUoGgNGs1TOyF4Hml7hCnYj2jc= -github.com/aws/aws-sdk-go-v2/config v1.26.2/go.mod h1:l6xqvUxt0Oj7PI/SUXYLNyZ9T/yBPn3YTQcJLLOdtR8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13 h1:WLABQ4Cp4vXtXfOWOS3MEZKr6AAYUpMczLhgKtAjQ/8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13/go.mod h1:Qg6x82FXwW0sJHzYruxGiuApNo31UEtJvXVSZAXeWiw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 h1:5zA8qVCXMPGt6YneFnll5B157SfdK2SewU85PH9/yM0= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9/go.mod h1:t4gy210hPxkbtYM8xOzrWdxVq1PyekR76OOKXy3s0Vs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU= +github.com/aws/aws-sdk-go-v2/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +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.11 h1:I6lAa3wBWfCz/cKkOpAcumsETRkFAl70sWi8ItcMEsM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11/go.mod h1:be1NIO30kJA23ORBLqPo1LttEM6tPNSEcjkd1eKzNW0= +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.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM= +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.9 h1:/90OR2XbSYfXucBMJ4U14wrjlfleq/0SB6dZDPncgmo= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9/go.mod h1:dN/Of9/fNZet7UrQQ6kTDo/VSwKPIq94vjlU16bRARc= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 h1:iEAeF6YC3l4FzlJPP9H3Ko1TXpdjdqWffxXjp8SY6uk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9/go.mod h1:kjsXoK23q9Z/tLBrckZLLyvjhZoS+AGrzqzUfEClvMM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 h1:o0ASbVwUAIrfp/WcCac+6jioZt4Hd8k/1X8u7GJ/QeM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7/go.mod h1:vADO6Jn+Rq4nDtfwNjhgR84qkZwiC6FqCaXdw/kYwjA= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 h1:HJeiuZ2fldpd0WqngyMR6KW7ofkXNLyOaHwEIGm39Cs= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU= +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.0 h1:PJTdBMsyvra6FtED7JZtDpQrIAflYDHFoZAu/sKYkwU= +github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/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= From 6e4127e8ce1417817c276dd303cc9fdc31c6a7d4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 04:25:50 +0200 Subject: [PATCH 152/166] fix(deps): Update aws-sdk-go-v2 monorepo (#16111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/aws/aws-sdk-go-v2](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.24.0` -> `v1.24.1` | | [github.com/aws/aws-sdk-go-v2/config](https://togithub.com/aws/aws-sdk-go-v2) | require | patch | `v1.26.2` -> `v1.26.3` | | [github.com/aws/aws-sdk-go-v2/credentials](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.13` -> `v1.16.14` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.14.10` -> `v1.14.11` | | [github.com/aws/aws-sdk-go-v2/internal/configsources](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/internal/endpoints/v2](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v2.5.9` -> `v2.5.10` | | [github.com/aws/aws-sdk-go-v2/internal/v4a](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/checksum](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.2.9` -> `v1.2.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/presigned-url](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.10.9` -> `v1.10.10` | | [github.com/aws/aws-sdk-go-v2/service/internal/s3shared](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.16.9` -> `v1.16.10` | | [github.com/aws/aws-sdk-go-v2/service/s3](https://togithub.com/aws/aws-sdk-go-v2) | require | minor | `v1.47.7` -> `v1.48.0` | | [github.com/aws/aws-sdk-go-v2/service/sso](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.18.5` -> `v1.18.6` | | [github.com/aws/aws-sdk-go-v2/service/ssooidc](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.21.5` -> `v1.21.6` | | [github.com/aws/aws-sdk-go-v2/service/sts](https://togithub.com/aws/aws-sdk-go-v2) | indirect | patch | `v1.26.6` -> `v1.26.7` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
aws/aws-sdk-go-v2 (github.com/aws/aws-sdk-go-v2) ### [`v1.24.1`](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1) [Compare Source](https://togithub.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.24.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Saturday" (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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/source/digitalocean/go.mod | 28 +++++++-------- plugins/source/digitalocean/go.sum | 56 +++++++++++++++--------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index bebb0d242a1542..d9d5f25e9e135b 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -5,9 +5,9 @@ go 1.21.4 require ( github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 github.com/avast/retry-go/v4 v4.5.1 - github.com/aws/aws-sdk-go-v2 v1.24.0 - github.com/aws/aws-sdk-go-v2/config v1.26.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 + github.com/aws/aws-sdk-go-v2 v1.24.1 + github.com/aws/aws-sdk-go-v2/config v1.26.3 + github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 github.com/aws/smithy-go v1.19.0 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/digitalocean/godo v1.99.0 @@ -28,19 +28,19 @@ 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/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.16.13 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // 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/ini v1.7.2 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // 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.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 // 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/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // 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 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index 8b3f4e7447a80d..cec18626523cbc 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -25,40 +25,40 @@ 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/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o= github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc= -github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk= -github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= +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.2 h1:+RWLEIWQIGgrz2pBPAUoGgNGs1TOyF4Hml7hCnYj2jc= -github.com/aws/aws-sdk-go-v2/config v1.26.2/go.mod h1:l6xqvUxt0Oj7PI/SUXYLNyZ9T/yBPn3YTQcJLLOdtR8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13 h1:WLABQ4Cp4vXtXfOWOS3MEZKr6AAYUpMczLhgKtAjQ/8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.13/go.mod h1:Qg6x82FXwW0sJHzYruxGiuApNo31UEtJvXVSZAXeWiw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU= +github.com/aws/aws-sdk-go-v2/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +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/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.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM= +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.9 h1:/90OR2XbSYfXucBMJ4U14wrjlfleq/0SB6dZDPncgmo= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9/go.mod h1:dN/Of9/fNZet7UrQQ6kTDo/VSwKPIq94vjlU16bRARc= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9 h1:iEAeF6YC3l4FzlJPP9H3Ko1TXpdjdqWffxXjp8SY6uk= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.9/go.mod h1:kjsXoK23q9Z/tLBrckZLLyvjhZoS+AGrzqzUfEClvMM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 h1:o0ASbVwUAIrfp/WcCac+6jioZt4Hd8k/1X8u7GJ/QeM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7/go.mod h1:vADO6Jn+Rq4nDtfwNjhgR84qkZwiC6FqCaXdw/kYwjA= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6 h1:HJeiuZ2fldpd0WqngyMR6KW7ofkXNLyOaHwEIGm39Cs= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.6/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU= +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.0 h1:PJTdBMsyvra6FtED7JZtDpQrIAflYDHFoZAu/sKYkwU= +github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/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= From 2e223c2fe2ee1f1130ba9d904691e172ba0ef045 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 17:52:19 +0200 Subject: [PATCH 153/166] chore(main): Release plugins-source-oracle v4.2.9 (#16103) :robot: I have created a release *beep* *boop* --- ## [4.2.9](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.8...plugins-source-oracle-v4.2.9) (2024-01-06) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) * Document dedicated region access (https://github.com/cloudquery/cloudquery/pull/16063) ([7b3f0c6](https://github.com/cloudquery/cloudquery/commit/7b3f0c67962f388b3ed1c6c3c9c17d4d3aa35c06)) --- 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/oracle/CHANGELOG.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e9cd4df443b434..28422a76f5d711 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -55,7 +55,7 @@ "plugins/source/hackernews+FILLER": "0.0.0", "scaffold": "2.1.22", "scaffold+FILLER": "0.0.0", - "plugins/source/oracle": "4.2.8", + "plugins/source/oracle": "4.2.9", "plugins/source/oracle+FILLER": "0.0.0", "plugins/source/alicloud": "4.0.19", "plugins/source/alicloud+FILLER": "0.0.0", diff --git a/plugins/source/oracle/CHANGELOG.md b/plugins/source/oracle/CHANGELOG.md index 6c495b17f2808c..d837c81d0f9870 100644 --- a/plugins/source/oracle/CHANGELOG.md +++ b/plugins/source/oracle/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [4.2.9](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.8...plugins-source-oracle-v4.2.9) (2024-01-06) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) +* Document dedicated region access (https://github.com/cloudquery/cloudquery/pull/16063) ([7b3f0c6](https://github.com/cloudquery/cloudquery/commit/7b3f0c67962f388b3ed1c6c3c9c17d4d3aa35c06)) + ## [4.2.8](https://github.com/cloudquery/cloudquery/compare/plugins-source-oracle-v4.2.7...plugins-source-oracle-v4.2.8) (2024-01-05) From 6fcd931dcee686bdc6d1ee1626617bce78142a60 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Sat, 6 Jan 2024 18:06:50 +0200 Subject: [PATCH 154/166] chore: Update plugin `source-oracle` version to v4.2.9 (#16112) Updates the `source-oracle` plugin latest version to v4.2.9 --- website/versions/source-oracle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-oracle.json b/website/versions/source-oracle.json index 6bd008e550fd11..aeb38d3f3aa151 100644 --- a/website/versions/source-oracle.json +++ b/website/versions/source-oracle.json @@ -1 +1 @@ -{ "latest": "plugins-source-oracle-v4.2.8" } +{ "latest": "plugins-source-oracle-v4.2.9" } From fa0a4d3b9ed98e3c97cc609b3fad3901d44a4d52 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 8 Jan 2024 02:23:44 +0200 Subject: [PATCH 155/166] fix(deps): Update module github.com/apache/arrow/go/v12 to v12.0.1 (#16116) 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/apache/arrow/go/v12](https://togithub.com/apache/arrow) | indirect | patch | `v12.0.0` -> `v12.0.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index 44c985787d44e1..1b4dddf1c4da14 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -12,7 +12,7 @@ require ( google.golang.org/api v0.149.0 ) -require github.com/apache/arrow/go/v12 v12.0.0 // indirect +require github.com/apache/arrow/go/v12 v12.0.1 // indirect require ( github.com/BurntSushi/toml v1.3.2 // indirect diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 5d8aa32f7456cb..058044cd21cafb 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -37,8 +37,8 @@ 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/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc= -github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= +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= 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= From 8b0ae6266d19a10fe84102837802358f0b9bb1bc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:20:10 +0200 Subject: [PATCH 156/166] fix(deps): Update github.com/apache/arrow/go/v15 digest to 6d44906 (#16115) 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/apache/arrow/go/v15](https://togithub.com/apache/arrow) | require | digest | `7c3480e` -> `6d44906` | | [github.com/apache/arrow/go/v15](https://togithub.com/apache/arrow) | indirect | digest | `7c3480e` -> `6d44906` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 ++-- plugins/destination/bigquery/go.mod | 2 +- plugins/destination/bigquery/go.sum | 4 ++-- plugins/destination/clickhouse/go.mod | 2 +- plugins/destination/clickhouse/go.sum | 4 ++-- plugins/destination/duckdb/go.mod | 2 +- plugins/destination/duckdb/go.sum | 4 ++-- plugins/destination/elasticsearch/go.mod | 2 +- plugins/destination/elasticsearch/go.sum | 4 ++-- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 ++-- plugins/destination/firehose/go.mod | 2 +- plugins/destination/firehose/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/postgresql/go.mod | 2 +- plugins/destination/postgresql/go.sum | 4 ++-- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 ++-- plugins/destination/snowflake/go.mod | 2 +- plugins/destination/snowflake/go.sum | 4 ++-- plugins/destination/sqlite/go.mod | 2 +- plugins/destination/sqlite/go.sum | 4 ++-- plugins/destination/test/go.mod | 2 +- plugins/destination/test/go.sum | 4 ++-- plugins/source/alicloud/go.mod | 2 +- plugins/source/alicloud/go.sum | 4 ++-- plugins/source/awspricing/go.mod | 2 +- plugins/source/awspricing/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/github/go.mod | 2 +- plugins/source/github/go.sum | 4 ++-- plugins/source/gitlab/go.mod | 2 +- plugins/source/gitlab/go.sum | 4 ++-- plugins/source/hackernews/go.mod | 2 +- plugins/source/hackernews/go.sum | 4 ++-- plugins/source/hubspot/go.mod | 2 +- plugins/source/hubspot/go.sum | 4 ++-- plugins/source/k8s/go.mod | 2 +- plugins/source/k8s/go.sum | 4 ++-- plugins/source/notion/go.mod | 2 +- plugins/source/notion/go.sum | 4 ++-- plugins/source/okta/go.mod | 2 +- plugins/source/okta/go.sum | 4 ++-- plugins/source/oracle/go.mod | 2 +- plugins/source/oracle/go.sum | 4 ++-- plugins/source/pagerduty/go.mod | 2 +- plugins/source/pagerduty/go.sum | 4 ++-- plugins/source/test/go.mod | 2 +- plugins/source/test/go.sum | 4 ++-- 74 files changed, 111 insertions(+), 111 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 0aa3eb005fe003..a38b8d245712c9 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/bradleyjkemp/cupaloy/v2 v2.8.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.4 diff --git a/cli/go.sum b/cli/go.sum index e93b329331b3e8..ad426e1f337d63 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -27,8 +27,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF 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/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o= diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index e5440cb4fa92d1..baffd2a98504b6 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index 0f6c0928e5d1dd..3f4c403fb39a69 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -33,8 +33,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/bigquery/go.mod b/plugins/destination/bigquery/go.mod index 1b4dddf1c4da14..7ca973732aa619 100644 --- a/plugins/destination/bigquery/go.mod +++ b/plugins/destination/bigquery/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( cloud.google.com/go/bigquery v1.57.1 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/bigquery/go.sum b/plugins/destination/bigquery/go.sum index 058044cd21cafb..53591430cf7cf5 100644 --- a/plugins/destination/bigquery/go.sum +++ b/plugins/destination/bigquery/go.sum @@ -41,8 +41,8 @@ github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/ 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= 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/clickhouse/go.mod b/plugins/destination/clickhouse/go.mod index e1e7bd40348733..35963b13d4cbd5 100644 --- a/plugins/destination/clickhouse/go.mod +++ b/plugins/destination/clickhouse/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/ClickHouse/clickhouse-go/v2 v2.10.1 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 diff --git a/plugins/destination/clickhouse/go.sum b/plugins/destination/clickhouse/go.sum index 3a194adc77a1db..30d19f141864cb 100644 --- a/plugins/destination/clickhouse/go.sum +++ b/plugins/destination/clickhouse/go.sum @@ -23,8 +23,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/duckdb/go.mod b/plugins/destination/duckdb/go.mod index 3b2a24fac7a412..0faa854116ac0c 100644 --- a/plugins/destination/duckdb/go.mod +++ b/plugins/destination/duckdb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/duckdb go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/duckdb/go.sum b/plugins/destination/duckdb/go.sum index e4abcb7827d482..84aa04cf53ec90 100644 --- a/plugins/destination/duckdb/go.sum +++ b/plugins/destination/duckdb/go.sum @@ -21,8 +21,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/elasticsearch/go.mod b/plugins/destination/elasticsearch/go.mod index 5186cd9fd883d2..de52dbf86a05ac 100644 --- a/plugins/destination/elasticsearch/go.mod +++ b/plugins/destination/elasticsearch/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/elasticsearch go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/elastic/go-elasticsearch/v8 v8.6.0 diff --git a/plugins/destination/elasticsearch/go.sum b/plugins/destination/elasticsearch/go.sum index b9324b805f7dfb..06be679a6bec51 100644 --- a/plugins/destination/elasticsearch/go.sum +++ b/plugins/destination/elasticsearch/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index c0cd2e7b04b443..015639c523830a 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/file go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 514c54fdec9da5..4add78441709c5 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -21,8 +21,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/firehose/go.mod b/plugins/destination/firehose/go.mod index 88f7c1a9d7a1be..854ee5484b8bda 100644 --- a/plugins/destination/firehose/go.mod +++ b/plugins/destination/firehose/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/firehose go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.3 github.com/aws/aws-sdk-go-v2/service/firehose v1.23.2 diff --git a/plugins/destination/firehose/go.sum b/plugins/destination/firehose/go.sum index c9a741c696794b..16137b8d6b4513 100644 --- a/plugins/destination/firehose/go.sum +++ b/plugins/destination/firehose/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index dbecac8d34b42b..693b3c6fd353b6 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( cloud.google.com/go/storage v1.30.1 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index bba0574f0a4afb..4f23965d5e6946 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -33,8 +33,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/gremlin/go.mod b/plugins/destination/gremlin/go.mod index e390c0ccd58db5..19e714b71121de 100644 --- a/plugins/destination/gremlin/go.mod +++ b/plugins/destination/gremlin/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/gremlin go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3 github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.3 diff --git a/plugins/destination/gremlin/go.sum b/plugins/destination/gremlin/go.sum index a93488776a72d2..a4ff290aba1742 100644 --- a/plugins/destination/gremlin/go.sum +++ b/plugins/destination/gremlin/go.sum @@ -20,8 +20,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3 h1:jXN0ZqT972CRu3VSwdj3rpqOA2A7u09ZRB7RvvWIR/w= github.com/apache/tinkerpop/gremlin-go/v3 v3.6.3/go.mod h1:KZ4BFULeKTVqzgX41fiTj2XYTs9meWc/TWQHsICy69I= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 311d6a07e152a4..40b7eaa9a5b244 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/Shopify/sarama v1.37.2 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/filetypes/v4 v4.2.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index 7d98672f4b3e3f..bf7e9abb5cf645 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -25,8 +25,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/meilisearch/go.mod b/plugins/destination/meilisearch/go.mod index 6f70e7b6d8db3a..e4558d41db5e58 100644 --- a/plugins/destination/meilisearch/go.mod +++ b/plugins/destination/meilisearch/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/meilisearch go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/meilisearch/go.sum b/plugins/destination/meilisearch/go.sum index d457bb2321af98..4dbbba06710777 100644 --- a/plugins/destination/meilisearch/go.sum +++ b/plugins/destination/meilisearch/go.sum @@ -20,8 +20,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/mongodb/go.mod b/plugins/destination/mongodb/go.mod index f275263f6f9a19..d609418dd748b0 100644 --- a/plugins/destination/mongodb/go.mod +++ b/plugins/destination/mongodb/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mongodb go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/mongodb/go.sum b/plugins/destination/mongodb/go.sum index c2bb44e30d16a2..e7373f3c62d99e 100644 --- a/plugins/destination/mongodb/go.sum +++ b/plugins/destination/mongodb/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/mssql/go.mod b/plugins/destination/mssql/go.mod index 024de5df9c7ff2..01a04bbc9a2364 100644 --- a/plugins/destination/mssql/go.mod +++ b/plugins/destination/mssql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mssql go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/mssql/go.sum b/plugins/destination/mssql/go.sum index ef38f3ea7abe25..b0813b5986dad8 100644 --- a/plugins/destination/mssql/go.sum +++ b/plugins/destination/mssql/go.sum @@ -31,8 +31,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/mysql/go.mod b/plugins/destination/mysql/go.mod index 2a613f6c49c867..d9b923e115f184 100644 --- a/plugins/destination/mysql/go.mod +++ b/plugins/destination/mysql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/mysql go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/go-sql-driver/mysql v1.7.1 github.com/google/uuid v1.5.0 diff --git a/plugins/destination/mysql/go.sum b/plugins/destination/mysql/go.sum index 376bf316b5edb8..1999246c2fc942 100644 --- a/plugins/destination/mysql/go.sum +++ b/plugins/destination/mysql/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/neo4j/go.mod b/plugins/destination/neo4j/go.mod index 12ae47210e9c33..70765aafcfe880 100644 --- a/plugins/destination/neo4j/go.mod +++ b/plugins/destination/neo4j/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/neo4j go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/neo4j/neo4j-go-driver/v5 v5.6.0 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/neo4j/go.sum b/plugins/destination/neo4j/go.sum index b37a9ed7a8d220..64e08a445701ea 100644 --- a/plugins/destination/neo4j/go.sum +++ b/plugins/destination/neo4j/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/postgresql/go.mod b/plugins/destination/postgresql/go.mod index 06a9738be80585..e47f2fc8f70ed2 100644 --- a/plugins/destination/postgresql/go.mod +++ b/plugins/destination/postgresql/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/postgresql go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/google/go-cmp v0.6.0 github.com/jackc/pgx-zerolog v0.0.0-20230315001418-f978528409eb diff --git a/plugins/destination/postgresql/go.sum b/plugins/destination/postgresql/go.sum index 07f3974672ac9a..b4f33043d24909 100644 --- a/plugins/destination/postgresql/go.sum +++ b/plugins/destination/postgresql/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 306c8ad4651467..962d3ece016c5e 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/s3 go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.3 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index 03e2124c8516f9..496fcda2f30269 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -21,8 +21,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/snowflake/go.mod b/plugins/destination/snowflake/go.mod index bc0c360d74fd40..db5c56bb5b2234 100644 --- a/plugins/destination/snowflake/go.mod +++ b/plugins/destination/snowflake/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/snowflake go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/goccy/go-json v0.10.2 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/snowflake/go.sum b/plugins/destination/snowflake/go.sum index 10b9ac698b3caf..50095129680470 100644 --- a/plugins/destination/snowflake/go.sum +++ b/plugins/destination/snowflake/go.sum @@ -39,8 +39,8 @@ github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/ 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= 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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= diff --git a/plugins/destination/sqlite/go.mod b/plugins/destination/sqlite/go.mod index c44b3fe21454e1..2d94a7aacaabf5 100644 --- a/plugins/destination/sqlite/go.mod +++ b/plugins/destination/sqlite/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/sqlite go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/mattn/go-sqlite3 v1.14.16 github.com/rs/zerolog v1.31.0 diff --git a/plugins/destination/sqlite/go.sum b/plugins/destination/sqlite/go.sum index 83c383192936e8..6c0b79ef73b4e6 100644 --- a/plugins/destination/sqlite/go.sum +++ b/plugins/destination/sqlite/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/destination/test/go.mod b/plugins/destination/test/go.mod index 7abd967c288b61..9ad714c4798ed0 100644 --- a/plugins/destination/test/go.mod +++ b/plugins/destination/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/destination/test go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) diff --git a/plugins/destination/test/go.sum b/plugins/destination/test/go.sum index c91eda79cb260e..6011eca88248fc 100644 --- a/plugins/destination/test/go.sum +++ b/plugins/destination/test/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index 86603b6ecde597..d0c5c615928267 100644 --- a/plugins/source/alicloud/go.mod +++ b/plugins/source/alicloud/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/aliyun/alibaba-cloud-sdk-go v1.62.266 github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.5.0 diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index 4d79b0cefb7288..80caf2f829ec3d 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -33,8 +33,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/awspricing/go.mod b/plugins/source/awspricing/go.mod index 66dfc762b430d2..e678284d5c9a36 100644 --- a/plugins/source/awspricing/go.mod +++ b/plugins/source/awspricing/go.mod @@ -16,7 +16,7 @@ require ( 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/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 // indirect + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb // 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 diff --git a/plugins/source/awspricing/go.sum b/plugins/source/awspricing/go.sum index 029f6f3f6eca40..129c5021c61ec8 100644 --- a/plugins/source/awspricing/go.sum +++ b/plugins/source/awspricing/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/cloudflare/go.mod b/plugins/source/cloudflare/go.mod index 846f2c90bbf17e..0a402ad88d0245 100644 --- a/plugins/source/cloudflare/go.mod +++ b/plugins/source/cloudflare/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/cloudflare go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudflare/cloudflare-go v0.84.0 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/cloudflare/go.sum b/plugins/source/cloudflare/go.sum index 4a6794b1fc0bd7..4f4dbb45fe7a93 100644 --- a/plugins/source/cloudflare/go.sum +++ b/plugins/source/cloudflare/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod index 6b5ae13dba2f9c..68a15c79653463 100644 --- a/plugins/source/datadog/go.mod +++ b/plugins/source/datadog/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/DataDog/datadog-api-client-go/v2 v2.17.0 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum index 0565c0e4cf3cf3..8d439e52f562d2 100644 --- a/plugins/source/datadog/go.sum +++ b/plugins/source/datadog/go.sum @@ -23,8 +23,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/digitalocean/go.mod b/plugins/source/digitalocean/go.mod index d9d5f25e9e135b..1b797b694c5ddb 100644 --- a/plugins/source/digitalocean/go.mod +++ b/plugins/source/digitalocean/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/digitalocean go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/avast/retry-go/v4 v4.5.1 github.com/aws/aws-sdk-go-v2 v1.24.1 github.com/aws/aws-sdk-go-v2/config v1.26.3 diff --git a/plugins/source/digitalocean/go.sum b/plugins/source/digitalocean/go.sum index cec18626523cbc..63ddabc608cc3e 100644 --- a/plugins/source/digitalocean/go.sum +++ b/plugins/source/digitalocean/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o= diff --git a/plugins/source/firestore/go.mod b/plugins/source/firestore/go.mod index d04e3f9ffadcb7..fb7d5821231fbe 100644 --- a/plugins/source/firestore/go.mod +++ b/plugins/source/firestore/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( cloud.google.com/go/firestore v1.14.0 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 diff --git a/plugins/source/firestore/go.sum b/plugins/source/firestore/go.sum index 40e705634a81bc..b44a2bac5c752f 100644 --- a/plugins/source/firestore/go.sum +++ b/plugins/source/firestore/go.sum @@ -31,8 +31,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/github/go.mod b/plugins/source/github/go.mod index 13e63093891abf..5398613ce3d4ca 100644 --- a/plugins/source/github/go.mod +++ b/plugins/source/github/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/github go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/beatlabs/github-auth v0.0.0-20231208231443-3b7665fb4bb8 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/gofri/go-github-ratelimit v1.0.3 diff --git a/plugins/source/github/go.sum b/plugins/source/github/go.sum index c6f60fe4803d07..edbe87ca66b8a5 100644 --- a/plugins/source/github/go.sum +++ b/plugins/source/github/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/gitlab/go.mod b/plugins/source/gitlab/go.mod index ea9c4b8f4d03ba..4ebea1a1bb0246 100644 --- a/plugins/source/gitlab/go.mod +++ b/plugins/source/gitlab/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/gitlab go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/julienschmidt/httprouter v1.3.0 github.com/rs/zerolog v1.31.0 diff --git a/plugins/source/gitlab/go.sum b/plugins/source/gitlab/go.sum index 693127ffcc1593..5f61bf3ed39925 100644 --- a/plugins/source/gitlab/go.sum +++ b/plugins/source/gitlab/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/hackernews/go.mod b/plugins/source/hackernews/go.mod index 0201653babf2d2..e37dcc1775c387 100644 --- a/plugins/source/hackernews/go.mod +++ b/plugins/source/hackernews/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/hackernews go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 github.com/hermanschaaf/hackernews v1.0.1 diff --git a/plugins/source/hackernews/go.sum b/plugins/source/hackernews/go.sum index e29c09d3ac9c8c..5cdbf9a8338dc1 100644 --- a/plugins/source/hackernews/go.sum +++ b/plugins/source/hackernews/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/hubspot/go.mod b/plugins/source/hubspot/go.mod index d2fa28f37f24f5..ea2970ed3a2050 100644 --- a/plugins/source/hubspot/go.mod +++ b/plugins/source/hubspot/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/hubspot go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/clarkmcc/go-hubspot v0.0.0-20230906123538-bec7cb6c0126 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum index 7d2a8834ecc452..17e8ebb32c0894 100644 --- a/plugins/source/hubspot/go.sum +++ b/plugins/source/hubspot/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/k8s/go.mod b/plugins/source/k8s/go.mod index 17d2ebe00da0a6..5a0e635f8e7b53 100644 --- a/plugins/source/k8s/go.mod +++ b/plugins/source/k8s/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/k8s go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/golang/mock v1.6.0 diff --git a/plugins/source/k8s/go.sum b/plugins/source/k8s/go.sum index 7b61d1e33c2cf9..69dc45d6b0d926 100644 --- a/plugins/source/k8s/go.sum +++ b/plugins/source/k8s/go.sum @@ -24,8 +24,8 @@ github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/notion/go.mod b/plugins/source/notion/go.mod index 0515db3ca82c94..7aecc0f348d816 100644 --- a/plugins/source/notion/go.mod +++ b/plugins/source/notion/go.mod @@ -16,7 +16,7 @@ require ( 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/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 // indirect + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb // 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 diff --git a/plugins/source/notion/go.sum b/plugins/source/notion/go.sum index 029f6f3f6eca40..129c5021c61ec8 100644 --- a/plugins/source/notion/go.sum +++ b/plugins/source/notion/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/okta/go.mod b/plugins/source/okta/go.mod index bac7ca85c4f4ae..07da2e431d4ebc 100644 --- a/plugins/source/okta/go.mod +++ b/plugins/source/okta/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/okta go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/gorilla/mux v1.8.0 github.com/okta/okta-sdk-golang/v3 v3.0.2 diff --git a/plugins/source/okta/go.sum b/plugins/source/okta/go.sum index a6fe330a107936..6f2ed03a2a8a72 100644 --- a/plugins/source/okta/go.sum +++ b/plugins/source/okta/go.sum @@ -54,8 +54,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/oracle/go.mod b/plugins/source/oracle/go.mod index 8c9b506c97dcd2..fc9bfd83d251ce 100644 --- a/plugins/source/oracle/go.mod +++ b/plugins/source/oracle/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/oracle go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/codegen v0.3.12 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/oracle/oci-go-sdk/v65 v65.28.3 diff --git a/plugins/source/oracle/go.sum b/plugins/source/oracle/go.sum index 3cf31a259654a1..09b9dbc93ff398 100644 --- a/plugins/source/oracle/go.sum +++ b/plugins/source/oracle/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/plugins/source/pagerduty/go.mod b/plugins/source/pagerduty/go.mod index 1e8bcbfc307b25..fa139a2bf11a6b 100644 --- a/plugins/source/pagerduty/go.mod +++ b/plugins/source/pagerduty/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/PagerDuty/go-pagerduty v1.6.0 - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 golang.org/x/time v0.5.0 diff --git a/plugins/source/pagerduty/go.sum b/plugins/source/pagerduty/go.sum index 0a3a5d2f7b048f..528a2c7df7a299 100644 --- a/plugins/source/pagerduty/go.sum +++ b/plugins/source/pagerduty/go.sum @@ -21,8 +21,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= diff --git a/plugins/source/test/go.mod b/plugins/source/test/go.mod index 4a09a7691720bf..bcb80c5665e863 100644 --- a/plugins/source/test/go.mod +++ b/plugins/source/test/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/test go 1.21.4 require ( - github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028 + github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.31.0 ) diff --git a/plugins/source/test/go.sum b/plugins/source/test/go.sum index 029f6f3f6eca40..129c5021c61ec8 100644 --- a/plugins/source/test/go.sum +++ b/plugins/source/test/go.sum @@ -19,8 +19,8 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx 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-20231229025812-7c3480e2f028 h1:GxWJMPJYX4aFBu1fDA1SBPPIju/0SAbZpFia4UJ8WQo= -github.com/apache/arrow/go/v15 v15.0.0-20231229025812-7c3480e2f028/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb h1:i0UedGdC5+a5tXCphU0rqb6/RIgRSHMA3RfrYltXb/A= +github.com/apache/arrow/go/v15 v15.0.0-20240108124322-6d449060debb/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/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= From 9d8899ee6e0a06a7b4ad3b64a5169da6e4cdf379 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Mon, 8 Jan 2024 19:12:38 +0100 Subject: [PATCH 157/166] fix: Add missing `X-Meta-User-Team-Name` header and manifest types option (#16113) #### Summary A few fixes that allow for docker multi platform image publishing to work: 1. Add missing `X-Meta-User-Team-Name` 2. `RegisterManifestSchema(schema2.MediaTypeManifest)` is not needed apparently 3. Pass correct media types when getting the manifest of images w`IU8<^u+3@oBcZV?#*rnsd>q zI`#2YHbfS+1zfhX3FSixjo_p!BPbf_-Q6%Q35lKgdR0`Lb?WvFUjzBk`u3||`>n%* zvgfiE>zyMWc6IsdQ_bHUmD_lG1e>Z9B`4rYDTNDdVIm5YM$ce73$OXN=EE>og!ap? z6-0|#+<`2w`u4Pe*M-JEsc8{j;=;jVYwtwuP&HOo4dMhr=lgLhsr<>U%$e0@%X;H| zQoXO1Gj6?f#i3;-F*BK>*tevHSqScdO!1;;W%DIkTtypq?026{8*BBTG2^PR`iG!Z zP!+aqxUoODq!`ZQ{w5Y8O6ex!KltO4vgw(H51f3BbRWqCb4fIjE5N|P7AV+`omt;06~f^$%fnxL^o z6*vH^Z7=D`^}#hi+DiJ@026b=PI!D>11^G&&zX%!G6@6`$TqdxC`5AsY>WN2-vt5F zyVjL$?c|*KB{uc43iRssP2^f;`Ubx1c_qO+sUfhuXwXIHUP|ZE{ixN)%wQ$Na;SD^ zF2`~*%sZ?!6o$GLubsEh$rc}f&$rL}tY#i^1)*i!o8b8amIHe2Lw%T?t&8io$cxN6 z@}X|OhEtd;&X!YdH-odbVLR_`S9Qb-0Qi5SFz4E8Z_P98fiinJeR(_JRCPL zUEsf&llfg(%*z}gvj;(VrzZj*~@l8(CHp_mq;0edg zCKVdMdYnAp?xlhZ*^z1uK-!X{T ztZ$u?0F^BQ@8*c0{POm4yhAou8bI6~ar?>!hH zVA9KSq&zmHG11L35$?%gr)@d{8Wr@4-0DlK7Vk}$x}VaOO``W>#)Q#kG$Ec73UK-o z=Z<~jEXd2O9)kDyG}SgD96ahlLAStiHhUhoz09GztwUq2^9D1p{hBGKxqIu9r!{gL zb=Gpon$9ntNEA2y>W&--MdtifA)-Bm$JE#C*QO3UsswSAclXaLt<~~vGwou+;!$A+ zv{X)m12KIAj=l~ms?s>YP5bGZv&N%Vmgt43Vis(mv&_cv;H0d`_-GoL%1 z62)aWj&6vTfgc=xj=8Pz0&R(F&|$X$$%lF=m`4;0U=UQ$#iYPB-vqQgbbLSzKPfWp z94ty>tt4G7IQ8b~rBIo=JlA2pk|Dr&x5-mH$MZU4Hn*jB>`X^s{(9;fJm|4`TUOIj z7FW?W=}?L1tedQ^@Z4Q0hb{LQ__ox}jW*>-BEg%CM0IRO5EI%GMl*8jHA;)1Jx0JJ z?1LKe$dk(|(&O>1Bk(Y6m`5#k$@k+-OMYekB^no%;7PxX#5cQP!xd%ujo^6v&@9hJ zsjaNbp@bptAI@h-=#zXY1llrKRwIhquaf63ZoOL|W_?vtV)@Ok+#`_V%JL}4bl>hY z)?K52jU5ghmfL&n(`edjf}*i}u0%r+J}e}KRwC+<#2H?5x&0i^=v)9eIztHB!`pGe zj~&SEu$uV-w!?%suK|I!XidE>2Tn)qNYln^rN%<4cbA4kHYp9tyWXrlIRtM$ z5wVK!y-ogf$7$G1BlTvj3L}xDzSls6#>c9bf?8?yt*N1<%*)_~Z6FTF_6T)W6cwb& z{}LI4-erh*SY_V;K_cUh zE}_qers>z9`$Qeij=F_G@s==8Pb}~rV?Op?w$m6p?D`}TjJIk`ul{fy*2v3$&Si`u z4c%sO-L-uY%?}#+0Wx;mD$e0lKWxS^B@ct8Td*hDQL9xxoIi&l(-^;FtH?|{sbVhy zo6TXl#lZs5bthKY$l?`1SA#i+QqnuXbI&$;=6b2ovMfZ+Cd<*$!&3G>ArqYU!${;D zZmSJ34MbuTYxgD4&V-7h`K1aDeO+%CAy-skvW2y%JXS)HLMt#HNtQ=x|a& zsw#C=CO=uif@jytP|jdGK#IBAMsU?~jwLK>{$1+vyUecN6C|F74^Or~k;#V;!kt}P zd=f&)lN9Go7+UFwB?x`;K!FwFrxCwT2b3+sfx2#&awSjl<}wYpp#@-QZ7`& z#N?=l;z(0MW#}YxuGWxIe~E}`DO(3Up##emqlQ-jAf=mmX?JdWVYS~3_2hE;t=(iD zQpM=q&PGJ$jbJ46AKnW|AIY2OP@&$TB#v8euzz%aO`7Qu!Q^C*fFlFMbd{&XJX_fo z-AKNa07&!YdZH-&7ThaKlV+Y4Ae*Y$?tATOkUvq8kRToG*uVM_Qg_sb!t5SHFRF5S zO$@+Lno-R9-uI&RmVC>v>yVZm;I$~ImAEgG$^Q&^D))fVWRWO2-YWwk>FJ%^3Bq`s zlFiN2nSMYCQJ+ks0>K>z;2QP}xr|fnfNLK0$6me+xF#j`Oaey|z%_xPRe%f=h!1Fp zG@I*b_GDRhV;8|#RSeOUh0<*U&d`Dw+b>KskCm3bX|KN_Tn&A#x27@FWVH0%yzPCH z!`2zSZJ6Nu(zf1n=B3csnp$D+@i^1q7UF$(ISp@BDYRG5-bA$Wl1EhwV!KUJM1);@ zEDZ7&;uHBE<2 z2&is(Cj-o-;@lnRQ__#iot<^HPKP5&1kPrGK&h4GJJyruPu>>DHyB_bFgXVN2hA?{ zJ4d2&pE%;rO2ENo11j5DJ^iyg8SrNn?rTsc0IGBJ1Ki}7By{cX0cp-2J?b?e zKQCDg@?r_uLaTUKUH7eLm@3qb-WxcaXo&qOPjF~LuP2@PQBDY$QH`1Z!4>u5{&o8bx| zilvK+VaPm44r95#V^GH866yDoN{M?WC<#K>-Pg>zNmW6=sCb8TXw@yYdC;@TYGNfF zd!7utGOn6EXxloS8w=NEl}XwF_A6?imgeC&Fy=z-O0ye~{c>H}sCI`8+O(N10ilj2 zP&X}mRy8}|8gf+p%xxdQJL}`wyx-gD!{r?`0g>`(H-j-#lXfZp#c8lPA6CD{1 zjXsq8it!Hn!@NzwA*%E3XqXBPccfxLPifhE<%eZ`SQQ7WNf->22a*Sc!H5~hO7D!T zK;r;|>r6zJuxDe3vHQ|@wfBXnN3t>RK~@Imp^ZH5%(;6LJyEVQhY+*UEb)HtI->k3 z1qdTIa9^x$Z>GsXxG*|#x;;M7>iJe!hwQ)yAL%D410Ar81W#EVs?D%J{3y<^?2lYs ziRIP-5&;GKkw$=_XrE;B2!XBN5zr6^XM%DQj3TXM3$t^N0bgfxBdX_n03Jb14a9FTWmU z*$66A0JLmLK))eOhGt?~`9!}@bn(Z%cYUr@``8UMowgLzyy1w#prb)+<91&?+r_WX zB}1#`ST~t*KJP;&P^bY)3{#QxuDIb@f(i<|{f?5%y>FM)hMrk&MHvReCO5JlGB2MS zFtAi?@7z5Vz`Crch;2fsHhOFJ)KY=~JyRKQ0Q_=qL?uuIP@2N(1rP@i@pH%lG^B~< zG+a;e0!hWFj{7vTIKUKJIPU7p1^}IF31|m~iup1J7{M!$_t0TE@-}n&=Wsyj;N6=9 zS|~fmc<23kzM1k=Lxgmd7R})25Gi_p25&FZkboph_MBv&^ap>a~tgE@|zn^#-y-EiYZ zz#3n&a2!9~7g#th9Z0F~BcwhR^JZHPny`r2ehlXS=)EybnSUC{_wnc%_88=8yWesS zT&T8sjxzPV2jgK~d`z6&8#z zy6TRFu zwY|8Ql#o$RPmI@qiRF@Mj7$-bwzzt;X)@w!?cEr|4(!>WpkAEbeb0gVm^ZE13#Rkj z!qDJF@SBKb@+Py0iS-)}`AE;5(}jbVInA0G9LKWkfg{uKF0dm|S!Cc{Y{L^K1-VIH zI%8=q7DU0+w&*fLRQ;ru0fS-{CBm}-6ELLmNG66DgstmGlWzGh@8#WM8-14pJZCMC z4v+`Z(F`4=AVUPo1w0=Wh2HLh@F5P27@9BwO?o`c`b7!&AqVOhkpm+FI%HjHvl}9;CgUkFhxcIO_SLo*Yy`L)3q^|RACObT%9$# z8mr9`&*UdZD*1m@E;LKIjBp&M^}g;j*UwjVdHw#b&^q5lJTWvI7LcXx+nTEj4Y;km zY}9xz-kYb{OW>D&vKsf%A1Z`p6MS*(>$IAt8+(mK%R981Fn|<*^{^;rtNGD-QH+M- zYo~${*FdO2wRG5GTXb^A2+a3YnFcoME?3i>p!IQLeGr~|YmOR}7qb^jYIbJARL4`4 z{Od_OB(L&C5u%Km`u5KTT?&Ko=q9;6)>7Ev=dT6y@aGC>ezHz#TVXQcnn0=& z0mz^3>E1%{F$GIl+-SurU1@T-vjys|At>8oS)m~78NuCS@w><5d}D>Vdr@9-t?szq zdH?!BtIbT!sAHh6)(ts3>U9ocCqaI}|DJHeE}&G0>X)rMko){|khvLhpWR!FZfims zd*t&SccA8@rmJb3pU#UY90B8aphIG`LeaYeRORKk-hCi&9^G6=bEsdc@Eq%i)V@S< z|D9gVxbhND?C?WAqEMH`_uA!M@S6L=!m^A+EUI9%`9^RHs1wizx-Op2(=E#{N(U#D zOZ)6u=x|kB-xhB%7P&jBDSjDg$V7VO<|p}eiP0i-Tdb5sLl6yv63>8?c(E-)Z!t!u zlUNi-i6xu;jwAXLiEW1hu)_7Np*pc^DzS|$6`tnkV?&K8&clk{iF8m8kxT#-fw`?U zznceaY4`24m@RMz-BUH}gMrGPq`K=2GNU?R_t_Z*3*vy47t)6xt+N9=0j&D;U0}?i z-YLcm;0%gQ-o0>`Hsm8_{)l}h?i|o@**AG|Wxw&~DEi+yC7vmpd76Vup(=PY6qO7p zR~*6X?*b$7eYPA4q9Z&KpkDqy&f(}m??iaPhue(^G7!t%ApZcB;kHrsMG_)fFWnBS z(9poo7zv;i?RpZVfe+HAB+&?%c_-j9k6vAKm2tg2Vi+icKP4HT@7{59I!PaTlZy}@xV;qD3@$Wz7Ru3KwWr#UI zYr1l$@htwK7x-`=ZUFB~5+A^NQ0E=I16}Zuinr@uH@&_DkV&Q-ng6Th<=3D82IPM? z^j`}7)qwDSE6e3|c4!@(1@M!L|0_>G=l!3l_4UrF!M?+RiT(pmp;%+K#SE2)#fNIH?kKxL=46J4@# zM#*KFmXilnlU9}N{i~w|y669No)b`PbCgur(P_TjDh7dPk-Gzig>HS%Qq&t=fIIAf zYajEt3o1I@3}$sAq`ogYYNO+4hYbUrUiE0*%Ptqs7Wo~pf0|zXk3yZGJfkOD=N2&! zNltFDF;}<6$A*Q`6cgWQaj8-C_ZH9#W?Eik9;ouH0pAM9Firxc%z=;@IcVbgWqbZs zv;o%`D`-sDZY*`jR41b7B-ZtOn$LEP1$81!_PQN|Ow`HGw>ed=6@VjI_J+p!1FiCE zZ*f(tp%++x8-@m}$sC2U2|sfWzi;nwE1+9@pbEs+BH+Z9%Ji)Hp1r-M{+BTY$*x+R zmRuCSn+TaF&~mrZ82{CZB-!|Rp)M8|ZX(wj`ax6Xs~htp*NeUlR0X)0qj-AnSye1p z{yze;qxuT#<;xP)KbCziwL>I^yE$_rEuc>MsmkVo@XCcYwN-J#LmbvpES582U>WxX+zZ&I#=XB6G{6vQ1 z8K;s3SG}F}%&&7AAdteL`6KtXvd(`ssqW{$Y|~w((e?dn33qYKUHoAsh_}I@SY8;b zHw~*w-U|^Jf^-}i2j0Xhn1_SwC~(!>n4c-UJ3lj+rO|b{kn%S?baP%Y8$8QrHfF|W zHdl80c4skhxn`b@!n{hL{Cs}P_4zI0o}t8`Akt_llRK@LiN$E4*}%+bfhv0moWZPS z-q7_S9$4TppF;WKd*w=DbMMp_!N4g!Lzlj{q-ijk(Xh95khskjK6K2`&qOO=3zQt; zRoqg@Z>1t?52nl*>QzHV>AO(AOomghjxTAX_7f}`el*Ar<$Bk8N=R78I{3o| z-*WxLkG_VGf*LCFt_+c^Y)xVwDmq_mm9}+=x6wy(EsHyJF4=nD(XR51javE?qzF$| zQ&p=$OtA&>fs>x^XYKt**HYFkbNWVKmzc1r-TcvfhgxZX?ga*f(VoN>ugm*IqspI@LMt;vU zt(_Pa)Q}&d!lvp3mRnziAmho4Vz*F?ou$fkYf7a-r?qq$BNy&m5MTL{^`Wj{sxFSV z^<@Vvfv(6*C~r;}&J?-l9ye2HV?tp}8KJl2jSTk!MQafI@|j%^^xB=qo9@o>L{&s3GyU&3%q zoK`68s2?-4$Cw^UP>fNhh*f~P_ibz+cE<8V5|Nmf0?95S3QT?62#cmOViN&xSf8W* z=nz;EtgMxdVV?e7^@x#13+>lLV?V!*?}@tGZJNx}=`uTo8i0c{J|bZE<1UO;a_hUZ zz1TH4yDtdW@!FkyIy2~8I8(jy=`?khE6SGvR6xmEcxvtzTlMA3qRHNWEiOxZ6@&7M z>|&+V_KGn_PO*yRfSOATA2=n&T>ZjTJ-d&Ur)jJb2sLW=O%0jXV_Q|{d+S|YUoz0w za+vyHRNA@10w}b7O0;KGJtuS9Eh1bA;?>YLQFv z(feCUn~@d^4afR+;7&`P)<&*5Wtb2cHhiG=LDjKT<+ZqPC6clHuz~f5AeWQsIVo1$ zPj8Uua{re1epb9oPL~HwV<=l3;xv1sUH!-7)|T@M;o+XU zk$-AIlk@gX34jVo1?Lyh*j zY2&&lzS$+#esAp?i=eD+o~6wzS~}mkykjt3-0qOKP_?ZRViBhQWp-uA^_~dDJ(CA2 z^VYXaP^vMZyU4KmD&Yl`{gzHLAI|k#^uA!(0-dUA$k_&w)g^yt!P;-%;6{Bx6uCxL z`&z2tT$P#bLL=rrv$PdAOyWJhrOyL}V{>rB#h{_<=rhV_(|!w>MqQ3-TQFa$S>t=8 zHEG>kZ% zMs4jXch&A2rX|j|J?Sb@irN9Q7D6-R6gBrj^DOeP0&y`{SJJjKDQo#Dfs4MDE?M_FjHLHO zOGndG(}TxDq%Um^p*wo!tb#YgIbd}kKAP1*sl9>(*B1b;WStT2nw8B}JVhL3kg zHHwE~aLqhIXm^l)YP4rN-PG;ah|GTp+Eg|3+8f$C%2yGMCR%!wP&RrBWnB7x0;S5o zePUxIXY_+nsn^9s*r0P)JahyBY9c>{b9mLwrEs95X_(nDTvFN%yX!uu)UJvvAImP^ zdmfil$_)-FTd3@Ev9J4x7GWQjMj9n$j}aiLN=6GDT|_#q`@*UMY_>2~1NEj-A`>-i zLm!}X^N@6oSEsPGwGSQ`;c86gRX;oOmrlHSni$sC(` z?J`WA8AfT|o|@M1Ena#^1WVwZkGW(9&}PZ(N?tSh2w_6GzK_{(O(u^q(p{u z+x0>_Kwas3zP8hwNMvN(3dTmPD$d;HLzA9dRe`IgOCe)N6E7zV0vm=qaRD4s5hEOi zYw0)aQZ~djcVHFS3#U>!aISZXg0FI&t?{;OUt*12v~|$x+^=$O=AoEy|Ms@YexD_( zkyI5%X`mAQ+QKn))0eUdXWO%NVS*vbfSgimKWpCp;1IF=wqts@0^eI5!^%$EPlklV zm}3|1&QsJZu3dODtl`vwBo}V=#9d<=?>*0>W?LwA9$qik#l{d4u?Sa4{`n-(9_>$0vAiW{HI2R@jueNOXVqD|Zl8M02E2o9^lxTCUhPO3iIn;@U9wdlC@ zUAD00%#dlIS)zf*WXaCD!PzXGsHa7vv{+=-RaW@0*XAUYCf9=7Hc_h6BgJ^zc&jZo zKRi&Ux!|z1YyX+M%*3UDn|+XMo-@A&3~)GEq_-POhuYa~oiJ#^=)3O10>)0fQar(C zkchCGFg$^HbHUef|K?I@pA`a|vj7e{5boJ~auybFjq|gxqKv4!bG12jW81Qw z>jhOAZ2ES#Uu64rua8A-PfkhYrJJ=Sfm1L)T|?8+KnLHYi!|wl3>Cw5H*GHwsh$wNT}a1e|1 zh%J06Bjl&Yi>@AY$fsBmHO{)PA%yZ+s>LPGz*fS=TUh%1n3nfZLh_|*vF%-+iyLaC zLt@^wv-x=rItF?X@aoAk8hw4v5sJNR2w(XT*d=vi%(OurLunSw3kMzWSyo@wt7Rfv z>b<#e#@)gUygs-|sis6D_GzXHt%D{8-Ht1XAuLGO8a>D7>0MfHiVX3M_cSf(NKppn zaBz^PuCmA`AvVhN_y*5?HNjo^2qf)BS@!%Y^B*|RuO)B{o~{J8*G3xcF=ogu zz4KRJnDdfx7iY+wj9|~o%zRtinR1@PBK2y(^^0lD5sBA-T+9mRdUN;A*5V*y7rVR; zYm?d@_Uv%!h!K!p_pon|i4kb=oC1JPNg#3E77nT?g|ZV2Yfr5%(I=7Z{r;uH{UCc=)kyzDD(27r(k#>Q&ho+I{3O55@jpU%NB4u0Z0Bm&|6=dG zG78X5?E1ch z9CkpE^2c5YcS6_EiB}BzlO+7h>O7L%mfvLf>pLguxOSx~juQE!HHESd`y3zm8B~MR z*@q0Lm#l{5!y{FMpFV*-kRDE9GjDL;d}pv(KVE>@iYr)wW^!`7fQiDc>RiGn3VZUR zr2i8?Xp=;$Y?Q}FOT46MsIc92>7cPegSC3xb_Vv*Q;ddeR5e2T!zUvLRX%;|l3K^E zMxXVU{n-hZ-ng~G?vRbXeJ;yfyg}r66<3B~MjUdle7(v@3Flr3tyOaB^e1QN51B*? z>X?Xa3pMASS zw}Czz!484}B{`|oZnj6ioQ!}wT_-XZ{giQW+b|*HDVoIJ2Iu$&8O_Pk z6{u^-Jtx}`cBP`5t?Wf{(cyWyI1uRMzDpsl%0Dte?kVV${3=sNH%Ao6dZH0H7JUChhRC{mr zVgdrQj`o{p8{LDFB9~EiGg4kaOPlzxi`Nbwzsktx7RY|16PQKX74d#P+V<^J&#{!U z#bAR?zLTZ{i!e=Lm{Z=jy`a+vgAFB7r3MC=5MAZe(?J9Dl>S7Gee)fyiYIeXoVMhw z&4?>6-qD|(zL}bz{#G?xx25;hvZ?ry|FIsEbqIx{@4+HG-La_Ns8^tw8BoV!)irv!jAv_`w^j#Dds_kjlD~BWHVw(h zr&y^hj~2i}5v+RUuT!r_|9;HHTl!02{4lmeS}(0a-Fx9_CB<`gS#r_FRD2?c2<$NL zWtk$gugX#c>msujg%@iB?}axTe}7$I_aGZbhi@ojl+`@VK3FN4PkH5zRnw2URJ{?9PbZVT?E57z5Z(<0_FS(opfx;d^poRN(q{LvVn(9}oZd3$(Ni zUzs-9=mnFIRXd)GE4<3~He9MWxH8$F(y+5ZPV131RFkyIh{;rjd_N-SXSCjp0la#WJTa?}xRjqgigQJ6p_0f!cWXj-f zHF&9Qjxe>9h>x8PK&vCB^HRyB918N883dd-_8WsSeB1fvfcRXRSys9iKMU2sEN#{B z%7T8bVM9W?bAbPV%uz~!|ByGb@ADxyo4-dedplm3-9)|8hKrp;ZH*3bfdQ7Ku4Lb5 zXB(PMN)~Cgy3NFW&4ZPt-tX+Mq1p1VTx|t(pS|i+um?J&Ar8H;@i8rIdrSJSU|9aR;%dAvxYiK+iTmU zv@^L=gsC%upMCnOw|Z4_G`nL+`s-p9NtLz;xN&6G&E+H{-g(3MEge7A1&jM)*t15Z zXHri}3QMMH14k$6-)L8QuT~{2z9)@#Z|-o0&(o|$m_ppBWp+U3QtAE5*7wT@y|`k_ zmLvxnj^&-_Gq6j|auV)|Oi8aPK3x%&;@unF=pQ zIQJ`@to=AFNeReGuCa-WOcn^OF3d(b2BP`)M5|xLR^Z*LtZqj?ZF<}LA|YJ%%8f6g z7lBe%^W;HRsJg1A0xW&7GH83K;W6fJryJ008OTfPuZ))9XI`&rKK&-rxLvTb<>PK% z=TRUb4R+kn951A)Mr?C8Zh1R@^cs^X>5G;;QL_-WHB(GZa?+vu*p5-#Y(a=_2TO>` z4G4?QU&^N`Ju&uneQ&`lUyTUQqY053VtcPj1VYgo#%`(1ITNI^_%F6gak zE-xcCAEMj&JyL*GO`i>hXuHsa5P5a*aa#1wPdV;J?_S=YX6>TYnBDt+^LLdf#x+-! zVc}*Ni^R4}k8au_2WD(GvnJ9L@pCrzrhP0Uj8n|kv zpI>^cKU&$=03|!=fk662P@6KvuZd!INo{-0M}R{3#9E-0Gjk; zz2>FnyDB84-K4#fva90-*heiX1yWA)zEYO^stiAwhuUgUUwL1$)rqA0qsX+ zO-OI$8cD9~N(xGN;MOMX`Lbp1&Sl5$Ng;3vi&YWl@?q9;Y*+87QGFu%ajWEzMYW3Z z*xuvCxh}f+UIV7QiQ$y^t|DNatE|dQq0%5?gRiX|R7W6Dw5KV2w!++u}SL6+4^*HcZhHE`AwQK6X>z_q=Ey2pazo@LTy5aw&UC8<(r`hqtF$OSbiujDef?zavI^YA^|v6f343J)F2d%ixm%G9>hlxubQf0E%6dQGC3V!G^dg*IE)i~q?D@2G!tIp@AYvisu{91!wf;uf z!&4ec2}k)nLxn~8xP_jvgr}&YDIEQHi0{EQ&w)cI>Y16Mr>I7gY>ltSPqm)HO1v zZI-)+6n=9n_JX8Zx=p_(eptO?Bzsz zVG61lExz^Wt2D+cEaSy$M)6z*_aM)T{XSs0K!h6gfmwU9GH#MX3Z-in$g}UfDm{ms z17lBpp=+w${U>`AEIsL~f)BNGiNmC({~0ftYf z>3%Oy+hol2%#{38h|0V_coLu8`|V`HSNk~Xj4W2kPpy6Q6o$e)CYOzVP?Zl8L~9@+ zAcAU|(pxO3ffTb~>sX8w*jo={qOdu|o7C;xJVfLU?*fSp!5eRrRb5mC(Q3Mbf?=zt zA>~(ON=)yMrP|f^-x)V^kFW{x%4N%<0A%p^NK2R z@Jc=l6;dz|OaD5UNgwP1o};%1piDc}#T6G^&;JZM1Jz*ec{f@(Df!e3W1^~Aly2l9 zgZm;&IS8MetZ~^u)Lm7RJ!(XPF`HG+Ah$aLb9ROiGdzh+PSR;bzFWJzVaaq<2YkY} z({(&kSA{b1r6<_60RQb{SWuG02@k<%UPDS{nV~*sihC?n9Br$bq+7sS+9~vPrRjE$ zV%-SHeW|ocCw9O*pWbnqylI0WRfncA@n$U}smVs=b2Sxd0Jxv#TG?*X^JlhDZ^R=#d z2lgvfYfLHzqm%2zi|zE~j(uAqfxFx zXXcG%#-D=&RHLPqY6(%HQ9gCo^wi*qUZL}2QZy~dFBcn_(4ZTTnmNWEzbu0WncI_$ zQ@`JRvN$(zm3rMA-q_#vXLNz=>reGH7Qa@1ox{uCK%_S89 z*`TB_G(#3qCR%AlzqKd#v%i!+iSSX@Y0tA2aeFumg*d-Ps@jS+zIz) zJ3@p4lnDs~5a4?_;3=Mycn+`8O*RT9 zYJAz4get_mwThN~ z&Lm$VvPy979qwg!hDa~3a?3p>6u(!erf{*k3_3*RGIY}C`<=Dri^1y{A}ry65k-~N z9ZN6a#gVDRU21U*t1zmV_tMF3sJ8Lw<|Vv?JrhLsnRKaH&o|r{WY(J zt>Bb6rx2(^IKGz#@1IsiD?J*jeszPR(R-0Q&(meS+2xy#dd8#EM;03!Q}(w&l9bbt z=?A6GDMG5{$!1#zo+p#ml4^~TpAOI1-&u6TW~VOU&te_wF}`!(fUS&LHRAImQn6qZ zyt~vfH=zA-=xy0m)z}$NPL@K>s2@S@jd*T_&RkOV9#w)>S9QoDL#jZtlB#?#(DrsK zyywTKd0wr;k5l)ASgf$JM|y*Ivyg@`b2!+!eW<+cKc7{+C3vtV^U<>(zY(J zCari~Ax$bpKH|ttUrUtcJ;zzY4Wh8qZB+fES1uD-WlE%(t%iHYdJb_=xjp|mOQxNw z@qny%$Ln~DFE2lxz>2kD-ofn9VB8kB?5*{W(vq@Uo5r-te#XN@Ss>lzxGd^UR2 zTL+1lS*#d66tyk_8huo~EYq^cC5}z|LFMY%sjSHCbh}}f)!LPbP7!~BDc9N!CdB(< z@`tSIwIA2qO1Wv4U}bseqaJpy*m)}27qa}(1$&_Nj*R@rR*s2XM@VW5$hfxr$a8n0 z=LH5*uX9~Ktn*zf^dD61@0|*>rK%SGzSUFiigjbv%6iS3pDkHL0N7Fr&Mj{Bp}rU^ zRZSYq6N$!eaJM}V1>B;1>`(RgFSJUk(VQXR=85Rw zTRmsgg=xp9A!)_@(UBEaIwjv;SngSixuWyh zhOe9ckp+8TCjd?VzIfX*f!K5b%ajq}LhWbTqVDT4^D5SM;HjmR8D@lgCFa#-;X}`CnJ#y%E-6n(T;{9?+8y{5s&+tcAdy|IRj^KgWeUyY3A_IJ3F!?F~99EV>3RaOBkD`JnJC8O+ z6{~LVc5|^%6;w6g&xVk8B`yU7p3p%|-u@trfjH>}Mt5(($jC;~cThD}=3Lj5sYKZv z{6U(keBiOYHdD9s)|Ym4W&9us^9}F1QUf?g9NU^Fxw|S~{CdR!mT`D*lA348dN=tZ zvBd3iy&6RZrmY|VEmFo18L)@x`+_k(n=g+@Py4u7tfX$O9IdA$-W#>4c(>tf4d||W z%tcDLV@NIf?eo@Ya+AA_r z<%7IIS720RqxeSp1-&!$ss z9zdL}!t+cmO-`3lA>CW=%FJ2wNMU-@t%4;xZrT+QVexKa)MQmOIB7TC{a;xod#1&rli1YebBpNoQqZh^(pyGwrfL2+LWOwo=pn(RyC&BWXA4= zZjzpxh{K&cpa#EHm-dsiKI%$m_nJCnCPt$u{(1@!&+2FGD*dr3hSIWp;UQ|KU1u0d0P zrLb!S@>qBxRVN@zzkj`x*1emeqL~MEaaswwNKO{nF_~ro-{Aeww?3bnk*^&%RCrsT zW zz+hjwhr`l6LB5reYE`3~0`5@3E4iCUPJ*Tn-!^Q0vlrm$5*iZNfQm|#& z=?F~MT2@rn=2X=^RRtxdj>);L%L~RqcB^cej2cHlfSwUaed+oOLxO&-f=)`~2G=ub zjqhw~%7ZKR+%;O{4K575N^;YGD<7_E3GKH$`(&3olCP~KAIHU*oI3x7QGzq>9(U6n zp;7{IZZqVE*Jmc@PSx~JrwXtlmp5ksf1RtMInAD27ER5V!uAC)fUU)K>iaPVjf+93 z(5o(0;TUIgLJ&1&^m zoH{hec{RvHjuTosvV=U;?yE<{*PT`?VMiIKCw&%>$448ublsRPl}(eC$z>`_GP2kG z=PF?%Sct-8_kPJb2G^#BS|piH0f&I>W8-;r;orv|`;*<+a#GdYq#tkSu5uQvFwNxbCSe&Q7VsQimL*9m#@ZE1f%gYSWC2+;|in{Pnq~wWG zTxHiOB+EG0I+3oi6kPRMwUV?ZGP#ZI0zE5Zt6&v90Cxc zI%36mVZk-?6WZ2xO--?wCeXY|rjL1kh6SuTT3I$ZYn(cY4)CrLa|M(rR~q2g73ciG z02Mgf)c)FIyu_Hhwg0gh1=;9>Qti!Au9`fQZLj#y+GV`yJ9=h|aTykTeqQCp5eNoo zMt&4s^k%y%I@j33UpFADRl{cZJ3T2`KUXDEK&9|f;#m@P4zX1s8rG1WzU2UTLS<`@wOVE!Pgz4 zV-e0?h>)lXz)bchf9wQN0TcZT6kfbVSI3tIQphug$Qjc-Ao&(^@}h(x0>ZmwbsYtt zpH{-u$gA=w%p|=f;xCmd?xVMcS z9S%8Ulh4*S@2~sI038V^JTzj`K9j6nuln*ykz0tR5XEY zP=Vxgv9Emcq3HG?d7;mSH#E)9S0ixMhX zGt1L&SfD6=yc5Q#A#t?NwVF0#|DIOxY>GoqSyD}uw6W;v*+Ko;g;jrS#br9QG~%Y4 z@E-w@a=xpchiE*H3+|bHlj669US50pc`eDJLTeVYBv3M(k!s6$PxF~V$do*FD|4W$ zE{{mr6&YLhTl$hqS!n&2S-SN$b>8CEQ3Y+|rMsp~IUdQ*5yA&`34Niva>d+r<=Mjb z(q|r)gPz)Odzk9Ky${=Ztg6XPzTDvqFduR=lT|!Vy?M|C8dcI#IZ%F)4o$mZXUgr5 zOe{&EA`1j1+LU;+GGkqRKa})OqdN0t*0|AMjc4xZIwc z(l>;jM83z*>tKsP!llVXm4cadQjY)fVgzoLb&a;plqoZgJ9FDwL;Oy^y)0PK6uG|9 z8Q~{e*=-6?ofQMscm%_)=VSsk5dgO8FA6TpMZGRls{oL(nT4)Y!#3 znfBi9w{ONumadJAdgqZ39Pt%zRW@Ga)4W)G--bSv@hhd3=ZnNN!m!RAP>t!THhM<8 z*5P@Dhml>K6wrF6bV0M5rv`46zpME2r&klt8@~+1P+X7npD7WP7|oPcIgZI^q@S3_ ziyeLmR6b>7=(B`htgi{wW*^U6ZBA=$@eZCebPF9RGB9A%DxSMjL=jum;KCbD$983< z6jQ_iI{D1tG|@rvVf&Ey;*}U?fL!q0b4+z+yCUNnv`%-Yagg5@2<;>x%P$U$8~cKl z?Y*r^#jBSO!8NYEP9}P@#Y&7;v7s9ccPpDy;RGtgZwUr0OB*kxp4OImeYaey5@k7R z#ZWq-8c)g<*|$0$q*)AVaKD{w$;Zxdq-5l$1|f4ZaYI!kB>FHtrCEhE=W6TGzct2I z{Hvej*L(R1GcT!vWtvmSkg90O{alLD=~U3oiSK=8W+EbrQWC_(9&A(dtX?+zfJd@W zA4PeKb{e6GaR!jGj)QaLP-Hb(g^BP z(Q3d!Lae|^s$@ouOM=3i?Xl1oVv{}R6*%$g`a(VX)FIR0Jtlx)|XL$LuwKuSUD;o56DWP$)jhR~Z zM_%)B6i%jtV^=on&+Z{o>KdO50A^I(01L6~7620Ptn=h#`xWS-1_+gdN^4uT$sd?W zvJl$rEpq&+6!Ly5g&|)!4tKQZ^yw&+PQC+wF;KR9M`Q%W)hma$ar4~K$O3#5FJJAV zZ&q4{>rHycsg;}FvBI*MoQ_|U$;taq73JTv*mVNFt&i6ZcBds<<-@+ukJsO#^POrb zbW|TXU2glE)BM zEVp_RDq=}XXx(=xQHkRW#&_t=1^R0pxgR_x`Dx~SQvwxG6=ESsKT{wBpf4zY0O0hp zE1jbl&rZz)`9vkM_1YXtT!FL&-RP3p^sOg(h0@MT0|~43rYWl62iC!sGYlg;_si2M z07ll*@kH!3aIAZ}h4QQP@$VcJKpZE^c|fH7iqng#bF)Rvxp_7PU%r0RY&xgkJyN;nx={U8dMt)P&z0Z`P>7E|Y1a-Y?IGp!q~OzU-Lse%GvWg$taJ?s@R; zrdOHg2sLq~dT8+6?xt2g!I4xdb%(Ko-EE1|)`vXH{c0rZ;y0W!Nk$OtK$z)tPg+Bb zZxr~ap89Ju@!`%QsZVLNuq)uYhy`YqiQf8Av-$P;r9I)2Sg+ek@CJU5w6I@jxostt zzH+?SwW+Y!&bBD;JKG+eY*t=1c{C^)oxH8_)5cN@x_&G8)3*vMWyYaIfXbd5ATJ#{ zom{KC>cOx+Ey&@6UW6t_ZPTY}i**8uL6be$_o0tGQ+lJ*ij2e zn8aqP+Njj2aM|+03K9%j3|6L8dcQjB<^>X(c4ihHV2Q?s03qn;&APZE?PRlsIEP_f z)Q8M(59_Q}lqxt=lXG?J-C8_L~V7C#miEPk@Yw#*I~T{QPAYrotWIjg@dTIClib>hAH45QZc&4G;jKSl;tc z?33iLcu;v&O|7+V1E13lS&f{YZ*jW?if1DQ&xWzS=;KpljRLf2(wyz2RHFQB;^RYA z{<*H)-h~~a)V_lay4lHgBM^OURz6|QO6%zBapQLkMOyp_-OZGUrUH~v`2sY(-x}Z< z{BkO7yds4k3=&+Moc1Dwdh$#y&yZB4IQ^J3)a#C6>`V34@6R}-?9Y*V7ZI~8vXNBP zoGj6DH0^V9g!WCkBZL$|7KFXBdhk?Z;h5YUw`YFUYd5MbeA3X?H=~}rW#xg$AJj|r ztAv28dFCc|A3AD_7R*ZgNDug~mh94pB)7DNNi|u__W8ZbcA*P_J z5B`<7{`3W6U71b}xY6Fjsqi zQDq)ts2Urbw?rA*6kforjcHZlc@b9rcvz0KD2TIZYs}>RoYmQw0HCn0I+rqmIs)*#zd2-zF}tK@?WNey@$!J-uJrb!NcSxR{*003~rBRb(HCzkQe0vgn`q80tX5OT6y zzBisUyNgQk$-D07_I9}}NLBpcfYj1iueW7ah$cgl<-}HaZaHGGO96hJta0dRgC_Qz zD$}(0pyc`3OvbK1Qag~sZ(s*dvtpZ5&;)0i%2ZFgGsF#e$3RsxkmbPBTAA`V45H}U zTG!8ek~X^B2e5G%80umLowPb=h)W7A2H>f1b)|H&a2&jw$5_Htn5sQ3ng=#Qi;eg- zpH^$v&-m6%fG1;?UJsSMtdFM#vLaN`Po*UQMF$XJ1g1ITdw`+z$gXh}jP@L)K1icG zmY%yxYwP6I-r4Uo6tbKC^>49uMFq->;O_K0DOuN@7EdllyG{aKz2fp zMqGgZVwkFAr~%%QUKYt9%!+|7i>5(Rm(lR!4>Y7A-dz=5r86>c z+e9)n3*nZF_=X6SeAXr#e7Dv?;ZrKnW-WY%d8SL8g}L8&RVXkp3&;kdw=HXwoHY?? zWKpfONGcF71i3Vca039vuF8~Kr?BPjMWZ*enirRj!RiucEt&3C_W+}A$qz`2L_-yvF-oM?w_o<&^ zg=Bd@BbaY*ZH7VO1V+E*lTXo)nT`^bqry^23kGQthgms1hEq0)Z`fYWKwaDyr9kg~ zfA0nr=|@;sU?2>S?TnPMkL))4i@t>bX+1Oyhp@#sFR+r%zRvowt{NXz#Z+objP_$c z*zC!0sjEkcrKw>0%Mfsd0oM`MpasaSC@LLq*%S3=X)I`SqZ4VKT^%bm1=p8_E)zl^ zQt4OoeGe=x=MFeD7e8wr{RErft5YJe<%9XYDj95pj9-^x>VwW{mzOn(;#ObK=P7QD zdCj8Ws6xGVG2-3yMz?%K8A{WdUAy=Lhw*lJom>9AHBOCtXT;kqOUq1T+Mq9xUCH(u zoKWJUsg&64pf<-lR6Ux@GxrUbN7%KoB*D|@<1wpTJJ@uHV^#c^0HU z<>bgMsjqET2oXEXH+1@TxX1a_C*oW;wgS3Ql%)_swC}ZXm>}CD2EAl@=w!Osm7ajh zLveJf#tpJ=Vh>EGUFm$Kl%--1<*g7&54&M52?_GXV`-Z zxYE!CA6n%Hx?R}-!F@n*gDkSyQaw+|trd)V^q{GN>#cFlJZn%^Qa9>OOmKtUd_h$}J+-Y~0X0;w+i2xfYGjTfgUZEvZ?_Nc}>9R|n zNF2*rw4SITd)KsMZ@)0I->hr#54lV*hL7eGhEU4k1KJjVNjJtH@2~CVnC5pC#HLMo z1sL!Q63_w+qD7SF+NUsDirw0}B13nj5XBOyua?%YKBa3kVwz{Yt-TTnczm$arb!9- z7{#5~bz{Z1fw+5JuB;faCI;M~^h2*|(n2 z)nb*MVZ~*QgSJ%LZxMZ+$OA6<*2n7As|=3GdA7-N(3H$G+JEAG$R zk9HRfp)oqpqAAn*AKz)Yhv0se2t%R`B+dB561%#zmC})z9bzP0f$IAR7x2ZWb=|LFx_n=un-bQmr2>q+yWytw7TDfKPj zaG`{nINHN$mg7`;(!Hts3UB4@r)QGzm-zh4yC0cTR}DAFxB2=6Mh;WYPAix7N_j0m zeAJ1y%Mz@4y#ny^^$HD?$`*`GU0;I;Pzh@Gva~lUF0$DU)V$NkwLQoey!4!fzv=sM zcy7A$_2O}oKv6qX+Peb$Jl{f zsnk5t3+AXy$yy@YvbS8Rr31qOkw{o^IztHu)wE?Rv>`P)cUN?neI^;c>1Owy)N;J! zW6mwtq?6E0g;`fsByE!{zEItSHH0kGLmu#0Etez>)Lq^6hqTaiyDMXk`$S^VO8{@_ z9FV@IzxUpGuwG@@YL@E|pDf&R19yM(J?55Fswf;^eyHAER;*;avx#x?B@El?Cwg;= zWC-x-!qYZg-OmjGLkVVLiHAan*%Sm-D*a?(2(nMus;~CZs=6B$gctQe$GFES>Z`!h zvUGSNow6G|4F&L=cL7TrFJNGG!n?`4xp;zXHZWtw6s>?387Qm0?~2{qOwcOwb4{}2 zreExNkLNk~l0r#^>}(q)g3g{1@H*J|RX$LmNmjKvBx~CPCXOi*@p}^{>OLhiYzlLa zEm$hZga;_&49+PhqjZ62i)CK6;RH_}TR7G(cW%3CS%x$5Jkhn_JKt=6^khMY2#P3r zU0G{5OPTZ*kan>3+2~bkFWmZf3;T=Fv)N4r)3d#Z9@4sK8su#p`S-B_vLgic3qn!3 zf}1DxW+er$)eB5IIGE2K_sbhZ4$i0TEcSc|*UjvFYSxU|H19_Gjdi--#MjDav+PQv z9JdVS{bW&G70_wCdiJm@CzA^t%sUIaV~*{5VY*pJH!l+Ym_Pa*3583$0Rj67lhZg>BYmPG&4)=7i-%rg zpfOpuz7w8OG%Ir9dcpBrORX~Rbf{&%%lLqcaF)C&{Po>7qdnDm&L*^g-q~TFD!>fr z6nGK{`+gx%YnFIte|;Yv|HU-S6s$=WDZ`E0Cn4*f2+8zhc;ImKB(a$dR7z^E$*Xi^ zsLS=;a`Hml)sd#u*ll;IGAYYluEv2lja@mA+Z4>S$Y#2dwUHw zSer@MgeKAGpv$s4<7K6O^BOB`iZ;H0-J}gtXR>a)SUm_|?{V8iqu{#}3BOrOrRR&j z1v441Qe2++=eK83k(?~`o|Kz(`xdxqUbOU0j3tl!7{2ENL-t2WvJ)G_lN!` z%A@tWerL8$+@q=Zuy4L+9WRiImoHxV&JOUNO=(Y)CxdBl7qip%I!X%jwMiTEeI;3q z#i~WsW3GPh6H3Xj;7N$~WcV!uuqBh#;jT}^ngLpBx-iU&e<)y-TK=?>B!tN#WgK!= z9a+Abtnyu3OS34H9JDOPs>-uN(CP^0H&(Qpoo()|-Uo*oYpFq#EV_H`os_@ReIrPJ zS^61S)%<0N0^3=d~Y}yW^F<;aJ30I4T`|TSzf%MEO_= zziEP{^wz}DJc-_5?u%bvqVXg$PQ8oIp+5*3Qur#pEzVazLCV!nv11o}xDWPp=#lvK z5ISou$*98Hp5eZkmoy73s5VW(RZiiUW_$3j=QLfWQs~c?mxbjEJR03;LoZA)V`Yzh zC7PaZ?%gV14)L1*IlOq=gB&upn?_Z#)MV?k``~3DLQB`p0EW6!6My-d*zijTZZ>L~ zYzfYnaBsSK!-K9)ZH-?{Jgr8w*`(~i^p!AeZb3Q6&)?ZIG@%~bXJ1}keYv0XFt59{X`$-ZNGPM?;7;W4}ed5b@MLEN;ZvTd)DlU<0Ic$r@JdH`B$Z*SyGLo ziee;krLyYv@WPHPP-a@clgf#&f@O$-M(((7Hc=uE3NH>Fcl64g?r7nKc6y!-e*A$P zmH5&W>Gy=@_UJ2%R;Lh!Oe(_jYgh|izLR9Q>85>eHgSZ=#i7TeD{_-h`+;kYz%`d~ zD5>c_Jp9)+dRaPd8Mv*29ADJb6Xx9KLrU|;v8mxpvOk~tiIn>31kpGtNhEr2=;Mz< zosjO}GL-bsYlny=`F`q#pVvZPI)RH=M9h)+Lr*G_1w`1!3-#X>n`d=tjSHi7!s4qf zCWY!9RI?Hi4-aJ@wP%r1*u~oWP0_eM)4ZI;tjSJqtHMR8C8x=cr)t`)VyWxWGu8ZM zKm7F9xL>Fgvy@DZhOyl*RFHkeh7lP4_+y}o^yU7Nj2i9}{=51)eWB{bR@i(%kS;)G zj6DNk_`soKS+RZ%_fJV%Yjd$EMYECtZ%ByPtQ(w?#aiiN8a#0qqK)@|jWmvd;EQ8q zDu*1|JvAeuCLkTo1^Rr*hdO1xj;2|f?zZctES#|Mn1ID(5)#6GMdK?s-lzeLcf>2$ zOv9xsGK~$kx;(#Yl>ZG5Ji6cyqtLDOh(t&)&0;xThcWr`N!e0$6t7 zEVbe1y7GV(ue99X)%H8yFZ`A)!pb~X6_&-WU6SCsS|dN&-YXxuvZyhD;M!W@r+&Gf zo}A;9tFGQ)#yFKMdxePg;w4Sw?DUm_QAtzh`$XSPC>OXG%&L97_1pzlovwgJns^?;HS`L5$r@J7Z8jjQFp=2Dos>~qbd#C1XA{F?D$dI^tE`OX=|Aljbp9(y~`+t3^ z7^!YKhIpdV6q?v1AZ48CjmHWu{8@maj%)+!XKr1_YZ&iQhbb)(Xa)v>##9aS!>Hzb(neH{L^5! z-UIpWDz-%ASO4^iKm7TH+TV5xu~^nz(-U8^9Fx{0OSIH)W0F)jCZwdm&XKE-+x`5O z!qaXN%ZEzQg8#AVUR{$^+q?9~A^hR_fBL9jf3`q@fhJHWs3OQw6!d=;%ndSAy1zT9fB(*#4agmZQpb-z{^Pg*`v-qm&c93GT39*p zZ?p3E1}c6FP^JjNUaQ|r9RAiougFZ`{?~8$Zx_<>fr{hhVAHDq_JjYrU<0z&F8`hB z`dtFARB*0^9l5lZ>;GTx1XkGI@3Q?{pZgE&{(AQQf!%)q>L1ws_4f1+?Ebvd{G;vu zdLRBr+x;0q|7g3v*7E-tng4;He~iq(Hm?6MGJiLp&#jh!e7nE)Y5(!<{sTe(_;!Ek zqyIyx{0D;mp;Z3EA^d5&{6ney8A1P0D*r#CRNkbwRIe}ZjL#aF_KvwcRhebLofovs zdktjq?+80T{UcrODPk)F%$87+5rC_Pq8KawMsktHeUHSJ$}0e|+E00bVhe>53| z=+*eHHiJBZUlCtn`$hNn#PWaRjb$!Yd&Zf_EyQj zEy=VL;-Ocd+Vq-?TU&Q$5mE2#axEvSr8N-Ov}*vg0}oy=--9cewf6oiVzDZ}l^Dv- z3>0oZ$`WVB19RSENwRQU0+K%e)~Mc+T&iX>(SP??y-eAZRShO5&ml+<`pE9ml>1tI zZtwWhqm4!qcvz^nnNzH}2OHkPDC$1t)hjZwnFC^fj&J-KivOeU#W?>b?!+;VM_6=| zWEV4L@-6G;;Em}TiDNS)#5=H1yE5j}LecBi#FMzlZ%9 zJA;)on!hk%f6b}<*|pE~A0ho$5!Zdh3d431LroR7z}y6%(atf&yFe#r4$r0VzbU0T zJ^!Ha@h_zq&|`izxE(z?2hpW!eUqWeHm9BK(HBYd>4_f>JSswPz5|m#W<>&=HzbCZ z`JeIsnV|WToVJQvQasrgGAdk@sA(91ng#T~KHgz#PBM|#FZTy6veI!~mxcBsl%`>-+z6FfnXzS28nlzCT32CwVj8L|e9;Lq<#B_2pX5(W#Ou<}Fa? zr}o!-(VqkW1ZW*_)Inrq8xS7aOWTv<^ZYc`*Dis{^~m%@1M4?Un-!*-w9*r{pREEvA(*U6t&->+a{%UcXZ!AAS>iMxL4%2 z_}Sb0Kv3#wfO++Q1ON;oEGx@1;XzXW zE2tJ@AgFdy1=6GbFJfqcUjkppQA*xUyw`ki?0l>UuV>V~3&uiVd9ib&=5E(sGrnEH z3Q7)r6yRm}SGeU-A>MWD76s+rw?Z+awGB>d`Th8+9T!@~I~SYJo3l=loBI5>89c-H z;3UhrHxzwJN7ncSFN}nIce5$s2Y>j_+57zBBmpSDS$Mf}r(<{K?E_4oR*M4Gy_A63 z;s_wX~R2H0&`lb_)x7}l)na1^tWoxs~Ijp{@sf)AJ1Ci?E-F@wea(<&>#QvAo zw?$7?eu+_C;cj|Gt)*p9u1f)*aIpz1s~$aPmG<3k1+QsNN+r8msT3+&P_D9`aFw0j z;byr~`Ln~k4~72q?fJ8f(g@n8$b~-fAfU`^>7;YA!M$v4qC#h95zgEZM&6I5WO_!l zyxd@Vc6tId6S|1neDUr|-$UUFA?~@bPbvR9Q>?=$GHR z9sX-^Fvq(N?Jr>x3!F8TmM2a+b+2P z*yCa*`Pp;(c9^^*ZB<9E3fX(?Q8VAy@4O<#f4{Iy7U>v+7ui`}+=>o01=@IR`U8qV z_Q#ueC53U2YezT8t4PG2u>abGLft@XSf``u8)Q}TVo%uS;!Z?|7pv!?HmWY&!xAqM z@u_B@LRzpk+k5VN9pSeIwgU=`ENOpfhOPP*Ny4@DX@)bKuUyt=(=W+uY?e)iGr+gX zxa*nY;WTr7MQ`&<^S#8=bREs_H65JNO?}i}%jc}Rcd@F5FjR6Og8FdVit-34UvZ#8C$1D#tl1Y^^c^TQ zF2%ScK5z`{J2QL7apGBbyoaT`*gQ{lhd~GISWwycoyXjmtSYynQ9B|$M(~HToGt+ z+h742uJ)AQ2HK3QQEDuHl)qIGL24PD?6nu4SYei&v9zX=_hj+Lve?Z0)P>wqY>l&7 zJ?`PkVP<(+)1*c5^}j&rt1_Gz8hm`B2FtscY)VSb)w=Z6CwDnkR*fFQb+~@+Mx-0~ z)}-iOozj@_RCsWMm)+N*yyk{<>>)ZZ-JzKe?yBz^RT!7+2j2VI^dbZiwkM!bn`4nw zqfcp6XH~^<>Kn=jw4nhy1u=0`s+&!QBAe$4V`C)M44(3p$lWW@ftJ5#*_h44oo{SS zq&@${M=N+Xv!4v&xr~{Y8}>z>)3b#KSK!#b(nwAlFZJrx&#UuvXH>Hl0b{#{Cl0^% za5{}Eohn>>A(@^t zMXoe;1Bu}KsiG_p)UB$;BQ%Ktzr*T)50B-*=FVR6tc=kfozQJvZ^A}eR}aU!?-(|x z%!+~Ba0>kE^G}0c0VT`eW+wFtCr6cGkB2NrKufa4&{ip+Y3|YpKTt*&;qgrmdWhbV z`r4~~OusJTPWW0Z5L(vS^{}jo1?c)I@j#9}iirB5ewv@>%M4>Tm5tg(rn=ocuEeV- z8CA>**UZ9s=KE5%q>|Bwv|EV$s~uH6xb%i--(RLN`0HMYp#-KebZ-qgTHNE@{^Uc~ z-1sE#&F4d_^}FvSP7TfD??KO2=!|58i6CN7wcAVgerZKzA->l1n=@xs70*|u^D^hH zUDare+w&%uQEc4pS?6uDRm@Ihk>2Lz#~5_E;&?P>QUTE!xsbGHo6}vutZ;h#%{aQp z)`)?ow08n%)@61Gw7a|nw7X<@r`(n>&kP(^M$qz}Ak1zmjVnB%n4g@PulR`^ANL-9 zUg)_2HYa?MFx(g0Zf{l>Wv{9wAHOv=BMrVxK;&>$P_XQt+B)n8*~$8*(eO@YS>KL} z2(%t!r_m(_-)Npt5ctB$ZT7l~wkfZv((cGUPOpS%^2JvZ^jOhADcgRPs7OQi>$UX0 zj2{v9V+!eN5-;&Xf(_-MP>RCT`UKmy;wtq{ywZB9hK+Bb5M@<9$g(87>26sRtu@o& zQF*+RezwL!zCQnbADw#dhbU{$&A{cXQBajv#y*XcQ5Vq?P=scw1suJ-PIWC~Z^JV@ zW$b_qs*ibsy5B;<1JvK~;@K*n#O@>GV;B`a07Xdau|O*+o>AG|oR;%ed%;~Ju~ef) z-TLN9>F^{5Ql@5#4<|W-vZ30bDkJa}nP#BCIf7Octe@fU^Z@DpDHtXF9{vk>QtM)Z>> z`TXPWe0bUlfo|EbpzsCQlDROaOPo?cRoG9H;C0}5_WsGY2=XBz&k2qb?jql~ff>k` z`evR|;l;{l<|#<&G@7r*@^KuA2n#jhsZTGUimBpK%0kutBSp!(N0@=shJ^z}a`JMz zcbg**&`wwl-m7A-xNw?EVaG~ARy8VJRd-1B|M2zJL2ajB+~}6lV#S>ncZXudi@Uo+ zDTM-o;ts{#-KDs@1u5=Mp}1>s3j{)Ly1Vb4`_BCK&OF2LcfNDvBj=o7V+X+~bN?)W z`I(4Nv1rRNF|DD+4W8J+h!`Zn`326^=ezOG@)Bud*E;0fCdON9f#u!!*_7EjXXJF( zKxfp83_tsCe|{w;gwcOWT^2R0tMqL7>lM)F^K@Ek3-9G%Ac zKXUY62-s*e)OdLBo*LoyNOy4U2?XSRW(E<+$wrURuJ8;p^sxZh(i@e1dewHajaE;3 zHuNG^KkAE0^H3>S7*KUjm9bC%q>9}!WBYgNY8WE!?I_P~7$)dy%|`s~ixW0B24%f0sBQgW9}DP4vR5OMBrNOV#Dy^2Yn zyQ((J+k1f`Q72W9c+BEu7WMfDxq!^f#XXdkgi>uX(z`7tT)bajU%9!8)Nu=wPvu!% zTuDI$h{a}#x&euhXb80}=T6!ZSGKb4>N1MVR?(E&h&rO$HOTIji;@81zeg*_D2wEH?jo z8>o3d{+H8Q$ffR-BH9&pmpCvhjmyJj18t=H4ialxgkA zepT%@9tOX@6Sm}Q(fZb6yLQZ7(_na`eB9VbrQWHp#ebIuf$#F#vbC(bHfp^0n(O!l zZ!C+P84m^nQ1>Q`rrIZ+|0j~@SD?_#r+6EHhT;8ZxzcS@-xbyF{vCWJ86X=3U+4b~ zQ=l*x)OIj81vqMa-yEJ-+Ca~3V<@Ns4(%wVJ2u`tKoZ^ZC7!#6PV%4fk^+Yla(#K{ zW~}p?!jdAy~VuoK~>u?`JI4P1T*BKfkBx?&DrQXuGdo=ToQnz{TnO})Y} z2YjtLA#Pv-BfOq_$#)-G&Zy=k@dU`P{L`M(s{1i_UeA%SbZok0jPC zqhrG?mG=ykDLS&_1q>{clO}aCEkMvu&XGjwM7)u=C9Ew3N(HxiHO~@Cky`myKMc;2 zTtIxX#I%S(nfLt&1VQB{bE;@$g3b2KQ$jPp8b-s^%y*0U))zc9hWu#v#!@a>4wQo) zAp+dA`yFn3b5>4eYd}!c9A9Lo~%oeb%5>Mu2Cj|!b=9V97nWCRr)nu zIS14JP#T~1o7plDF3K@=zFQ5MqdjmT#{)j)hR<@md5FO-3~MCF{zS+d6d8Fi=}b5S z6@6ADPv`ei4iIXUB)*5w61J*}Wh40?Q~?A&_$U$a7^1vozp6k=WmeK(r^Sk-g0EAs zVXQ)oqEpP~)W~_>7;864457Xkny>3zb#r?wxD;OEoTDsJJ)D={_qi5A$k5n%&FitX zM4xTzBrI6^s@NcD`o4!vrF39SSXqS16gn6=rLgmw@4jefcX;NpEwx zZYPSZ9vei=KOy`JWOc;kuaQiBum{mMd4b|>?*(#xchogw1ipe*>6L8Q;Ipdh5_^>v zuiTb{Y<+dowb+1?giApC-0{qAS@@iGh0vA-7P6Dm{&0S0knkKB-)O&#ELN_Hxq@FQ zg-LH!1Md(|_Er41HPDtdJrNFdA%^zgZcnmM^-MX;`<%SE)QvPh=v#Xp%=Jq1XbD(z zMj(wh$iSRWJd1RfgWPiN@|MSKT}&~TLw}Ts8lBF4E!Dl|1vPPN3mV>V32Sl+liI3= zL5uT}sNsBt~CJ7tq=*=O?@aS>57vcFWO~OuI&Sh!oOd_4&ljfTB-kWm38w5Cw!qajXuvp ztwk1ZL9%mo3ixzbG6Fmvtt47^of2$kiT6>xrSZhqO_nv0&mufU|~w%;d25GqmQyS;wSmOi?&>@vKub zc56f>rL6*V9h#Y(EMt(Bxng6kJzT1nDKtjKsdA_2DH8Vf1$}?ooN+Zhdz2yD#`szk z3n>R!G<2S?M4xCGaEL?8CVX6&j?7Zk<+@SiD1o25IZ?P{1rd8%5os#2jd#+W8@5ove&2SELW38KKS-aHhJ(g{Y$V{4 zWEbl?d)Y4%Rm+j4ig%`_U8!G{+53rF&d7GZ*9q%rn?d-VScWo=JjPDPo4!FHvxL~1YKp9V0uX#M|M^6%ehTkdd8q&`OEt7iQ;=wTC zIgK+rpHL0L`1^Zvb)c9=$-AIz-46jShJxOF`%ay*HnX<*3Apsm>_6r1G4G`S&p1o;(;{Ex!e{FRdQBS9F4+Nb#9C zzVnS@-gD+UhJemL*}@%MwYUdYR6g~m-Q5Pal!!r%wLtOf+ANr)A}sbD!n$3MF9Ajq z;i6D?oi-TR2Avzdn$!u;1nsqN0)O{JD*Pk>fG{508qf_^sHwQUa60#WLM=_~v9?tr z$@U`Lom4?T*lJ(w`=!i5myawJ{c&Ew7QL<%JLdH|jm{=7yLR|3I{KkGgGOxp2Q#hRiCopH zAXNquCdL%%7dRB~=dbyZVxikz5-p!~lY3ii$BryTvX2sH!0^O3L9oRNRZ6hyI+R7f zX_45vD=VE=BgDDhNUuZkyXj>TP9l{%iqruUb3yDIy~^uLvr1Jvt+P#~Ll3V3#05^J zoX7j;-KLnKlWaHCjFI4gJ=}>&u?VKtLlw1k08ThnhacJI^T_F7v zg%j`yDf;}o(WM>TJFjN@VdwKKn#k5F`N!D+2~1lWQ~$qGxYfY?O{zSuPm)Gw>%jAbbzz{O3r^(k-rkKbzUMlt zkJhR(S_L9#%OLnh6p7x$ItK?c)5tKP9p2xfi>S3LAKC`NVBt*V>#z z5Sszn_snoIcoWInoy#lH4&R_M`T9DyMDfCgkk};ZSzkHl10x@wJ=JfssP9JOzlot8 z?Tc8;jqOUtC(y!}oj&7^UVh1J-BniON(SYoziyL#&p$*qWhbY#0cpSZ>arF?-Ca2W ztEsuxgtzSlke@v1RcAjC9+GGsY)ZOD4&o7IzyI%-AVJa8nHedS&(PY3aH!;_p9z*J zn|Rc#|By=ad*7$wH9F^^ev=p(Ww$;Oi*aLV1DOqpW6c;9Y4xUA< zYA<2KQ<^~r&N?fONZ_5*?k`N1I9?4{FZOmUY2sK-yE0$!BLe7jpH#Z`4t%cjTCVz< zn8v>cb#;aAH@FCDNRdOU@MQ=fJo;mbaYtG%=0xNrmpg$n`-p;2+?WCx z_xU-da#B^Dd(Qpjfsf>zzizO1oZtTVDM;DzwmuL_hBj3|jP}ON^l5My@i_17a7x5E zZHx4^(6~|tByf&q^z%rT-rJ;~*D)6}n=QK#n`3^9Ui|O{C~5U&`%1p*yi(A?zwKUJ z1WG@IFxD!c2SK?tN9F=2oXxO}&p&xul{GxWBh9yW&-3{VLR)kIz*oA?88UfZXN~Rb zmOQuxxYey{pRW>vO$ns79G`mp{f<4cP<>}Aig#XV@I3b%nj9Oo*nuWP|oEn)(wR!>HQ3FY2{#A@wHsy89l|`5kN;5=AhVdc^X-ZWCJHBgtxsO7> zT4>dRygOC#7@ts1=RILy^%d=dlCZ8fK(i{Y8i|vsdL%rtq^O6> z>GQ@GZu{?@W8>BmF}b}_!EBMxu*QmdZqy!zL4o6=4D~ii<+;xvBMVN~4H^8Z1oOsx zimTBj8|dB%d8+%~n}_15i_cWBPuM3=dn!(dtF_kK!AuE-{dCP6UrL75R_az-VGHtG zt*$3OjNODIQ09^@RIg9~k}TxSXB>Wl*yXP2qED#w@xTy4iQOc}BJ)a#3Qo_|l~N z{jWsY6;0;fYVV!#dpNd^}EaplAX#Ubf?xEfy?j$I^;b2(8 z$m`h2FjI!CRcA;;K&9lR4r1>(Q&Y`i**9v~YGN!<-aR)16mDohW0MM}N~Vf7e!98f zRK^z=miBOjzP)D`B|g?{AgqbI2gPnE_&+`SJ#H;@*-7LoWJ}-Hz!_WLzB0eX&g`4X z-S^gYpiq0CZBzP0?7yqvKeh1x{u}m}|NNcZBth#d++L}_g69fPJ)h_D1GAjn5YPE$ zvwepAg}kmsDye(rsRB0kp&{1SzA&duaJ+rLb(q9W$P+VLH=H=WxZD3ux%?Ah5;R{< zNiFg&pcK~@``D;ugQ+w3WGhUQk9kTno7`^{ySVem!jXY4=;n+^iF^5W3+d)HWR_N8 z_;QDSKEsJ_jqnY*DLU?!M3c5};E;aXq+${IKOG4}+Q~r=8+pXE)AS>`hdw@fQT3Y6 zCx@{3%W;aIy$6pk*A*)x5>0@<8m!K)-ESQ>QfoUN?rhiv$l591`?L-v*2{XxN__W^ zk(uhM`N_W?YpA&fp1k(Qa2wMQ_C6nsvqZW+X$vl(|0P)QrKQCsXr<=HLtF3McB{iJ zAgobik-jmG#2mICsq(a5^837Qn!Ka^R_lDT{>wx;FckZZt{G1Vzle`to}tkJQ?{j- zeP07)U%`h)gKmQ>3;`?K+TQn=R6nFaTFQBV!$l5lhhlvo;l%=1|c&T%=Eeadq1 zG*WmHag=ies9nf%i>iFZKM)VQ_>86c&Yi8!+#&8ItRWjZ*ul%I4%=GhFGU7~#-%0j zn`3$z27&u{=BNHrE2J$hT6v$xN`~9@kRn8JHMj3+;2Ad`(PN4e?;0nqk}y`;Cf11N z`wgMfK@m8P$%xn35|UDHP<2jp)bN$KUJ)8Gy+mHXW-l`w;o4w!xLY+z#;OaQ43KTK zKR0&#x)*s93lU9yE;0)FZP(nnTHhyNKDF+H%Z-_Dxbu2(tn>6to}#hA&$Q14eCV)& zN+5()`|^&pNjHvDA_NieT7jdt*Hm2X>9+~@BhpkelHWxgSIDb|V*YIfuSyA|yTsRv zMv10G^vYRr8H;?b1bDWQ1(DB&RDd%t*+pXECy6HN6_YnHQ9Tl&BNVroFW5%R24;g! z1zqKLQmR~5esdbg>7notFpFxSW!+jYzL&ba%uzOK^t!D8%_pdAsI>kS0SXVs4SH?e zV|lprDmQ6TgO6ylFN{7O9h6-)Z@1B3UDK9R$_41PV$><-F7SOp;8LR=sfvunAu;^U zn&UL^XnbTR%ld8`|7^hDzH57TDZW|$W2Y*sX^%Ciu+HRzUTdraJEf_NQ|u(B++-Gi zmbdhO)qh!vRYdg_Ain{TTUT&Fc%5q`Ev0hc0c}_-mUkw2tbF3p?byXh7iHizRH$tV zur9+-tu5jGJI*a>=0$EQZC2*R$5gUW-JTkV^UX!JUs|ojwY#I{i@PUX@%T`xl8x#(k{xy9}cs=`LPFP-c&3 zSdCk(be?o+!H&%cS$&{e6KQ{}yB3d@QDCq}jIVu7GJLf+eZDyAmAG)24-77lw$-cC z#dz4~--u!Lim6r9I}guwnccH+92us!SzgMyES{Q5oB+licMM1zR~UT}8B5Oz7RE8# z!`l&WZBkbAsDsjy6+KB++7W_7(1MC1U$5n{y0pLb@EMnXa9ohiewqU<%03&WXH&`H zNAPNDOK$j1uQVYe<_(sE6o09_s30$q!2eo^*jc+BaZ$1zQb&!56VY|`3zb;dE0JyP zezf;$)re5ej+R8&gpvnMs_v!Za#U`T%VJ_cFl8%FsDks#z$?SCpH!BmTLX(52~*u9 zZ)-mwmYVo*i5+;g_4icEJsk$WjT80)kKAPoS{&b`BY;Yfu`GR`XMnzJt*7L_?=PQv zZJ;iCCxy@VYi>`j+Q(5?B2gFYX{z%8;aNM^-9!7ra~r5LPJadbK-=`?bKrU+rU-F7 z#aeY_D>g>E8~ol_TRM4A=+acXavccP;2rFQ-dVjdPs}yY88=_&W8kqLUhT@|849?y zArUB;U5+TxArka0P;MT|nDy|yHJ>e>$|`b&pVClH9xL*8gb4$FovmfQ6RS@2;Qdrh zuME?>SNQ2wFvIGGS_x`jTTZ*XJ6mB_NQG8at%+Ot98R10zs-I?gH402IP$F)Wyq3- z$l5o!_uNjFL3-&|eTohS7%m1|Qnb1Y0Iwl{db1*9H?O<+{~`kaW(T(@;+EGZmbRO9 zaU-@p?*Z%VYKCm(s>WX!YSfYcAy(w?eMgX`C~30!%Y<# zSSvfJqcT6}k&8tac)8Wx&A@*Za^@nu`SJ^5bymO$$AnOUE58SK`2AeC>`8eT8_Zyypy z;jatZ#unrDRa!xqRFy0!c2uv5ScazYCU`am7w8xzso1Fn44J+N&^BM<(u^!Xipff< z@OrMy3|6h(fTnu5a(XSX9bM&2RdurB30I9r8$bM3S>E%AsU&{co(y}aF={tLCZse~ zWci&UKxrHt#=~f~pO8HZ4J>LOMRPM@VFeLfS9SsHJ63;tRZluiZ6Hf25RTGq+$y!c z#7`E@?wtv00J(nL9=zUX!^sLB#8Ti=l)f&(wyx=Z7)wJ!xa;{TrSq zZm(+BvX_L!Rxja<+hS$4(cDvmcaacm7Svv*w-KAVJrDpx|0wqKoxG~Q=v!*w_dB{6 zvMrXFCDB?J{|55fLVid?ER8~n(g- zt!J%BM1K~ujAy_lEz?pYwlTDQF6a0%O=vnlTTl-e8M@+*IF7wY#Wo4EpMAYYR@|cp z=0G7qj;pn}TyE;l&2YH8xF6e*A`iSPewLYZ_0jb(Y65=#a6W_vK8Jo8ax zuX+EJQo>^Xx6^|7nu`OOA_J-px7+$YYdZ!Fo>b;a^Ld;lq^ojO?V%Eb0zJRWac90w zL#E6z9bEjvgwZ$QKlre?kF&^=dc`p^qRk_Pfkxrj%iyee9 z6}}4tA*(}Pzbe#DQ2{4Ev-z|DIDU!%f|fv5#D+O+J~+HseE#&?>&(^%;|JO;Nz=50 z?o-g7O3;gQ9|ri1pYWKeOinpef(v5KX_SRf;o=^saWY-B_j#MGn6b^?#1Whu)optE z0WW6ml92SeG9(-?Z59*la4GV}NV+hj^0yJg++yZpI0WoQbX8{_A5)QC;n$dFq&+s? zpX~r5^X`0>pfk#zfYk~S$zrTbD(|PWzuKCO0i-JMFuU&Q7-c$lo9ib1v2p{cjV}8= zmHP*m&@h-Xf#?p>>fMr}_$sA-A+}-k)SFd>?wM$PtB& zDkTww0%CAw$TvLX{Fh+-*!T}vy?l=_DUij zd&V1>y&^uNYS_F|JtTo2(Yq%EXM=hm_d3ZoKFwKhCaK}Hb`?^fa)M{e=4#BKXp5H7 zm)ojdo(y&iH*Gn zg0D1b;B+GA)O^Ayt<&;^paWNmX@M4=uh*0H!%66E`+AzCmKUw}=_{Ow0*W)PFl$PZ zrap@zCq_arexdY$(}K(ClWe~^oVv#Nw(*>WvrXA?dyMAj)G#QJGatJ%6k9=Fb`X@o z-u=-01~v<(hMd1@fL`I)JYHHthTSxZL7zlb(kbBb_Kd?L5-$#g_iCqQ?4%PcZ6Tb} zo5;+JBcFjqw`*asWpmT+eVl3|{J_R=ker6|r61u$d=xQPd&RMn#w4q5>a0uF6+pM@y$y+p1l zQ)rqH%gN8C*&%A_(I+Xtw9h_JQ4jm?hU#qziC?PeaiY?GjWkkyX{qs9n<|}nnVsvd z@0)hC^8GJPD}_DY;-qCI6S$H#lEPZiv26d{RE;}LwQ*w%mS|vbZ@6M$bPTUurHp9t zw-@X(g1{6dPnZs5lyxFAO@mDCKR6;;3MoV?s2v-B@08d%=A09%)O5=HorJ#yoUh#G z+wP;x*OXJ;&$kn{*q{1x?Q5J~w9vX!e{a9emmH=02IQ*?yGFej)p{896c}r+{VhSv zoaVfs+jAwl&&Uoq>MS24S9nfXAocDQ4-=zAm8yN^(OjfnBmH-^y5TbajfCTw@nkv` z3N=i-y5q!Kymfsry}W(PC)byGHZ4WM*C7^i1Majz)gIb4n!Eo35PETNr{Cpc;_0Ez zbxZj^_%~h;?|PhieyInYjb;tg4-sPPc7<xT*5{|n*}5I;fTH@@TCd5;Lbd4@|8RxQ(GMSBLT4iudEb}Y-Y zu#$++{E~m?zA|=wtGc|%PTP4_ddSZLghyCYaIw_&z{o^Xpn=dhcB+~Hx8mxn+S6I+ zks!0&3P`~-hFNv{g81!jl|zN|-KI=+9Ec4}5Ye0PWx`JM$Wg~6!(<&~`0MLz7}uZQ zW1cxkg8>4_T~=?Fb*-`MkD}$wFP#89T{jhZtC@JgMc?8+TARBuB#i|DwlgINmzyyS zpc>rlY&{wTBB~Idq4k5Zx;28^M$Tp)C_Qd^9@V4%XsGHfW=>FQ0=sXu!%0aTa6xsC z_j7IaRS|>|WAPmM4%7A|>+H!?=Bpcw8X>Y6`Q?VYUIvd{=}x{cky$<~5x2_(=It)B z6cQ#WUEsWE5L_*o6PK8)_UU-^mub46Va4+~trD|dJWOprj2+#>?2nK`(S74DSde=# zeq9mb@o9!i<;+l7V6}3weVrbwO9_Q~!~N2Op1n?1{vciV@yt7nq33p}fi2Ti$+fq1 zOPSM2IR4@wi=0*_Cde<90=Y`F3VsRse7?nqr^&_#c;j)5GL%tuwCT?lYf~JL7m?9L zaYLHlzd-IS&`UGYn_Kc|BuF3l-yDi8mA`CvX2UC+o*=-N-|=kr5ENI%GF9h;YNOf1 zlzzVROwKf(!#^^}Ii~v@%_Aw8`~w3|HK1_rr0F=P^KrB#vE=y1;@T4FrZsp1tQ#u* zof(wE$1~?(5JzZxEr_bYP#!N=m`i-~{tz0Q6y{b{)Av_yEz_|@5#b`9wl{7CIa}S~ z%)NV=`lF}tXg|xhWsN$cO5o!C>El(Kv2Y`g60kaa3Sv<$be}ebQ{n@YR$vg=4UDzO zYu85R>Uz|dPrd1kY}_!P&^&jQf9>94p5w!w&#;VWAhdy1Xs2nsrPx|;jZZ94o9n3( zw?Y$qN)-JlXd8HI6(+8R$$%B+D{Ph^6XT{HzAaTGS@%i2r<9Mp_@9Cv6#EBLA(Mx1 zvMwP^7Dh-ajoH(X}7Bb6|bm;R=)_ zLUo?I-9n|q`vR&@ENUMqm!M~FNZpDNk5R{jmn|UC)_Zj16dXvNie3$*8z>!&%4Fy? z@z!d&{&RX`f_X|0h+gEdVlniTTP)wzAyUx+4+HA1pp~0UgBCYeZRK1J>CqH9!)d^v zSy1p6L4>dHmf)WB6aL!7_eGP0eI;)+k7AQ|Dmg-oJk>z8*fn@E0IdK!P9Z(pe}n^L z_o{BTtKpYmRM($qQ&a=4v^GvrB(A;ViH9u^;I=z`MstyI3IxBeE-EE-}5wF7MJE z;n{`?mE99N%lqM(E5~j(=Xxj^Q<1pZPIRU0miX0JWB8d}wo~Pj`6*e?UGtajA^C9C zd1q&N;#UtAXEmd(qgeiKAA*q10qpP|z&0Z2{~Hp7NgD)D)m353BhttbKkC@p;Vw9O zyV2fWhJk_*Y3EpX4{!ZWQ2=8pHnYT=P%R7>?=&~+MYL;t8a;#625 z6Cv@8&qS!iFX&l9)5g^Bn!`)5wc|@7$UmN z)NoUHoIX!5I6+K6jKhtrmdoO5w z)bfj!z!8c*n(Y}0o0!|%5`ZR>trL6-RWhIt?1HMKf>xAo)!@Oig%hzqk|Xy83|w$J z$w&PF#4w_2NP!^c{m3b2Ol4}hIQ#ar`?U<*KQ-Bu1zvDbj#qtjU@8p*B;QWNq{=0d z1fQOS^=tf4z1i%MNZ_)J`F)4T zLPmb}TqqKFcyUmM`>rC&>N*V4g`)O3uT~9USF!QLn|-=2XAS$wE3SsuI8aTfRY_qk zN={G@LZ@bV)1vBp+K#?_DmWM_)ipyck`P7w1nW}F5HRu-T0@fJP8@KuJpLeJ%bdH( za}Bho$<G)Mdn(swLel3}`IL!Z?KZO}6x-2K)c5GE2 zK&Bxul^2aP;_dVks|gtr%ytP^D+0XGdkj_j-iT3!+f!}QSB2vN6t7+;{($&PCF=v_B6pV_ zaq{m9)(~+l>i{Sj^E+|1Ikw8$W?QeCN~3PE)$>Wk^dzz$E`BA>S^mcw4A$`uk&={e zg73MeV-Pf57Wp?msX^8C+G@w){`COD$^}jK)*AXB{iyN~-o6f_%x{Y_-Hqw?d&Lt30*4UG*gG=NBkOg9H&&TYe@_Al=*! zps$?ARg8SQp}eT{bEDci5peb^U7CezNgTdET&GeC`Uet036U_!gc+lAGnqr@IVB*@ z@1e<_>KtwaCBaFkQUHg8q|{^i%O@1R_#mdur>{rKN4(BuWCm-I*CUTc<&0Y?T$-d0 zH=(yzllQ*_d>374cb66j`Co~j4wdCmX(VYaluYVd_;e{*e05QB5EP`koM*tR(rs#P zrU?(Ge)`4&zn}hW+$IBcH@Z7_^Z*B{ylXlAc8PlkPST1Wh$=!p5o+v5VC+&|)dFv&I z8l@A@T4J^Cisimsf0Q+_l`N{Zrav-YP*#6LYG%cg(py3O3RG;i4NYnW ztl?vf)5<0D9e~^Qbpr~pCeBhP)J4TugX5NIkzn1D!QJ3>E>ffreqIP z&}ZUgu3YT}pb?qHA1uC#gx}8t9+PbHTdXo1@D;S>6t@`|aR1t2gt?}9}71oq{N56sxaf6 z((5p^JKp+@M#ig5y_i|yGx09xg`bW~o!^IIzu-MLXOpfBaX&X++go>aqdZ2eTv@Pp z$lOu0Spe@8xz`m4z&7(G)S<^A0vOS%p%?%I?6rh&lG;N3DKK?@#HrY8I44jZ!sONRv=NzW#nDbEV(x2YYdJsYw1{v2Nck5T*CCG??_{5$9;9`$-XQ9;`Q#d@E-Q%bO~oGhA08 zh9!GW?HU}&h=qN)#6X)0X5DUl%Q=-}z#w4%EPiw`ZQjnX&ff8$PJWQid3)-{7c2bq z-B}B!Si4~!ticd*fF`a+Ncu;Y<0rACzaNfJLMoa%fT0>TW^NKhoT;B3oV#0eoxsgNgk^4W zzDM(oQAz9>65&6T$C^7Y>%aXHdAM6-oqZ^FoUJXNvd;d>K8;P#W6<6FF?uUbqtG*0 z$k8V`z%d-hXMZGK4r3@cNeLJ;>b+NPjGw9_kkw!eJ|7I6y^9V;02N{dbmdhhENGdJ zm9ylq8FZWEKu^e*+F)sRZx`Qgn+g7rbhd}kXJMII?IWNHytonrBN{jkX1qMcW;9~R zRL0c$8Qvz$dBUE4Sz_--(OX@HkM8)cnp-qYqY??0hrSkb=cn5iq>&-&uK7#LoI@tkm6qEIv^vWQFYic#<=LYP zOwy@WK=4UCko@o@ObW`RPyfvT6MRb-WS&#Z>J(JkB!3E;C=&_5cAZ$>0&?b7tPSF4 z)4*Zx_s4H57#ka;B|n#tmm&9SF9HVCa4GWaiV2*0dYCuK+Uk0414y6XfMh#ka~Tm$ z*L#49<^R{4_-_)K62v)uo6o?T-gm8@_ZQ#Q^g4y<+#~6!;OJHIm+NPK<{;1OE`6sz z_sZF9?AK)iuq%!fZ!a}thi;acqh37;_{Dp3KcTS}Nc#R`2ZUBpE5m&_SNeOn%VK#D zxPfT*lS`D&`e(xDF5R4y>w<=20kipU0M*_b3$!bEdMQvog(x-6AXirPmRn`(^B{t* zhE(3^oD*DGNnj1$_ebB>q`GbRt~t~8g~V!BHz0wWT4XBNgmdG+a{11B=r(l1+1C=| zR;qsu2G{ZtXb{z9E{oo;O7o3vhf}n(`(2^qWq0+iE36ZHR2I<<-|_>N-Cso+cwap* z3?(o`g(t9% zJsdB!i{ObUCN9*R&2dMey{miW)HHeV?*CR!vc5Z`Wc``R7S@yOMXPMVbtd zjfKA1D_TFZyrWg!40M`J?!A+pue9zyrklC-R=5tPBU0BXos$P^B&{={0jd7{grzruG#NgCg#;vs3T>x>o0n zH9+GlWw-T3+^$4R2xRs8iTBzIU@^yL4iuAVKTTL=vmBZT@He;*ecuG)n=9xs6>SGl zmYg;Z-8fuqQhKy)2*y~bCB~5cg2PD`V3La(OOAi`spoo9pF_R=Nnb!7Ar~^KeRolC zqqRo^%LB-sHAO1B!df$Ri~Nn;H=}s)U0nXvbL|w?FSOX^0|Z?RpMy2bcNLlK(@U69 zm&J5^<>)^V+a;sAbQ889qMAKF{{r+sMiY6bLq>2yxu?CLxIe+DZ zxzV)P@P02eeYw688(cuHn=?R_UWaG{j+XkW>o5?Iv~+5Jz@_}3O6dqC){&c2JeK3~ zb(G|zG=nvG2fxMW)1&?RIot=`a#?|6d)J;t(y=ez#+oN5HV@KTiH04IUbDA7z{))Chy|pcvc8St}5i6iO_k7&oBtVzRzaX}C z#JEan2=;7UMzQd{gBsO&>-p18Yr(3}mu4A8seh-)^#PRTbC4usNXbw4TL|nARvZpH zL`a@e+H;{BNCiE}kJbV?RcJ{AEVbCk7+0TV>U%t=q*>xG`z|Xn)BG zO)B0){%aYT4uY+&D>~jq*Dlm;eg3@hTm{WAV& z)PvTRb;>DRE|QG@+y6koM7-frxRuzI(>|h`(b%- z$OPtQpcS?kwY;3D$bMkH8xEA04ZHaCsIa>rAeH^8BI(!k%9K9(>0ERDs)I`}?6Cye zWn_Hs*ycK5$MlCo$Y9X9QE4fsQF#<%<6KXbVNHc|a~9=-GRQ=f#wW#+ zp%#f&={O7AeuniDBH3NW&-!jZzs|*&W~JduMxSwovgI4{qVf(TO~`zRyEoddv3in?O}g9<_7$-7fux=vLcdHkC;<%duE z(tz-JU2PYpQdu}9*<|sXcQILUbAO$UaMIlxP9#5=>6~}He6-l;f_jG9pBc8%*slwP z>+hR%J0#YhbZc3cWk(WoYmy4l9ZBU4L-1V zq6Mp!;8HnT9ldoG@u!8Nab^j)=wB{VeXG;ZZ*!VTqm)P}L5WO-PvI>H&O1P_%KVlZ zEEF6C^EE&CKDE{lwrNaTYP%>+6G9YiSGUqighifsgWO$)s*N0vcNv94#9yJwYTvF* zGZW=ARECQ)M16m>30$s=J;*amR}Ua<4G-=-*6Zoa<+8+JMOCtItCFjXvo}nNT(}&ch7dEs z$!T-0{(w=W$?W-zhFWCia?eBPT&? z^M4ckPSjUC#QVN3iil@Wr8L~K{<&$<>XK*uYg-`TVmI|G?n{!xhFl+WMxsv+L{~qr zPw+VwkOUbd2;^Bv!vC>0<*907Hw7202_o@EW)pd@`1o*FM%XR2D-A|ncg|OMSZI~$ z08isRc zPSdlXg1-KC|1@lErmX}Kuar0HADdo)_p!K&xwC{^q+J=rjF#oF-QGU(K~W1I$v)Cp{jhK9L9W2h6D4Wt==tWFMDD7XKdAR7x$G=0Y|m_)mX zGn!ys_p~0s4pgqaw{xlDJr!WOq*pHE{E|>0e?fveX9}RBXNNnV61m71DE)P5OoIx( z;bK-ay!qdge198w*8i|=lLU^v36w$BTW^|O24s=d`uG<<0*LE~grqwmqPh2&gRiw~ z^eUp5K5JB$MAFr!5S6mprVSN80t8)UtF!oTU*EqO;n2k@^-1*I?nlvUunXJ_i$1%z z6zAB%9edVe!^+fdJHZikAfF|8uG2-Wa2-tvkNQIUcX8tENbq{IpCXc=Es^-%nCR_N zom0tsM0ZtUl97tD#DEtA`L4ib)kYYz&tA&Dk~8n}qy3ryqjq5!ufV586ueMMR3fQW z_{5;ALvGT+NMrZ`HiEKyD6@WH?N0mpuFQ6r2p{v>yQuD;V?-THJGm=)3h=v=tY9}s zxNWDD%5rrwRATk30lrfBA$JlQWTkhbX&B#Ps~Km(CIL5w0VHkEVwc({6LYwR|3_43 zBgM5rgXQ-mjJ>!;LUS>5crE|!=^Ce~ca*Wx>C0r+5;61hwC!56glRa^t(m|Q>BYD6 z-)#yo%V=0$zR-|gL9-SGd;Z}w6v?@hdQ{lk?v`9=Fqv9rb{us_p?B5-_Q6gTWa8Fz zP5xnZ`ar|4^fXSB&efp0@pA{ZVqE&w*`|1=9BBmYE|WPze0{s zTTv+!T9@$)zoa1_LA_1iE;vt#z;#adlS-@Fkbk0VQxw54HSpMT>v=eVHgeyX!|yrn z484T%kFl~>`Oged5UK3<*U{f`38cuso~?MGfOn<2BdpJ^|5AFT7;|82kiGo1AAllmt?S{3>awX4pLL0t;di;C|4 zp+1u8V_)T4IUZP{Nj-KxiMBOK&F%6Ic*@bl>7Sj`V5~6a><1S#<4-5GX7fn`K!x$H zqTPqFwC@iVAKF2??J2qNF+RQf$4^||@Y{>w81P>&`u%{xxEvRDYopAD9~4?6cO_V0 zmneOU%h0d(Jfzosc*9$z9|5#SW+y*&&YfFu-Rr$P;O|CdDe(**9DM^GAk>=IgSU%r zfvom+bQ?^Gt5|jIFZ<(l7R&Gx0=(mwqw7p(a`knO?2r!NdylYBbj4)ZaEK@n}!LODCd^B=2h}3eUL%+$>g!ilPadW1fe9(V|-`b=kB?T7-LUpacL5AiX{pj8H@gkTm-$^38wLbAY_j5n>o*SJ3uc2fMO}T~c zHfy=VH%HR%ox>>5h*d>%!=FG}a}cd3g)}BsSq+Wn%Y6yG#{F({)lT*UFD`Zc^X3EI zv|W3kXE&$yf+0Qm!}lWLOq+2yl2neSF1ft!A8G*7Kdee7;cLKy4gQJDAq}1a=^3bb zy6NCgikon&DcbAr9Iv>8t3EEv-sjZQ!>6p3Q5dhn2z5Z|C0I~K*>#(rbqIC$2w2U+VtY@)H}f9mbf3{Opv#dz+Q9isDwKf297D zD_3DO;{7!T&&*s`f?z;qoC5cgul=SP_<~Lw6&`zIY8?+~zxm*Z!~u--LxOvCjDWCa zj?TGEFK1?kCgVI8d;b1SJwuSfZqu>L8JdvdO74V1b`7pn9JA_6P9~S#`>(>=dm7Hr zNu@u_+E`K$fmwELW=#}&t{3-=GZ)?iy(&#HCo`5fPCI*AktQaDMhQ{{K1L%Or!Z85&CtmYXo2uFEu zGtNvnQD%hM*%Gr1B#%+p|LpWw>MSt==1+}MB*U~&i!tm#j1Ewf5)TNXbaUhzB67QH zBmXj1FXaC2j8@2QKsIMUrrwuNrqsW%E1Af0t#=vl1-*%c;X5`DBv>;{pRt6z1X$E5 zGD0dq7Ee3`Q(?lNTj;3Eveo8AQ5U_aBYnez3#ZnrE%Tg$gnb{00Z3hsv#SBxb9{)9 zo*-8Y4mmlyxG-5psMx$KxNk#_2O!ChH8o#%Eud*n-CXTFIMZ7hsMBHP39qZP5U@fC z`7SoZ9GiET=vIk`e|0sG9Y!$X46}*%?e;Zipj62)O|SChNZ?(hM>vx?Y0gf|NX4@} z%zK=IHMDloDm1be8rwo7rs;CJ04*kkmV^s>G!xEc$}j+tY>RZ}JteLOOAta$&HAJj zezXV?CW>3Ox%~yyiH-cnk!e_;;%OP~qQlud zaY-Z!S?I=odm`?M9K)cavR!kOV>pMAcY5T%V>q$`tNXZ}0?N*VDKL|R7kX=(*&>W? zSWciw=&?Knx*5|As$l&uhjL^rE?8ver9#E3xpAX~I%8d2ksp(Id-$Z@h1kxFIb}~0 z#3vNK2;cEM&3C@S3QcY20WnPgi6E&nYu~y?4EySi1lGS?Y{zX)lub;e+G#ROHuaH4 z3F|hYEc2>o&I6b}&fZ9xo?$T-h}vS9Jk&=b+V`6!mL5Kf!+94FP8xyZHx5G%#X z3scVvR;7y9dd(im-}Q}Z-UmV7`YZTnHnXYG91vY+^t2KPzNk~@G=Z;P0t)pt>CX#! zBfV1*7{z3HKnFZ%JS>RYAS$GUdM z;SaP%`1VS)(1>JhpZVvG3XjgQZ$FliMm?nlfxFco)W(;ADcW1||!1sUwc0WNxmo7FPlq+Z=fLeduMnuv& z;TJFXda(fsk%xPmu%sB!*8f*#-yg11+`S#(ySr*UIro22tQ>d4{bad-xw_6#P?;&H z%I=C$BdBEMPsIkJ_%`I2O6gvt3g2)JJp3>z_RU+hFvg6_IAI}}tS5$zvAW81BgSvu ze%1z^6q+U%$gF=7%%aKQCZ7a}V%ODC#hlA8ZBj3L!BKk^N0@3f9Sooq=7MnNx`7nf z05zcBv7%?BFfM9w+o)RXO@MM4>u*cK0pS@12vH2kH};*xy2@CI2_^wn{0xQ%WX~O6 zdwt^9DYEgd&F(Gf-(JrE1-7Z1YPJiu)Wl?0xX#-#trq{Q>WI4>Z^ zu^*idKOlQ>y4K#+`8EyRd9q-+@0YPL9~jZ50}?WqIDN)c)Z``dl%auI;PN{6PPG19 znVX@~LpRwOD2?a&AzJr$v>NM|5hMi)qoYCKVZbd)i<9%Uj-{}d^LDq9Bb8paEnX@Z z6#xE>|MED(5y^uu-qE=5VG_#MpB;VQvpN-Z*M3_VO#qmLC#(XR0009+jr)7j*Hv1h5*>&GN zU6@O)tZhnRsvsckCXpA5T!_k>>C0NCFkupn>*+NXE>V0NzllE}Lfn3qJBP1J>Hmmk z{tfg0aQ*dTpV|Y}p2uS^8a0+_wd))iEk0CAQpDoEOEui~y+Lt#+X!XKGL7*tR`L&z zRp#)q6{26YNW>4(Sc+yk^{=@NMr9s9(u6^x=s1s{k9?wUWqE+fU9S@+Jv}m7mRqY2 zgPi~638Yr(uGw&&SEr!&Y1gX#(wbsd5`DF!>9~Msqvr*7ClK48Jrd1~pYq%)uu!A% zWwo9B6o^)L_Bq@wlCiJ<3wY09UV zJb;2N0JBAJ7Uz?ggSEGJyyJSXh5O)pni|}ZW!ciS`9kQ?KcV>t0nqQqk50%Rgv0N6 zBkm54AHUTC_`^LE97xUV6BMr&!==Z1q@=>OxN~A2v9EN{`G^OFcP$u^&{}92*Y1bJ zn2DbDep?Z2QKXlnNFI<}Xq3o73CLtCvMyyP`ytf?gecb0EZ_uMPnOa8h>Th@F%n85 z+$4k3p4lmJ8g)M^=>~!+AM>A+An1euFYSIr8BzkJ-vF3@y0x|PnHV&VPjXLR0=de- z1cO9q*bKX9>xcO)77mA4@B0X?jI|K(4VqRVbxWHokf%sr$F=J5KtlQJx2jX(kX!A4EfmrnWaU`!JMpa^@64V}y|oF!7N zSdNuZx9Y=EcY=5rDTplyi#!gKgs-RI2HuIN=8k7k_W&8t$)(a+z+vNv(T1`DmBvd> zM88*a8BLvtI$OY)BwiFVzM$)V7GcfyOtmf_xKxZkU#Bu;sV_w{j8r&>C3Ab6@D)_G zQEPv-C%5Nzu}XcqHAP;2Ahw8*L};i=1=t(W=9WEm1ETCEYAxa~tBq5t&J%?i<(KMZ zI8yE4W%NZSPTicQLsS8WmBRMiI#_uYO~wc}AE)u8BtGZKmxe%^+|nEY)NvAXT$?qX zfzmn<<8ei-+O%+Vj!eAeL|MLjK||S6;`qZ1{p303z3rkIcgLBmy2kO?Q&A)u96|tr z1m2}4`D^q4cXGk!1=^G6`0Ucxvspbu1*VxbY83a-9x(?$0xBxRDY(TBevEaMjUV_x zM3B=a;A1OHzZ!}fkSW?J{*<`aKJVfCIEL+V-jJMWLP=^y!b+I$y@Ws@5=TRW+bX67 zb_Pd)3=hZge8FR`*t71{gnkQ#2XR)M&X?cbIRTg_6ZXOSdky0Rp~TR$!W1vTYtXCC zjWJ4;LRxA3arISYhD2PtN0-ga5T-k;EP~-8Xv}Ob^ z+9UK}J9SRUg6dqhixlwO)m=1H8dU8q>#FED9@xB^kaiI99=3(~LpVFLBG zl;$d2Lv%z$Jv6e=20yv zK)Cz@T7$wncf8pY^=Duj&&=ZkD2`q(M+pJZ>H-sL-54uMr0}QBryCa9O|H>_N~IqB z^pH6y5WU8^vx#SLzaND8CfRV*ia|rP=3mH2)@M$W`u{ zh{`6`yo1@Yl>Itw?2LMumO6e)0ZZs)Mp<3ItO|Ke8n7)#OP`p>cg3?8j~03bXn82o zf)eZiyv6{SA>7?96QqA$c?eM6|NbYENWXis&syek^RVxZ^&0xp043m2h;v*Y&UWQR z!O=tk5{^GVpC(hSix8ijdHynu&xJRegWrUP{R!6s7amrK<)X*K_izVX#F-)kG3CM# zZm9mLtuQ&cw@g@jM-SR^m7sf7;Us3G9hj^eKb${x2Q?V@E|XUyr#fF z3Bm8CCFmx6ATEuTG|v?sfu^h6iE#9>L5MTiYR3lgYf>$GQ0DdwthmDW^ zw=!yfOVx-VG137KAM%iH_T9tKSvw1KpcRMO0)d+Eua*`P4zS{WdPE1P{eLg5zj6E) zH(g;APx=&(&uUgI()6^nOyYJHUOS*L;LAG1C*#rm)lB^9bszkPz;gh)F5%bb%9I8s zcWvL;=5M~{ueafB0>A(9h`Dp`mlw)n1mt>7eotT5UuG}<>C1|QpaH|J?{E1V>dAa{ z`#hz_^8f64Y$<{9Jrt`6N&Y2fMI z-u(l{`)x%2+eL~M!1DhC5LADA_t&&GiawlYj;EhkbgC2qF%rjI%n)n5(ii;C=I19g znlzDKGzrz>8OkZ=ClR<32T}=2XVJnAaGGBhn9n2X66;p$i3+D;pccP0Qw%G&m2}h0K}-4GeRh9 zrqAG|tAk0jG&51?RhQkpKV3}!<)R`rPPv#O4riRi=a-?RztWK{u2c%YVB100jg*;x zI_2M(d_EC|Af0~^-z)Q6y))rWp|h|U-jkr#i2H=^*X^W+@`fD5##X-6Pe31lz7mzp zzfh?4@}CVFuoNh`kvQ1#F|86=B>o2Q`8~M*-LY9XuxHJ75*^zA%Rv42kIejUzhX(u zA@RT8_g_B!e^2r68T@}^@&Cr+cN_FyyXOCob%Dc-0tixyy$-pzSk*5|FTK{2sr-{S>&F{`om;VS9WRv2I8YfeOM%fNu@~0xskBSKEG>F3@@z)N`D20j`biuMPIs zD2gy=FCUx58k@BXKNe$C6{(Crn?7~kQbLf*KWh?u$X2a<Th2(NGkYm5 zEn^3!dNG!2%~;UJkdD`w4g}hm7uy3p?{l*zt3N5&Bb9wNcUffbu2M@)w!FXGM+xNW z+0|@KxWA4Ctt2PC{?>y~z9QRO;|nL&<+bp*)4dE{F4J5-F0c<0oRs#eZ7pbg>(|P^ z(ig3LM6#N^GeeZFWepT_23t2XxjfTzcU7r<0;%;Zn9dm0+I~kom*IcVnZjJZ)N5zm zbbq%mI_5(B>oe=jUxV5~t1W zD3`kaH__9S`^#ZaFYLPdv73{H8wlR6H~TfVGwLNdsS^JYDbgIROp6PqN4zbn$M}0g zeh-tcE>tcpE_5C)oRmxU8zB0osaoWwiyxqLG&Pg^Cj1`bGwVa_O`8j#Vl+m!+@{dQ z`YNS0?RPs{8L>Ti-OJ7ei`A%Jel^HmpXd4BqbV}ydRhFajzK$x1PSkGy8hRys8<^ zv-tECi<3SAj`H*W%>M3u&nhd3-ohpub5iQy1v3^)`8L4GOR|;94H1jUd_$PPAhGM$ zpHIwT8do=OzMg47u|{_S${+}xkrj=~oiOPV2&t(o=&QxpY2$q5OEL?KF&}t^ffewl ziOxbt^`NB6W6xQ50WvHyH}UqH=7^3pc)SdZ6r00K35}b3xNe%;79z!l)Edm6aQzB; zv_w!!YD`0!_mBppD|{H!ire@e009zhS43u_i~*VHEayfVuYHvsNVGCBWGjri+|as5 zvc0%tnl8apoz88JG^h}e%l7jr5EsK5N2{tpEb^07217vRhCE?F=Bl&;aB|&|1=QlY z{T4f2fG`kwOI-F-jF{pB2?-mrYz6L&H(V26m4V3ZRrTU2z=*92$i)xY&;+9wQCnQT z6H|=HQQ&?T>3>iGk4M^gYx66;ao`x!;nA>O4LL(PI15Wk>Zd+5LA8I3#|G+mKIwp5F+4JOH-#ag>o= z+j_%@|FI3)&he}1+j3W=rN$({okGpLLOV?Nr;$bc|7PO+AA3RnQ_CJ6{qjGB9cA)LuZ$3>RCLf3zRC3;$EJoGIdt=>|%xJJB>r4F)E#*fPfCY)6MT7NQ zFs$IfqAzh6za!`eXoI#>nP(pVqpmczgA!NEjIssaMPF#EUsew(NNGqeA58Dz=< zI264Ini-4|qcmD~*=YafN&oX34AOP`rn(N|LgcQ7zOLe^URKDW|Jxvo+1U*=xxARXW~mB7tf|$ zV!09^@&+hWP-cH*u3aV(O(LH6<+r_Qt9Kh!@wKTb`S0+V|KedpHf}i*|Khf+{1Kz! z(Z_P^tcl$CArhodJ^&O|mOT=>>h{qSy*?>d!I6a5NErYV#jT>m^6HI=sSo!}Nv0tbZ zKwtq2D?@snFj(w~R8QtZ-#%l&4yAettd;i}vIm#|Q@>(!2kBSh2wXFEWeszyvahe7*0S+BzhqWz17?Ayw`t}vUOcgy;;2AjvEKr738wU<$$l?)t^ zcB}9at$K{doB)9#shpOZRU{Z_`;8JK<#>_hXGewu&_E?pXNK%Z8r?Z6ia$lbQv-|a zn*$Dg0uUGv$2{=Gd2Iny%AeC_aR7=wt8-?@2O!(r7i$MGXCF0c8ZrHrYqKBy0V8o+FVtO z?JoL~%l-!iZj-Pl!#m4Da&9ay<$&5Ef@$ue0H<-=97M9?*h=4+*dn&(X#8$-PkUd| z(GeGNhf{5hy@c6NO(Z^(S_@FBMp#+hzBpv*urHyn-acuPE-T_C9UnaFlVf2J_RU%iy-fMI-h5F<)lUOG{ z(3(0>LRy`t)Duoxu7>v+Pza|gt&=xfA^CLi z*6CuQtsHptTyP$WV>-w+h(H#)bMLR)4F9eZEYSbye%()^L+R0hbMIy&@*rqer{#y5 z)>C?lHm|uKjlED-QZkx15SOKujkSPhMRJ4cOKYuMWh@J~X3JIKmzPkq!I|;qV(w>0 z_^35c?@AnHHR(2qd7W9MI9j>@J@qs@_y-hHzSr9{V~~UTwd%WLnWUx;`gz85nIQ}| zMdQR!&Kw<(6|wCTj#Is%2c?rp6L5@(aNW3KHQM4v!Pc!WUfUPt^&+Bmka4>#Medt(I)#fbm|Bz&%ygpqoj=!ghIEJ4n)w>7C^O;1k3QtAz_(!9HFgJ$WD z)3eAV`{J+sd(tIB@hiVx8D$%P+^{b=%0PzU$o{Tt@*juucf+2Ze)oO|Va40`hyfDZ zN8Py5iD`#DRi!cm`iH&zUX3U~&Sj%Hzgs=#{0Dt$*6q0}bjmW$N z%>1RwdQ2>YK(?9pSg-ly%X9S-)6#^>G|l5Wk*dm$&hQTTCN&Cj&;8oRZqw27uM;@4 zuV!T_Ru7M==Op_!#yI^m5Tx|ES)IxQa`+&Y^RFZFQhN*jBbI4fWa2ywlLm+O>eY-8 zsaJ&2r~dd359DX373xxzsq06&?6lKG2Slm|_I^TF46^mU6H6Yizc)<2R4oi&?HCL& z?hVXMVY1SwX5wCL4W{_B&bfcQ<{u;?W7)tzm}h@&k|DO<8>VO{>y30WX{y!i6t}FGtoh!i6Z@pf=t~d<lt^2{ZZ!aeF!Nw!2 z_A>(XpPKCU_R3s)cyCiM&@doC?drnN_wPF^*iVp1EjFu2%bYHpnH@EIx9T;<3h3Us zQ_!`moF8t_HF{d-@?BOcwl_u)qBO17S!5mYvtE)>MOYzHOu;~T8fWzz=T8y@h32_H zLRysa#OSt(aKXS-xp63jVC;C%(}mb2h0R8g{?e7rY_3p)Vs#0t1dHU50=!-(cFcm^ zmcEvw9hB8Gn7#6Pr|Htr)#8hHnJ}9qF`SWpM`(E1;a-ACbd>UPcpvKWs<%GPwryFm zc5_2An6F!f`iOq*@!D}h_}ZzKm;(2r)6G(7G0?gg_LzusRawM)M|U#+^MDh}FO4q$ za-IM3fln{cJe(`(wDKDX(ox_GglN0GM^|0I*4%L+3Kva*pI7OdjNXKk;Ky_B7Op0_ z>N4L&6&n#}jV_0=!OA-2zR~rZM@_rF2U$tr{8806%B|VxMC`E%4lBl!azx1^4f)fj z&CoWiH`bRY!jCP$&ZBUcg-LBqYk=|Ob><=_F>klZ#HdmAtYc$^>Et&ZD>6J>+~wII z)Fd;~X4Qe4g!K!u$NJWbMS4=0;7O~gV^U7b-e+7Fy`33lrd=nTJ0t8{WBs264jYb{ z(g+wUqapPkMw5=^*e28#Vy)pWGjPqgVlCD*_S2UdydX`txwk3x(y6(surqZXuPfH_ zD@3DpOgTx~@`;*{rTa5VQDg7ZQlOD=!oZcbQ=5_fPyo@h&BMCJ{S`+5Ou@=~K|_@e z^y~I^Z@#1g(hZ&*{sJ0i?r#1KXA{!C+z`~+fbFAz5h8STeb04s^QL#GpB%0+t6edX zaO3#GA|IR|6V4^6nFW4*A*;peZh*&iRJ+rCzF%K?eGm&Oe9$amIQH#0;T)yTGv`kD z;$0Mp5q6>27bC2fDVb$?%}R%VM}Ud=r<;bhgZwaM?{_ zOoSh#sly8;shOX-Hs;qQL`5+nlarVqJJmT|e0SejTRa>I?t}1DM#>AX zvK$c9U0#J_a_a4?jO4luY-Sl9l=oE#iz>nt%;&tckW-go-o!LxA$iUuAdiw4uOueQ zR}`5In~sk$Ow?=3jATVd$)r`+-nx;v>UL~dehNiv)IKlA(~WE9y*8+F+uwU78>{La zc;9g9JJ6ealnXDpq-a~7xra{e$Iy)Xu|WOJ99UJVo)^~FAVjpaS!J@L)1k~fO<2iP zY`!^oe5nO~!9!BpgkmoT1kJ|(Fz85F9Ny$U5AM*SCijjOE}Elf_beMK#v5;H(g;;% zKGjGzQ*V~u3~u)1vf486A^c)3Xd78ObIHil)4la&wX+>zXWzC#eFJIbH+f&b&R`BOX!hQuBVGAT+$K}XDikB>mJXinx&<&jf9_CIe$ z;VK6Sx+thznC%uL&Q=AgAB=CL5qDOI#|(TVjimHHUzCR~kD2X!(gw8tE9)JnXeal* zig($wz8>ut#CDPHJrz2?Fcg~j{sw=3aE8z zznV2hM^kXnB7bp=`OEB?qS#)6O)$cO7c?K%2KMeIuOKKLVF(#u%p zlyS~c=NAL_KAbUMSOjmcAGwN5>!3(n&h;oB`avoE!5 z=(nwOy&7K|dvnjRkX_DuD%C?|xnQxPLzhFzp zcE=j7mysJyemIdCzu4KJ&xH$jO;~X3WPd;XYf6S@E`dN1tw z`W{ddN@ev4kE24M0s2b??g)qB)#)Z=)Fly_4|w+QMfhq@G0>NjStaN-_IosV z)ML0&BUZ!s7>EH4>)ehsQ3+~iP{~g|zT>wTYq+w7ZPa{p5EAF^vky7iv4COM4*p+b z9(y!I1Vbn1F_49R%DP2_um)<-k60}GPt zhDq@~FMnLz0#{>_llUX=Yt}{jCPTuRp;baN4`XqzMvD`&$DHv3M{n%kq{}KZ8^a?D{FMo zpR)fgui~ANj&G(-<3%dV*^dsHMcxvmvXA}d3>uMR+TgJnjtHxn#kC5^JI{j@b>mVU zzjET#ZG`>`&+|e`eXDS+hF5aWGpZ8c>|gGO+_RSp7uw5moqdMt=qOg~8JZ*e!mp*n z-64qVV2bJ!frLv3jnu^}!X$C)xtfsYF7DK;yV&1oC6iE_c@AL2Dlv>F$%w*{U{&Fp zS9HBsJuD=iJ&%X8jaJfJg1hqV`#sS;XWfJb5nN9&xbD}W9J<(TM5>JA(p?cSXk?kj zHIH18`g#40U3veMT0~)#Jp1Vm-Ug*2-_A8M$4b=?UGEF+K=Tmd(|VYy{3_u>-A53E zz+QqP?!$*a$hu`LDwSaS`G_hVKB$SYJ>tjY~9FNF2;Zlg_o))-^rv>f#7FW^|zjqtvnqM2QmL$wfN zE}Z4xeOS)GE;wmii0Hb*1d-dY%y<%S}?t z*<9Vu%YkOj&<-qemLW(budXbR!@=)HIz51nAo-AP3K%aJ{85cQwN+ zH7_=I`pryZXOfC{e)N)uZ5hv^3Lr#Gg0ZbJ-a7!rVh6X;prg^ zv!W*GiM53b?;Y=Onyf>(Zq7OnfEwaa{Q@Wcp6Kp25n||TRB^i+HhU-LYIX=*%eDJF@60Wc6+o_#Q40Wd$Mx352mLp^C z7jI9F^YinEZ?1dqbe{+()9bRzKrv3Izduys|ATHRAwE4%Fz|w- z>%qqj)}6}kTwYjv0a*RY%ykB?EqK(nXOLw&lquwLaw2@wtvn#hxoN#-7h7TG88*WH zNL10}>G%ts0m-1jpN`Pko0-l%;PB!T*$yWoMa+;U!vMA`v&nH)3p?|>x}jXGn=WR8 zd(}2M9|h4T1sl|k+v(im&Qlv#_oK51Xq{4GJyS0v3^YGKJQ?;b= zF5R@K>#K>MEoN|CKsDk!qd}VI7k`PKSXO5FaF1zqD^%*no)j$j3kYD2$kxr0X(d&c z<*L6ul(x4on?7ox;94zOI_ZT# z8)w4&xvt74Dehm7ckf9cep<^vlE=ktGalR0Ohsj8D7Y9(hd~TK3cejwfskIkNPGq9 znAb^-x6*ZY4`k6T?Z#NdT&U~Nxmlg#^jeTM9%ALwVuopOJ3v-d6;xaz;vLGcWtxcs zKYF$I0(1g$QAP4y>q?}!*^<0_!bfrYcPH#M?^a4VX0bf-Y;t&irK3hG?LB9)qAKK_ zfgiq0>RWZ;${aG;81>+2KY@}b9=a?w?*X-V~W%GOh&qNs{Bi>Yy=qhyP>wb^4g#tMwf z??R`MQ1$hVJ|BrDD{rQ;WJ{YAQS5AQ?i>OIvXjlP>iSs6bxA5puLSR%Q~r@s_|N%Q zPy_HUVI1>1fB07%+)8;#sFGLxk~11@)T!~9q19T{MQDWuh^n<8m!y5W)1|* zCN3@AT^^I2Y|Su-W0D)hX%8*qu6roDb9tWH`qqLQ`qyCdJg?KoSSkg1^xwaTWj4v7 zZ$8f{JUdg(SFH{+eY6yrVOCu_-kqmGIX1J;%y53_PqbY8@#gii6oJuFM8!tl_SME= zB=xJMushgEZC@}#Hr^5EjlF?YNiMd(F4b>Bw$AZemA0-<;o8AF)BhsI)g2u!%oNLX zUPPR)r-T`6?mnLi%DR?3>aFnV8c5FzOPg{SwyLNtR`gTe=<#%!jjQr4o_OFdrQp~S zQ(5-rh|Qr;e#R{)hJ6vFb-J;7(_JP!jFe%6Wl3j}rZsEHWxhhbzn$4u>G?x|~jYON@oiByn-OmTOS73HAxfv!ex7v>x6FOj1&hKZv zW@j$f7q`jfMttr`#KTS{d2J@l<<7nd(7zv-Qq58$pZs*Om%DQEzQ5XhLd$$CuPFNQ zB#<1DJg!-{P$n%PX=oUX;Td++D~K&bm*$ml?3qqp@OXc>C7o1BORIsKpB>?pigi9) zp(R0ZWL}%;v#WTe+^B>6k=Ysjq<@D|biKBEc$3dlb_}T_vOfXc9;5^LG z<+()2X_KIh^OXNZ-B*0vF^eBq+aDiYmK>0O^Ffg~*`A{J3;f6%U#A}Za`+@JRfxU* zo(fN1f$W8;ZoQd=6igziJ=)TTQzr(Kk!fdKd?1b00-V6FZFnGwp3n{p`Y0O8;n6qIjx zbU0frZ7|nQLf`hjq`>#hM8&3;-n<}6`1~B^tnO+v$gfVe*DVaR3*KYyI}c3)N9V#6 z@_~X{*U=`%Hcv;wb>~Eigqq_LoV_KbSsu4Niz#UG)tJ zjek8?KO$bwHJ8jJOOi&g%jWkGe@rSD71n*Mv0Nc`)?4g@EcE)`?>OCGxUT=eQdAk}DXPdH5hwQ)F@I~#UH}$$P3Fqy2YjwiB^cB4yG%0S_3_j{AqADN|)BCtZ%v9o1zzJvXq8A6 z53=FjGEkJ2b3U@8PveMefAA`yAj8bm==&$TobY?@m6>@Uh1Bs|yyp0f^2-Bi31d5m zStw7-L0`3WZ||*<06_IrD{n{+n!lLBVM;)fVQ=Bl$~(YKp<^JK5ErAhGcD zCSawKZm*0Tj%+i$iu1ESitg!k=3$D9IcwF>6h;p-rM2=M3w3PDc4=qjFP|mM|vPJ_K^Q zpIh`d2=2|#>+NTNT~#zYoQXP@R#VGVm)G~`H+fnr`A&GIytur>MvG#v286tw#S}&# z>=xZ9Td%uRuUSnr%BEHCG+mdez?3HHnRHi=j#P7*-8zp+LD{pxPKMjPW=aKFJKf{8 z{1Iqw^__HCMq4nK$%o+9lKt>(isPv>b-8bqo947=9JW@I3Qyi z_KMzPW?O4OaiGl_FNuouWx#4T6t z1xVQ$s`Y0i_+xL@8|0fK4m2xc$_odB?{R(p{F!E=E>&O~yGONq6}_o6s1HX2%TUv# zg@tbViyBPd%@3?z;oO%^U-)El~A9E>LC;7Z?>wBf9 zM%sv$98_1gTT@TJQ7EYJP1NiIH5-n4`y&m9_H(VVbi1cWkJNDp3)(Vp@Ea}Hl+J9% zDe*2Zy*xA-)u}EXcq$9cFyO6TSrxU;ZxX)_=QZ=GypD$SxHNBb^pF7Dy8N_l-Dt5o z#CcmjLf&hdZNU35-T~1ds;K>N?YMtl=8=y90sdG@kdhiVyQnOtk27K#D38flEvk4W zxYP)49Pqi)`u=%}UyxH(cmy`pk0!DsLTsml*%H^jn3cOK|yAb&gyVgf)@> zKwt>q!g9-M8W%bw(xhECdE)CU&F3c2$Tv_;-E`b5-JObZ0e3CGtAU$Ftc`DG?Mjcc zUrY?X>rSgH=aMPUTg3CD0K4JiOZa1<%P0hes80SIIS4k+sUgU##yXgu*A!?z!+}6n zLXq%u0zX3i4;l9#r#=R^M(pA?md|+s-G)wa5?N0~-nOn^9C1x=K99hnW9=0@36>64 z%(X}tRU}ZkxSho-pFXWrEg(-K9ZhyX^^a5%>$*nzwYCpu^$ z4xjc09v2>b(iK&l@zFUU(siBThnVEPqAvi$7Ep9AF+;p6ZA%+$0`M=*Jgu8V4|!Xi zZ`r<VzCRI!rtL*H7!&R^SLXbQhZ*i(85(k$c%`NE7*D#KTkfqI_m=a#amgV%#bu zmh5vp$u%1*v}aATzjIG%D_AlHom>*St6A*!IN{SfM(w*^4T4JyW56>&ZQ{l?Qx@ONaMzLm(IfMOT%3}nn;WMYx3jUjl{Tsn^|`dlY>9HZ1R;^n#Ur|J&%g<$S0nHo zC+2l`X?ZS~?qOm)qw-{eDhbTLn0$I@HBCs@0-k5x&r@Gd{tWr4&wohn|2P$SkN)jj z&ee^TO6}ndJ^G$_zwKMVrDmIT7pVjArLi2{>lS0BDL_5D+9y~^BTFiV6kC%jORD(Y z-=6Zbm>Zw-8dvEYmWrbedcI)cfJgjjZ?xQa#;Vbp`{waBB2Nz}IUvlXCv_r#DQ|ux ziy2}(HtS&$$M2;*_p>KW+->da>`Q3WWJh{WdpH?gwsdTnDkvNqi;S%l6+1Da`)J(J zA?~(fTVR;mWbd5Y$dNi(IBD|OA{p=5(6g9M%T8)J5 z-ZlpqEhjT4Jw|8UX)<>e-G#S1jAeJqAb%OZ!ume2=XrdT~mY zM1W9%;8ohN?s&2-^D-2Sy*OHRewqlm2n&;{PbD^V_qLu4qAXA;pqXKphf3vL3}I85 zzTreQ>GK#Z7E&fVle9yro!95dj-E=eKjp+2$`ej}fV&j)O=$N9XiC2?9R$j`_{ZX}86r6_?LNnm`PS>H9hB zaorI?@z~aYIo49uyN91r0-BNQThr_MihGDace*$h)8bWg8w~>8E+c(7JpflbOs{>1 z$YbHsdPwurRBTPXbJKT^yf(**rs?4wvdvZuv)D+WcVtHp>NKl{pjOfa;qk1Ozz$Xj z9Su#lAU0-HF_Gsg6sn#>pj4?;!0Vzg%F?;g^A2Pae+_9Fn6WQ!1eN3&^uDzTdwy-G zu{$i7 zxd(?~okjJ4Sq{Jy@l?Tc%KAdy!2`#jw(^Y*`~MMiCZ-P1lMK2k&z~fL7!t=;n#3}< zam*l7uJP{7ac<*WG)e=gg@4u>BH+{dJtDJL>(vaQb z74roWaX7iH`l%qn4P@Qud0In62dZuupI^t;%}prOw3!jQu6EjA!;=>u>Y#C)^&oO@s?UY1!JedzK5{M!jz9>RWIS|4?3+MMm`nV!PPZGGN3*3w zPDqKh%T7&QBZRYYxL|>t#9aYsSe=p~wFwYET}Og-(m+_pA2^t5B54+6GPSw$RK0dP+S1n zV7)!kX7R@2$xSyc5zBOAL6NwsrONpKD0}O;D7)=_SP?-%1O-HpQo02Mq(MQtyHy$_ zB&9_J1O$|B5b2bTVL$}wknS0}hL9YXA>NJgoO6EXJm1In<3Bhv_r7@=05Y|U}6waGm=qLCkBRoF2M;2092uyRjDK2 z#uZKxPl~EE15zAzH8=JN)1rxs%6#~&GFM&AeI6I%Eca39&d+pf~&gFAQwUd*3( z%nv6Pk>Kqa*tZj##bc3?_?*0d>*bPO2OKnJ@tQZGz^DEOcH_7%gx%5Qbf^xw&`fA0 zxTB-+BA>VDU|%jfVzEK9t;l#JKUtw6UX)>=u$!lAq@Y_;F?GWL(iS)4mz)>VgER7) zj}g_A9|^!(Su&-2Ct60$&~fn$&%HkH+(-!gXDel9f{6O#XGMcKhTZWa(+IiZ`jsxo z1yIYN0sS=Pvf_BMD0&-lrK-?qd!aSU3R2`6=zJ@=PuWZ%(dyNwTK2EC>xXzyw9fgJ z^1C0|JB!nDs=nl5y|k-8ww=nfbn#b6u0i-pE$kH6b9N^3+1x3H9_Uw!%h;t2P!LgU z4IW$p<>v*ae7&`8N;QTCY|kWPsltk>Shw}5R>25!F4=CmUUAAudm8peg}H);idTvi zBx_=U%W9e0JXvuWi5gpSwSSdPmf`gsCdj?}1nd7X(EgwQ`hK}1rd<9>UuMM3#Pycj z=K5?I0zuZll;O&nnyh{EI!4nYQ5xrhZ&Ev1p_%SOd8$SFI!u%*lXdVlw|I;ZpD1RB1PA%I!hhjo<&^$M)qwLybvov&->!AB+dat;%~-^ zlqXk30NE%0U^_p{16{eKr*S{EBu~Vf8DLSf7|UqM!pZ}HCNoATEX4&1pYa2`mYyJ| zQOsteBhAcrsS|7q-E4#S476>FYg(H`DR~^Xy0rSkTi-C-+V(QlLmsA+;o!U?v zE5-GCLAyw-Y!j;fHp?r+G{7a*>LOm<-7;ntVk$^l0adUbIgJ=%WwwYICAx;hyGMp2q$w<*$r2 z*?_%mC$^0whA$k56T2#xtD#-EERW)@1eO7QgXL67NLd$!h>g#fMych_jk1lI^R6#SPG4@VI$__K(h%Q^**Pv)MZnG$)=kf@rufvR)Od-Vzd=naJ0BKdXs57gYwdla zQB=RBX|CdZQPL|EAyUkMCCtdTTirq4T7Qi0-my#uBv99ZCC$`C+q=;gz@e3-0YHQx z&H^?I$N8|lrHEr$`C zeL7TKd*-9$XiOHyRlJwpM=&Qu<*X||G5b{2m6|Hcs(Z+5W!=%@wuOxE2m9kFBwr0j>pT6fKWYq%M z327Uhc~~%F;L~n8GC95b99wJMAGVr*a(}tf+UHQAXmxCY^3h}!WW?Xr$Y@BbA{=lU ziOnmv3#P7;zj+T>s*!wI4b~hEl=)iu%m6mh0)X;3#;q4@>CO{1O*uV}hb8j&larV7 zCZ+^8W_v}iPgOx`>}*m2DhsOsK1+qi<3(f$N+Ubh)7gU(5tiIqG-v4l;|2Jy{~odc zb@cHfg%aS9zX^JOfwLt2_9~9%-7F9j@c+)rPX`WtYM+Y_ZZoZ`(3SQ>hF0<(-t0o$# zIBnJ+JM{R+-Zy}IFGxCCJDU6QY=Pi>#>8IL{g7=MM%~S3f$gu8Iz1w5mtB?bMRF~nA>IK>M8g>0nezDZ?Oifg#F z9l=|`lZe5}GIHCoi5EQO_IU4BS2z+12sN%|+AUZ9VGF%PQ~vEkaxUV1#fwl5h7{$Am3+dDxo?MjM&9DULH>ZD>=_7P+BG20AG!l| zTLY1LmSTBN-X`zzy!lKmgH2XPt;!@5jp1^?DqVjAyW5+#sPjpSB>MBL?pDon{e_6k z^dU11NJxVCm$zK18}i{>@^i@Rbu&~+!o{x(}; zvQ4k7l~rE(#^~3}5#ua%!~#AC&od`S`Jln+9^@2rJ!mS<8~ghkY0Hh(_xaIvSNEAo z0g+W7kidKD6qjwL_bTUI20F5f6;d9*3fwOZJw0M^XVWDYJ`sDBPDrm59mLUKh0nIJ z(`S_)euaXG%KIp{3`U`S!OgwxTh%eWxhZc;Mc7DQ$De0qEWoR{2@P0;jxx_8i7+3UI z*-8h_J$6xGNPm4jYsh9#*IEq%XxA(QFqvYPRhM2{eUCaIt8<2NtQ^n;%{}#peRA~) z9ACo%8rRpg3Up~gd!I3W4I!x_iEoWHN~G@#}8pHK7M)KAdBBH`4{*CMn_l|jIbl=X;7*Q|`&X_MQA zB!C3~Q`9Gyb?L2?07}KYkCp+`gzH8G{$h78(LHBuNoNA2O?PJ$lg+aV)VvQUd;K~) z*lw|(kaPnoLTe>8ScvO)XPH+8HEG_T#bM2{s*z0wB$Bn1H~J6?mX zLq$Y6AP0AHeH?@dXAMr5jAAyQ5tFYYN9DfPog0mblPxh5jkpZ@T=b9-%gb?i0i^9&o$jzA7ItYBDrOS}b{`=u{26Uj29O?EcIiYe#JEftU=Rp=k>flgmE>6c6l_cULY)nsgxSGVP`lN}Jy4 zs_fJnRtXwc*WQn8!~sN{4d(YfSHl!7zH^F*z%GBTy$~`^w?8ee_GC!JXmej+GoLw6 z(+Ikr;!9c-;-QDfWaX>@8ROlrLp}#Q=LNtj*k^ZH6g_>Mm88DeoQ5fxEbb*=hi)OV z1j%wbk!opa`z^JEoe-`o^IS{>k89vp(Nk8Z;3&6cD!Sd4UZkhaKt~sZwL5Hcz@0PLcr|!+y;mwcahiPYT_AR_ zrrj>DU34o}_He9Q8EoGr5}*#Q{V|exD1N^kq_FW3583|c!|kzHc$;yPR6K}#_7SmA zA9exeQ#2oUSbk+{k4%FCM6=D)7$rZTlwVz&h{Zuwe`;&#wmZCo6ctck^g`9Fq%UPI zE!kpUZI<4tOiq$a)gk6kD$*K>9{~kgj=xN9OhSvp*4f`(dr0}d%DkQfkhaWFKHqz8 zIhZwJkyf4sNu84hOxy80xnJw;4bSr#`4nm>?D{C~=^z8#t2!j5814GK~BIPMrli_u*`0t*s+o7V~Mo03uEbOxZRKsGm(|NIjJ zbH2i(@y%hq`EoVIN|LQNzt{6$JLbRtB{qr!sHPKgt-fd07}#n*Z_(ZbR`cObap-mC z+bR_tZ^c#6{NQ>Uom`VCN{^8gVa4iRLz05l$Jijks}FmAl|q2_)OP&NLPyN|1aN7{ zHN^1u6J9)-6ExgRru<7K8RZ~Os7^)PsCJ(oj3oTcJ6Vvtsb1rt${$eNy|y^2AGw?Jy`ijVjBYE}baJ#j9Q>gM9_=s}s` z#|Fjg!;aMj7N4plf@XW#+zr6(KBi%E*?atXy&A$I|76wrO9C}{QWKGc{cFb|iaTR7 zj%k^gxR2&gyA(xBKKu}o<5lF(&uEou>@5-?r+iNoFAQ12L!0|V#%8JV8T&w%yik!e zNNkg#Z`clS>}fcz)($4&7){OZ>52abmQWf2E&&l+GfAx4uhc8wqidItB+8Ad?Fv5# z*Q#aid#tWdhdnZ#606YOz1n2kRE>#RFNm|;Hb<#0MQP{d;DEKv%j3RX4EW z%&s`ge9wdn_t?OHxU`gfx^;Rn{|VA!DpAw(!mixVD02Fa#rFAquyz%;P{h=UgQIoV zTFVoP-_Jh=<5Y-@L$ypqxYG`q&2W-nfCSp;`l{WouQ#0VqNJp+=tlXQE8~0CIhs^{^usYKLbd4=|0jV9AJgZ@^NU!oWPjl|q51xU z4)ijxY~{8?%Sv{8&WCWBCai3;2@Z0tvntd*HQyti;Tt?GeMm{kXu!S^XCtclPYj*U zTfl_dJ%H|mi{^h|qE>kzi)6>MnWAlWJ_Vv?Be#=WC%>1gWhx*vXFPGpAygPrVdU?D znNBBqRQ=%OWJz?a%)GeyYpYyEo<@e^x~@a*o{+^zRs|88?qGP|monfR5}Zdbu*{DD zI)E+W2*0^m7R0o39Us{At)?e)SaD>^M&tBG&gJ|BSbs09X<}zA+DqJmzugU0z>>Ka z3J8boAavk7aCbfXbF_g#;-|FKsg;2Ldyo3@tyl{1OU!jwsw~JZxxF>6xh>vjoZDOf zvmf^rFS@KNLZ;lKJ5*Y8#ZZ=N8uzBYz?t%bP%M(7|9~XG!RY(=(rXWK)>r9`FK*oZ zjU}iFUVdgU@}x_we1`Y<^_=+tq18~7oS?Iiw_+T(|4kaCcm`a@|T!Mmx8FQsn z!{xBi86h{Am{k@!WV^|R76wraXG^@MA@ol|bvC!kkHK4T-zHG}Vn&NSxpwA%&Av{m zQ}-$9`qDoT4t_13zdDe{+t5!*H-4$`e5zP=!^;j)(npW}c7Xr(g|9Nes_4yR8~?p==!w}FW$I`(7#G|%QAlW&th}7fYe$TPbi3{ zT&WdjXRj`;zFv9zQ(W)kL@}wUGE2l>ZheS!>%x@uD*Z(8&nte`^-Hy4qgaxzn?diJ zG>KJyok*=AVlw%)77MZ}{dEuRi?^74d;``O8#Hbwaks_AY^E10Zm~ z@XyS%Xlry3`?EG);sc{yM0wk>4^#l8sh-}{~>k1RsO$L z97p|g4_kn>;YVpJtJU{w&B15Vy^3LE?niPEHg@}`Sl*^3DB=)$_5h7^t4igXwp`MHMSlM0 zG}qj?giKp566PGn&AFp0Qu~&u%uu@TKic@O_51y;uQHLeylhM|TtX)+%imc|RdZoK{~{fYhi z`w~C5qdKrvL+^C`0_%Ti`QM0gBk`yFpw%1=7AcU?aIJAl{Cwympk!%&C5iL%v_YYv zk#~mK+(8x-+t=WQqYOD2nV7gZzley0r#5PezzK^vr+o9rF*SV?mnbXE!oeY!oZmqr zn56d*InHTjj{Luc;MceINtbAK+yaC>j3piMX7m-*IY`9&2z>fmzP7dpr)qYV60?A` zS^0pEp<%%hS)sQ&`PmZU338yS7c%pQPgv!AwCTac#FZq8Qd3zPA&dQWmTF7}dFlbq z0%ew+H{4c+Mz~l<>@C~dB2+)>^6)RrM;6*7f>qhN;ss0Lm-9ZI3%}A?$9?RMj3Kld z*=9GRJezfDd<=g&#)JfS319)(d8OSRLK$ev0^{WNSDHJZnut)^r^`RZV&Ohjv$ti(4gEqdE!d0-#`w*c7Og7o@(w> z$?R0cXXDQ`3_w@z0QUPS`@r*pvvWz+1b}GiLL9(FPx{z$8H9K0Z>b1IPNmy~joC!sWv!_Rro5uq`$cA^V z=gx4~u~QAQhP3E-*K^9()LDhfZUB)#GG^=UwI|>)QL?HvAW)xPG&it`e=M@ado0qw zNeCgSv4QaI1}ot?Oo2mLSHl6>wTAbm4VCp4baBz%KA^hc!i7dGF_2?Xk?{xkCrYliu-mwsDih9Lg^841ZHdlhLSU z+)l>a8-70DC@I{#PqTrGAIW03$AVa`f|G5gg>OB`GJ5OmiOrpA=cG=GXfj(_0)=SK z_9cg;wV>sk{>6uu`<^*_AyDQT>pyH>UhY-5 z+o?)Dxl(L#{I)XjqyUaE7CJV_Xs}+(Y6#hNji_4iX^^mPD1l8Sz@aF}kSz+L<%8{! zcoMb`xTTz_bDL`U1+aliSU!8q32eQ@9ejFxBL3dZ=mq$*MM;o%6*59Y)IDfr23Brw* zi{s7~9^xrY=|&v7w756CSoRc!R8W(iYGS?qP!D8#br4}PXRY%(GoF&LhHR{i2My2d z+bSmqj((Q|Dy_!8><*CZs=;3jTn;iE%?d5I8k=x*>Yx$DrH^OslognkEjmcX_L%850J>g?V0r9tp)P;t z6d@`wN>F;nu=NMx65GJ6v%4~Hi};2pv=c%2+_QWv2|w69?dAi;I4&x2V~OnvlfFu~ zgi`_2i&;5gOMwUPHQIfLO%3GV@D0`Z_8SwO8#>+n&X6Xnd~Y4yy~(!%iW3kqg8bOW zY4^gdkj*HNnB;GlSrA4F^`qLfOJyK z5{8jR_H>UynamwLa3K#<@^WzSq5Z=XEZNJ!tGzt0(seMEj<3GFPDIDZyx8>dkPN&j zPqfHk%aBLB?=vi)o^jQ#@8YZUMZE!{Ywhq^?0Pu(OjcPv)fXimVXQLvGA$=n67N!Q z0#y_YnRe_2M8LaMPkB&pkb1pJ>A;7M(aPW-foykm2RqZ;WPZ?g*hvP%MQ32^n;F1ceIvl*E5)APNj3_OpQLQm_5Jf>pP)S^e&iY?e!zUwX2jOVo~Dsx`;rwI9cQDkgAU-%E|V zdE-AY*WX%^_cuVf6iP1~OpvweBJH$PWB^JB$t||k>N}K_+m7`YGpvH*eCHi2U{*vk=EvVRMV9~73Sxzfy z-)jJ*#rt;hsqD8-P1Ii6*-a8sAwAQlp zb|EYqrXZ?7CWF#4Xyj%jl~y6waYe$iK@~DO$6+Dq+Im_}*=O!+6vT9AV9uPW><4gk z1Ex=c7JucRl*$4!5XJ!prK7*O_9gw0^!iX!iC;Qf0#7t3!PGu`iJKi(=>?Hbif~~$ z#NLFS`C-l1rj6ON({jQU59R_jOgucO*$_NPZGT2wnm& z+_~?gM1MA8_rrj6nmLwu`Ab%yUrE9R^!9+t=4v4&%tdYzZhC$HP;hc+&R=6IyyB&% z)DR#K?1$D=avKyDVt6NcyozrwGb5`FWXN{y{*uKWCwUj;a>v#%2XBNUccJ+YLrlyb zh#S^O`X80OR?7Yd_x$;X59#Ef^F zz|`7Fj-&V=*6shY2>c%aC7_D!)A}V{ASObqX6VyIt`p7zk(qmBp0JWs-<5)Xe^hQ3 zy1WiYBiCspgNfQ5B0)k;^a6`k+}+iW7qIVpmErs#s{=x`tiESb`LkjDqUC=6rqQz` zp1Xd)n^0y!`0GhkyNDWtWKfOX@BRxZMmg5!B*JFgJ0H^LnRI4s`8JV zB%(KbQot3)2YPun6PkI~XyIoLf^ZYhy~{T`&S0t}g~CRi^uRaP1Gx z^Gnu1HE(+!f(m|2j!QlfGnaTKNp;d+lfMbQ2BkQ%%uc$)XMhyV?rp60+urZeN%vKP ztniZEor0Q&L#3IcI5?ml`%%HfEcZK|?m*IVir}?25cvcF4Tj84IubcV3|n_O1rZOo zj^~QUPPZzuSwN@2l=I966|)73xcDff{?DfNN2K6hbMf(Fp`PhVscGrrk`Wh$WqiMB zMt4nNMz>obcY&O&Y(%PN@%zlqSo2GPRt!^%b(%}kA!Z7hPPwY2l>_l?6P2J+su5>r zs;8%P)?V%7jUy$Hc|~kCWsEOGohcU^QDs)gg5Z7jeGG2+0-?Z{ke9PB6#k=!ZX{sO za}})oqmqwc&tm`+`^2FFl!>Kd7g3y@o6D5gx_(xwMmClyd9Dw{nC0GTc-^Dp(ddX~ zLreyUwBoJ&aCs2)10{Wk+P1g$Jt+7Iw!nl+NDxJ?YIKt956mC^*)*QVd__$F z$Z%fRv$X6R_5_N_w|_o(Ny(SXR94o1nQO-FJ2}svcFh;(wSn?IPEH+{4H4xu>9s3A zj%Huw>p8moy0TGkE@eKP)&A42Jy53xC~8$&qmRIg_qp~Doj7C{nU-Vd zJLU0o-u{8=huWJ-zj%scm!saYvPZK>nvVE8|Czo46*3{XG?A8*axq$xTVL*{D+;IN zT(ku4*4Kr>KO2~@C($KDT23u3J-yuI2TYkyc_H)++4D5S4}StwXO{!#wjS0*9)+1#n`Pet52Yp8Vo}Ku`?AQ7FSB+1RkC{>(cUZoMh|qlVA{oVC#!_~a{*B$klt zM0oAlH?aMGoB?7pH@>}G?wP{QQ1y3E%~KEh;#HdT7gOQ?6tLHYpFcbdDm6DMP%k96 z!T31y;tr-{(^lT|uAiNHUGq|tFtkjzY$Qih96$rIMf0YaKQg<-o)AmR$VA%+?#smY zzrS9j0WA6(!{!W2zxsR$_gPg(DFZ{c^m;<{g9AqXdw+J!h?#&}zOI9)Xr2}uRSY@k z?RM$&Z@+q5^|JnDKPY!uS4<-n{@>^0f1M?tx2Op=__0CYsi`c=@u!whH)HNzRDTcZ z|I<$kXjq>+$+`0W0~ej+GA|={v}%@#JZUi}*%j032iKxIZdR$<8r0NC<1DChskJ-^ zc;j>{N;&F|uu2VjqN1__IfhO;J?fbe9f71Q`Rpg`>smJ;;MNEGRl^;$s?`L7!Svcg z%H)^C&S3!42b22T`TzS*3{00zevq+ZK8aVNOoXS-sQCN${i)}I(^q=q$p5j8-#?JP zg~1q{g(s!z`|HKiSMIz_UnW%_6Jq}7p8RNq+K*67<({7w_1D1PZ481>b_cl`q<(ko z_v`+4c(XJw(=9wFt8sr#fiHI)7>c?5!p`y^%?ZfPy7K6pWZxCdCqyK_+Za#+p9~mb zNB!Z%f<{I!r7@D-Vt6Y4*CXMeACx$(f7pxjmuT;wCz2$rd&Nlkd;Wr?KsTE631u<= zVPVf^XOTZR?5w?}nrYm>9=>xqjWL0!d))b!es5khGc8^-_MZt3 z7~jCzBn! zSgauRTTvH(i@+7}bCN1PJRg8*>HAx@{+h_Y>C`)EFeM5Z<7s~_y2&M=C8+!rC#K*Y zFOLsL+npTsUraipWE_?{=tvCh>xnot2TM|yaFyCQO;J}ExgML(IV|EZ9ZEo&Zt}s~>h0>CCq$vhhzPoj79Mcvl4B33 zT|P0-x7f4ur6}KUsC#7R6D!;kVgxg&XxUStR3MvN^QSynVTfQ~ zQmRkPX1(am;HEZ(FBo$au@<_G&$UCX^JGpuNdio18ctC8w~P>ytpcHTxg=y9*MywO zGmW8k$!-}vzI*Yq0;RMbCnTDRiGg94ou84IIUQ9!-P7gBv1~$Zyl_4Y9x6Q*+npSO zG?wZcY~UPPAycY1STxeBUxx*q4hgbF`6(pDUBNxrv0UO z!$PVoknmMIzlHAQ?cKpak3mnJh9}FOHEVR45pCG7>IR`N#vmJL^Dnl!dU81YTwfUp zJ*5;Yl@z+UrJ|XjM}BYpY-Cvvy?wr?b)kCo4ArBJ`08rHmNez+j;+*Bm*tL>0@*ll z>Xk_DJIp8W6yZU-_Xai}qlD!{_m>jvqWYG+%ooVU*2|YXlAph>Tp=N5UH1N%uUqrV zq%&d2W(VIB2~Ct>UxFA=WEX~UF%$N?D@O{tvgaD?pmK8F!>63|y* z()oFpr%$}xWZ@WH$KqKnqAwJRLW48IO9#q!(aPLDhPSuVZ zun-jmJJ9*yPWFmOpr1D7V_gP2N4?uJ=eyJ+LD^-gT_M&&02O?yk#$ zvee!0S-Vt1_cE9Ji!>Zbg{JM8T4*pZd+uQfx}0cX;Ze}v;`6zAxIChne`l^W>^mlI zNjYJ{XotTe6h8o!vWiYfQkjuV^?=Bh+#!MVnf0WwTnG?aoGNu$nFzC|3ty^aL(P=T z?m0_{3goWz&lGb#=~ovF?man}#s+!mEh3`Fj0d2ii4Yx&(RAw7V+-Ep6PRl8erS=B z5bKxzulN`Q(iFbhFeqfxf&--{={V8cPic9SEhWsphZuCQJ8o3Lp%9pri9cSPa8VV3 z;D8v5k2*V>+W1oOtEs@$n{+HAbxS){6sX%D&<3v6bHo!y>&*7-TF2qMQd5o3qfn$f zi${|E`KQ!#QOUPXmB}>1IqHvOt@vuEaB<5l_}!7!QVD!EM7c!bdZdr8ivBoeq;WAy zx;6omQZF*VK?*V)(RnCMaW81t&g!sVjXgd1v5I5Oqdi1>+>`JFg5a$7Ei(7>th2Ygh6kfR zX5JGWxhQq)zW04`S93pw=b66n(hyV6i-YSNir>=bR_ZTM?YoJNR%JU`O^om0%8lTb zvkDk;yc2CGU$f6%NG#>Kb{fJIE3j}AH-^=5k=1xovRI|0Vx9ckk_eMpy}Npp^r>4} z)*;ac2$GaKA)Ax9n4O`xZuiymU}n{p#Bg?f#Ss2?H|RCl@sA3#wf3V}M+&L@Ax%*4&z3LzYGSh|1t*aOajm*l^dM}6a7 zYZygj2M^*96-nvp8k1u1ae@(o-?yunrKGUVjoq0F+n}D~GnbF%3d69q>YCRwjFbu# zU4fW31xt$5D1p7A;P|7NZD+_ASoVmKHbq)1!TP5AKTy=7LHmL0w!Xk=T6!Q4q zurB$DHNmXO-8sV%%^NZK00T+~tA9WuXrKo1jYTxHh|<-L3R!GyjA@lqakspc3Dqke z4~%UniWy14t80jLIs|oy%HR=6j16r`%@9sdhOoI=4H{k z*AH0LjL11^9rP81SRX_*0~97r=c^4Do(i2yoohL8x&KB|yYMULt5dkoslo0;Kd7Ff z`tuPsqv?%~$6rS5CRvjq$lzR?J`Y=0qI*=gj$RhmWvkA7je>-KWE~&6=7No9WBTrr z?N61J!`R0jkLn+CYpU*R0)}wDmkMDn{N6=5r5b6Nkefs_{TF#Sy0#|7OkP{}t=zrB zPtQk1Q{A|nkOdN8w8^2Aq`bOLT8tCR`YNG1FD<_8p6++$Fl20}?ugA5YbCaxMyBV8 zBr;3pIy~+n=O2u3ejS>>3CRwbL>#5d$5KM4reJIKM3OdSTVo@24Tj@WW5Qn(o!`PC z=&9!{_6Zb@&J1&Td@1*#pH1p4dal@Q+1&vKSU^aR?^8~WBkR()?yFbX|?AOH6=64QS)iz5Q-Q&$~ZHpOMPH?T<>B`(Jcn8@)Sf|%$*+|9q zdeAuB&YB90yEV6>Hs@v*3D2#?B5nQ1IG!V^XU^9ns+h{PFuW;`g0{y=C=+Supz1A4YKW!hsG?kM6y`=a;`w zy_oEoX#>nINflwNeD`Qshd~{@e5r!fYv0@_U)nfjW^R}em^lSDSc98pG#*TpTjeHs zY*4jQcpbI-EC@@rck^ecjq_1sTUF04?0d5Ds(-q|qhQ91Ah7%G< zh1o-kAwE-y6XBHIB~;@mC^hcM)~Q+GpcRXC(YBI6%@tX=SWfulQ8@8EsosePn4kuO z|4?AkP#<=^;4-;n_2;TNf9Osq^os`k@ba8u!Fa`vr{^GiAv3qQ+K?`oIQn9lk@LEH zR5)`J*+;>B=k>|H?CBz@u92K2xPf|fCrEO=JwCk5DViuc$;_Qhp@K`yI9=q;<2d_5 zJFe8;{~YEl1A!;9JY3Xa{>>W7p{ncoI1zfTJ`7Kn*Lv3U#xSLuZ%ihzNj9W<@DeKz zT$ogSeFh%wP0clyACFEm`t>9?D6bCH_EixqzH{7toZQmwHAl^sy&;lLrHxN{BwlF? zzkT}Rc|>%+w7pc&uIdXF-{&x)8c)dW$wUO)A+T&$78&w|Bk==Fskz^32#<*~13 zBp7BN$x?s zmC1h|lw}^?B#+9YPIJ7=ead|jl*3qS+w^F~!H&wVE=O>)!qPiYJy#vZ(!gx_Y_fDn z_|c#yy_fMgEmGTM$J4#St@$HkUNCm8W0Xyc@M$_%bS|J1F?Y^gfz z)~0p6s&^ly!aFFJj{A|{ynEB5?v@L=2xNIOH|cS?W<5t0<)!7P#gaKXThBRjU3~~{Kk327%h_zCH0*i`LeeU_s6*LaJb$0h_ z$`A{67v+FE%jPK&f3|$;jEAi7qY+K-L4&4X;^Vn;5<(T%(1DM^L-HOrF;~1jGcIoz z<&|eRkQmQ)ONB2fgiuJTb$*Q!TqVo8lvBDDyin}0sOe_X3xjT8G*#VTjoG)+ZF_i( zs+P&rx6ISv?{-p>$xtXZfoo+W?(xvl{?fVEF=R>)Pq zCt-q2qfK65nX0sif|;Sk@7>J5w+QTyq@@%@sK)NeGzOi=+sCMF z?fQ$rNUKwuc=UB#%F?i9)D4SRQuKHY*K)WrlFvoGW_mDaj!tj5U}L@Uw9-;EDjEi9 zCsnhedX`wyL>V2hhZr{u^W2zUc+-^PDNC=IvY3_6)n-X}I@3v0Jr;oFvhrF{^$#Ou1G$(Z2rE%{AYY@ zg@b7&59xY7_+9jPnfHKZ?v^281$vo=bUp>L8KIz8m3u5QB@*@2AJ(rj_e}I8qv0)? zsE)t64_(MxDv`U2hTrQSLP946`;xU`rP@$grv<4E+R@H> z)&g(P(qf9^2pF zZxen;PN0uRpEGIJ2j>#X60@-i*ESE+oUGE=T_h7Rd$qgD*G4{G?dfYZ5O=N>_(60I zHycicRxrBSnu$6)A zg~K(w1jiPFNtia@2}>yI%QQ{z{8QTDPOVw`M*d z(M`3&bXw`II+o<`W);!VVhTT(vVwTx@8Go zquHY0c8)3ndsBoNh~b4a%cp)#Ja*c=aO)Ho0hiYo2N-a?6K(mN7s)M8Rq$OumD|9y zVP25*%T)u;NUAt#Z=w7Vn<#7a0c4WTZanYqBxsqJ3~0)ynsQpu)0Vp?md^?rL02fNu6Avdv{>4 zePaisn}OWf?SA#>g6O*ECR8UUqpm{sHo-+I=-2ICLk5CN(#ox8ZhhS&Mq(zlIoxGNgZ?b z__F2gl%0!Qheuv*y0M-zglpbOQPnzl0j1q)D{Q*GJ7!hYiCviSAU*>1PCkiOO=Jx= zv9{EkEa&dBlGe}V8`j$A&>kM>9U;Y)q1Ct?*`ZhP))Jm(_~1Ch;OnY0xS`6xip2OF zuDSf%0lv(+)j}@=*tmU8Z(mlwmyVkwl>H%Ue=s|rQ!wNFl6Nfn7OvRQ!S*9^ANDBM zsA8e533i>_grnV^YteKqY&Yansa-Qey;56{&pry*w2{soOn(etfcq%Lr$f*rOq?3?aSSmSDeK6 zA)#3q?5FM9s`T+fR?S^~mWM%sWz_Ddi%@GVbE{}4k7Y*dcSP*ZL%159Mn(#B6 zw(cyF*-)O;herl06Or(mH$Jr-t1qj0B;WB!aCCjmg$H%GJ8yp};I@NJ+hyNz#bv@IYFhplx~``DL$<%9m-p zOAsc6E2RwIJin;K2Kt23{Nl($U$txp}w`4-|qPyxjlxPu;jhw^K6TMUTRLkh$ z5gtj$7dgnO?yd=BsR4Y%nLdusTDvzbj?=up{P5+7n_o(ag9-oKp37vcgTf-g$F*?RySjS;BJa2XhUFMpn)%ef|WuhM|g~ zrjJik?0aSxO4id$=|W_x!fb>UcNmB&E*8GnwAHC;Tgtc|E|E;}w&}xEZgNq`)H=Qq zhO1W!Yd?c%a9eOFY;w;;Ve9m=3$MbWPI@qXZ zy+(EN2^H%WJr$`F_E46|bZ2BUzMe!#JB98!i0z7g%_+=7VQlS0T<_a6_{g1$+n3*Z zT8u!f8JG;KU&1u>a3qE8CH_Ckz5=SPZCkrou@;9K?!}=k?(SCH-Q6uX#ieM00);|> z;_hz6ON(1@4=FA|{+-iv&b{}Id;j3MPxxwds&6G3e0hyZV72}D&KPr@3 z#HUm8A@<}AX1#Se)r@Bw2o4$GIgg|I#^ziy=`$|4v6}P7F*ov}yTs9lcpVEpAus@u zs$cPS2iZ+r8k6DXedw?hQW@Pr??(~ZB+bu6_7JflA<#L$E3vsVuZcWy@61`QsrO{4 zty05s)tSos>J<0Nxjok^{Z_vM^zealF(+bobv70PqOSb$Mj#4UhAW;cuK{TK#nF`1 zA+aaqZazQEC(jZbMCzW*CwP8wumE+AGo@M5eT~1RMer*kp2Nm-FL|5Y@__+aRE;~Y zmB5cGsvECMx_DE7hER#k*fHw9(I~UUy)PRQOo~U20H`+_UL~08t{oa6|suq;wKi z16!YR(odeS=(&g!eu-%=JwFE$E%gN@L(g=EH~g|iJCLo*M@}jGv@ixOhbY zom4K@PNS%*4`Mr4PvwSw|5?b&tW~}EYgDtewBoJ0SL1U0GDlT_QW4owhk&P{Yj}Cp z*=F*y8ihm$!D}84+_j@mtZl-B81K;gCqG>9v>69_R?FgR=3q_>N{wLW;NV#_PQaD zryW@0UdXjLwKGO(7TFBh3rPjsK?7)s&$Q!}P%}V!9Uf9~KFhk6?lPcn>+QUZQ~K2> z-LA(oU^;m{uLGZ7El6Nr;+E&0pPU1yDT;Y@2x9%2S>>evbYz+&2s#93tpyWyDg-q8 z?KWktGo^JePfKM!Z(dnubHeJ+5SRuk=hAOKENX8J)|0L{Zn@JFNxbJN#qn~j6!uyu zYw+RgWy5Q!<0 zKF-#EY)SaB0CM_h`k=z>{ZS9<-dpp{`7_lD8M&H@vRKN_-Cv2CW#-#$Q;c^^QO#*? zbK6WZ;mr)nPcWi|e_HSZ3IIkv0B0{m4V|;Ls|}m))nxJxyH7Wy?$_>9F*T`|tFeZ z^)Z!MpLAZhZOJ=##5?0D!zVb5kppdb13A|;$s9o z+-wBm`DN|6JO4$;@TWwTxLHez+fR zCQImCkEFn+zy+xH(a3ljmWHu$F}9Hv6)2r{wW?HxYKIBy&ekzccO5TUmZS|m=E|QO z%(VY>6c9==2kJ@Ed330*1IHjYt`at%_SLnQwe=l5OjU z-#_)|qI1;H1*P=(gOll1m3=^yDvEa}@vX_PDtOGN#V!4Ys*n#y=TdpWp4Sn3+8}Wc zKfWAcu+TZQSfh?XwLwx{gioDyFz&o>@#VTa_&sZMUS+j@jmX=#AJg$A2QkM5OwW;y zR+eHpb3H0K;w{DaE}mv%UDVfAU=9fFeV3Hr^F1&1LFMiib&V~$&>YJto|ofg&NQzy zML29lD*KFg99MnPd*)^}CC^+_UV%y!YAiFGiMcg*_~QisnUHt0jAX;ho~!bmS4I)s zh$<=Jx9y@WB_byuU|L_qRR)vx-@MvF-2as0zbKJaV>Ksh{bLVlb6}QbzI!l{<}K_T z)c4iysVlQ?-51_>LRP-Dj#uq-g%T zFh@tj(C`2BF=Rmwq_tDx)nWnadegaz)MTD?ksPpAo4%&ipzQBw$C@r6akUg6N*LAr za{?x}EuRwejC8tXG4TPq9&Mnx&%Aq__VdAa!B`^}kN15Z9qg=o(0##jb&MwRlM~#% z%SEr}!~NbBSa5v@g9=@3?l{V#*--M5wjqDQaxG2!b~5L(t6!DI?#y)S?Ivktz3p}Z zwp{C8SE8T)3VM>>X7oM^+j;-kyNcuuY2@WBdRSO|{!@8GY8+$)SOcmtj4|EN?IHSI z$}RYw9GE}H@iMm^o~kZ_GSgGX6nCemY8|l5nMoGF~ps{MzfSapA zztu-R)>V%=K#(cBU@SxCU~~Q5vsCs3Wa&U;Y4Q=|MWkA-!}+uxaSnOd**J@ULE@N21)#cw61ew@VW)V`IQG@*P% z+dC`gnx}w@i#qgZrUXn*;}d#6JZh_UIhpR-Ta^((eq}eR+O&SYkPP0+MMS*8XBJiQ zg9Xf%hkfKeiYLC?wM;)ivpmB)ZcLtsYP=_kHN8GvOtWYxft_DU!{G|Sy|dz|=}(G} zt@T(n)XbyZJRJ0jQwOF@^ng^tGusEeWH7TjYY;7}g66lt3nnX)TEfbUZJq+ZZ~3vj zD`<9(MCjz-zK&U}M&;228J}T(>mKOqvh+!bxXbHMj}`<$f1TqrwTZr&Hym4bs~dj# zRcv32J(Xk}5^qLwpahU`pv(T?=3!eX-PGNw@?i_i_nBPgdJC~h$Ea?@;J2eB{%fQI znS;1Z%PY6VH4mL8s5vnD!Jp z`=zN>zdc5_J56~~5fzuKOlxN%t>7fy(Uuj}aiA_N(4&#HqlLeH%{b3Bo`r<^HU!&C zylMfhD-H!YqoE}ZSO!BoKcqfqAdHuLp?4;t@;>+lbK@JSltj&d9Qbr&HQe5X=6UcpfQf?U2gn;m!_oDY^(uxF z+67WNEWsiiCI`ry4a~oa1BU}{&?O*P5)q?*+OkzYYi@HZE5{3S05y4y7<6;aR)jPx z+3c#iZRTmS$96HjbQHfnb{u=WI?yH%T6En?JZGSCruy}TqngNh?^9&27dSt*_v~RT zWW$r%u2U>bdR;#V^%@__ERoDGII{*AO?e0QK&EwneE3|-_!z?nei(tsl+vA~pU%!% z>T4VptFxF4+GSDZ@Y{jVI8v0x;$QXgOm3S8U+M5Y(DxxXHUHR2tBH52MD|4T45dVB zL9Vo+;NS97JaEsRVmNIc)-8z@V%L}J*StZJZOA|%0QssXx0SW zRz)NQ$3D{DHdSUQd8P!ka7+;gYWGOj3jmFUUot8#!fK$W*yYePsaUe8e^VOBa5eDU$fr{fXc(B&&VcZ^ivk7r0$*k??G|IqHinjP1n&RC$3@@ zod6xpvl}#t+iWVmPMBMEy;wRhiN zTcT!#JC3uxaFG-wrtW`^Y>BK^q_I$Yb`G8Yx(2T{DA@FmY37tAy>M(430vSda^Ib@ zV=ZyI$YJfc?$@&HuCjU(WkNaGDY&$`mFeJO7&X_hFr~v}bkBLlbq8SM1sx}34!;To zsKJ?z(tz7hp5LFzlTdMeON@>D;xnCms`2N6g{~n-)--#vN8+8<_i;`vv>!IdlZL57 zEd36fmlNZ$;BJ zz~|G2K*EKfR#Vw#b6S4D1tjYDd&n-1I*&ZZcL*Vj&ycJEOtI=y_|Rvx`B7w@`ztIp zdYv|Z{JBb=E&Z5wU9HmT!`{Jwji19%m(a&hu zFrO%wn7QvSDfP?8Xq%4{Ma>6meT-MPVB4i6uv9wlySghayOssFv-CdWVe2=!oO88I zK{+C{oz8>>uir5#tu=BLE}$Qp0x@v$XT0k;m+eRnV~JiQA>!A4Kkc95JI&z(8ob|A zDO$QTlT()V!a@4k`FZnFYMAtG-9d%)9p0vT{W*0@P>-Zc2L+XySIxV#{Et-EQ}&+7 z&6?83)8}IRS_EO{Dv)M(JI1G63|e3FjHPpnzTme3-s|(}vK#cLp+*JxX`$N;4{ad3 zE&kTfD}jrcnuGm)iuAm=Bquz~N=90O+Y|TUEE;SF857N}H6W->=&X}l(ZK`m)*XL^ z7yXcuV2V?k7g5TmvRJ&c=74`o z?79Jz7k{%7ygz%fjW^F4 zTziZDR}wrzR5v>}2yOEOr)aqFngr941;{^{+MagM zw9VbQeEBM0F8*ox2dAjbZF^f^9kUlj%CD2puj^O{rnnBE_;l(4;Y8FFi)o!pcd_Kl ze->~$Z5I;>OY&8sJA2=A@AlL)7pOL=Zuxlu8hX^No<_yofcY*ORL&fX^@U6@(Y>;R zcfb$~`UKU5T_-gQwZjhY4Enje0sEY&`y>B7AGB3WyUUl#(&N=#uJ^3m>wUHW-3w|} z7zy5?r;XptLB+@S+*=mJ5z40x;CPv_8wn&9tZTovNDMLDsE5~g0LE0WOb~W>v@86K z$06^f5G`jJxK=`eUi1?)fqMf!Ezdh`gC@HVebhLg2AGWuI4v{y6DdG}mILB76~hkL zbCI1H{CnJx1Aq6HSeyebVRG+%{xi;8C_SH2KF?HD#Ff>%@XfNs%}wmW4qPl^@{ex1 zI@nut^%AW(RHoHP8#W)=9>j?&TE1_b{lR^RXF&8E2V@4En~F=`mQ$ z;55FE@vS9YtDB9MVE?B3cHgX^r9}hQ!R(+Qw62Wr=Na@!ze8HQ*v>j?0+h+i-n=7p z2`UOaiKc@wbi*tK%dw9s!3B)Zjgc*;yHt^h1(EGmQ!!$;$BRTjn`gvx{3a^&dqE+5 z)CoJt(+;y66pcD;px|fp82Q;wPi7CrEBWS)(km=NzR)&z6nsAz(_}h2HEM>9#%OBs zJ>#qGkQq3?#E$|hN{V}2_U3s3^KCT*FF$|}2DZ_|B>b$8xzQ7ZZ;<_N&y6OCiCSxQ z8{Enl1E6g_n)aY6Dbn|di##4Tjjb6C5s{A>_Z-t$sh%bb9{a@5Bcj%AqTx?$&cT-a zU+R=cq4xzg*Cz(i3>%E34@4NdkP-O7A6d}>INYMrqsiyrgdv+@r52rwTaKV_AwJ zPpUIQe+-^A|2nBW*j-J)B;Tb%|CNn;hz#}uy`v}Vg~r!SBghC6uG9Qk45*y7gE?@* z8PGE49`&?+zczcMRg;`;(h!3duegj(yMd!Ec)nONb~NJ|&++iO{mer^Mqp$HbaB>p z0QKqOu{}iG(p@st1C3-a2D1VBRqXk-!gktRw$z?JMoQ@e5}5@DJC7LX6<8z`wS2RPy zof<3Jm#7LD+FsPG-}Jrm>ulPB@Oi@3>2XHUnKJ$Jf(F{Bx%4aukME9p9uA$13z8IQ z5_nY|6SC3?k@A+x^V?EH!45)%NK;t^gj9}XpRle~@qgiCx%e$KdGVcfv;=)5zvzh0 z=m=tyr3uWd`RH2RIrZHv-Whv`=6*H_L){^llH&QeWc{!N`P^lSp?gyZ$9ZSdrxm29 zLT~dkF9#Vfr!zi0AknXHC?ke0<|*}@!C2|}dI{YKFaiUvTj4l;*)q{SrgMwC&b+5M z*jX5aB{N}~IMCH_($~WXCJ*q|R2;{0lutK=?!U?LoMikY_me8r01}H#wt#G9txLK1 z0U&`xq*~c;K*dz{j!Nas`n7X8Ic&O{d^;t@tN2Mbg2{D*+3q-`5uZ|tyTKgAFiD#o zZNAi=F1|o#Tb`70T<|vk<-RiMAf?j9}uUu+Ag$K9k0iC#MzD< zvZ@@B;5VrMe5iVoH7kNLo$~N8oW21(aH&^p1E7vOBGs$9P{q9@hsYBq;Yj7PYeaO z#0T)>nimzvA=shOps{}D9CW77)~L3{l^M??qSZ(a%Elrqpro6RH$X4GxzqG6BB8#9@Mw^nsX92Xg7xCaW7ZtDy8!aNG3#q7T~fP zp(qrVmj)dMjw<06Om=$x1AS|nB5Qy{5O3tA!TP-D1V9H8>>5TFc`0R>k5$YTB6{ zaCue_1eo_-)u%F3kc9x@sN~pZpDLMCX{Pp#n||w2D}EzUSRVPR9Mhg0{d1Z3^h2he zinCb?A8s#~g2<3xDc30@996yE9YO!R`R;}4P?PKS#-^TQI@al)I)iMcMHPuvM8(pl z)z2uyA8Z<2*JTT-HZ9s138J18oF)kOq8YKVLo+Mng7_VW${LnUj)Sa<<>Hn2+nMXj z^lehrkJObuAh&t}bb$ut({B@oG@4ycqp7&3>N!m4Hi^vU2I?zx51k*MvjbRO@Ba6? z!gQ7B+mZBa&(xQDUs4x)+C8)kd@i_r^MC19b^lP-+Bt2cLBK=H3hV$cSEtzK11u-n zqh)=*m(kh0ora+N^;z9okZPf9LFwbdfL{o(ggxoHG{b|rf{OS|`XNs9Wug9j+lZV5&*EN(<}a;YPs#))GqxTYii0J1_tVQK!V(e38gCBOvIq@_B*?LX@Yi?Taqm@0?QDNp)Z((yoZhk_1qokK-{qWKoqq2 zZJ`<;m+8Ck(E`B9=`sa6%Puf5Dn95SiA&+KuM>O@grh1W`i;fE~6C5Qps8!k!rNuD3s%^nBM&i%;=h05yQ0x($Z?KCusDaKFOh z;=?5df_gf`)TkMUp=s$6I``6r+x{Mnto&O0B!FoSV^*|V2ivbBqQ$V1x#q3QSm~2u zv3Phdih2=;Xw~YUd?6j7nC!(!56I!BxK58!Be9#|2|8Wc-#sLzgCkE9?7>l@M;v-#%3@%VVD2J~5PyOnG8fKwExmvl|5ta?dZ z4dYJ>f*DlCOplY=klQ*eVV7h9Lu2|aDOG&TlgMO_Nsqg)%7sa%_Bc5x-4A+lZ=*db zAz#L`Ss}chH6h6XCqoj>uPx3&bqoI2X8f6s1PrT3dOM~BQ8suJEd|PxOm!IFvLl$Tk|QRF4|1URmgJrNczcLh?<~4U!p0~t zb7#<}Vd3_yVa&4^4|^4#cY3*4&A^@M3&87gAA&PJn=n#heg*|yLyx4$-Y4DPl(b_X zJr2>Xdx|pwFfgw5;Bm4jozeaIK^J?L$=S7nSR-jyS%S6_onv|fw(j(Qx@j4eCJultEtm4~dXXCJt7LwUS)2lm~agOEQx%B^R!WJi>M)yW-reBe^SJd}#Y7F0vzhb@0n@Sp+8dL)+y7-_|&QK1Ef6FFfi z)Z~Xt`%f9KR#zyd4E!dpEGF&gPs2naoX7R8H^a8G-|tt%w;YF#_UN{#y^{Vas4!UFa=3TSX_Hi+vI97Zu6rNkMtCj?BCKnsB>XX{s7GAk;B47>a$N4 ztJGe=98dKgIT%uo?yG5+w)o4S{7{7CoTNH7UZtxft!%Kbx_gXEmgHf zIotSUrT{fwa$X<-$?Fll;;h{#&c~Mrw~fu*wx6B7kc+zA&0W5@Y)^Z`*VgAX$k>Fj zqi;R8AyBMd24HsrR>J_0-+My@IgbVjiGd2=`HXrz!|#Dw#CUX(G=LA^*q#mmr2f&* z*t3~$%s|Jrb0-@iV@qe{jhb%g67*5Mez%-%0k~@bPUa}*P8H|N^vKxBA(vjfpi-}t z`FnpaUV&*B-{no%iOXdn)fcdT-_0|dK4uan$0g|3P!@rBH4zP4z z7ug?~dEh94^;I)=a~#G1-_Y1k-AwnTer8pm22CK<1ZPXl3pyQIzHo;@8kT6K0$`)H zxt5-*53=v|AnPb7guHrP zeoa$Xu{!lhK)_$jc2gxp^j(GBqFXJgFw)H1M%`Ce=e7TM1fOOFnBJbx{lpiGK~-Po zjEqC{;iDJksy7x3KHFkK1#{u3!#^8#Pv2|j{aF806ViY4EhwiK*Qa}E04N%#?<`ES zydCm^`J9Qg^7{l#%8Uw68pEs704bwaX+?)9DmYG;DdTK2P3>u%@w*wz9H`r}D|?bw z>*%#;s}naI%kv?WO>;sntBct|bbi5Sk5C)1@{2w6ndKmBG^X08{rKCU!}c%AVR_|D zBjpVRGb18C(ksttj4&lY6rGOGkgTkswH-7V8Dk2D+Z4odFP9*Xin`{q(3W|_jUHD- z)P&}fBKI31rk;u|%zJ26m%DAwBH$38Out-p=vc7sgc`g^zc zp+Uq14cjQvb!!oYHk%cDFAbm-zrlB2Ix-4Fz7?$}pCmzrS-l0&UMbbWIKoKE#U{AIHYm0-_)bH z$DoLO3X0@vC+@}Rxbv6)0St$%peMzD*;Xfa7Ad1nzvtiY;izpI`q-mo{#M@rV6?_N zH~z&Kbw;Kkcth93-`sYHkt!UP=MbIZ;VTGKdbY0Wa`Z2b*8y%VqXM{Oodvk-dy9lg zJ4XP3xINqQquYrz^573ZRMa(#bzMxlg}AMR_f0h`=zLfi{QU0QaJr!y?CzMIPAfZf za&vXXgs{(RX~q((k>4TLih9pTGnKSu`TEd3R2bYKQzaw-L{8r>s<*-+0M%=%p&iQ= z6W_gY*#r7hNmA)Up64b|n4jeGK@6* zBV8EeWmHVEXFfSTKew(7K0YHc-?r|! zfZQzj&nj4qM84T5)I3Jtnsb<{&Hc2fl{=C7hq(y2n&OI6KYC6&H&*cT08>ELMBs1Rj`Rwn#6KRS5e{|Vr^Q{ojgAQI;Gx7H5P(w|ri92KQM5^d zp>DAYY)K9YS(3X_tD;SPq(m75I`9ZvDBps9%l)Bg<;N(xdfGi@~Z)73X%-Go#)PN*9U{eZWsS{I1V#qJOX^8Cx9BqQg}95I2ZfNxIPwRYyj zU4nZM7sU=Gfx^Q{jmm@CIO1D%7eXfE;8t`Am1)_rL@zB4jh69gCiham-qdLK0@@zt z-ynY@`sH=|0ChD`%cFnxqfk>9jU4p2eBQhn530a--@EgqSgWmkz;|H`%&gj7`6$F*3}$t`!9a8Z4Kz>Z+09gse@7R3Bbh*-$S&Ix=}WY=}0wi^@~-P z=;=P5PdmnOpO!dYpv^m6EV;(BYpj(;aAF%mR6kl)5Qp9_>CQwMY$C$yYfzY%nS|z? z?E^k-qa1_Ef0A%nXZTI-zpb-XY8MU68VfX7$`3SEljMWlwUo(H#tB8|c{KA1IO;AL zc#>hN(c8p7%VTb{I3jjcYChj%G^JBem+6ruFGcCj1@2LsEh;I_>$vCTeLXlZRmFIQ z>b^w1eZdKETVGvGvtV9xEW0AVWs6Ae*1qk_bj9ShH--XPd;xT2b*mO2!MrLN_#ixd z0#1K*tT)XiFFhr@nGYJim}>9v8$oALDuTCxG)9?tP+(-dwojGMc{R?Dx%FwiYlz=b zlb-6zb-OyG#{hL9a$v^Oap3H%y>7iThXD3d3@GFKu`c)>I1`u7^Lj=VKKLGoDTMqM zXW6z8#p0Zg`cHy*qLwa~X~5Om5^9LWeC*TjQZ8+&Vo;x@?)lF|n%yp!$KF2`T9udM zx6D{cVYjCD**B3TN?E*+h$C6=)6K>+K3+z7wXUeX^)K@ARP|!Stu+`Mqs*0f5c^&4 z29&pk_`Yub%k}5(P4S-+zCp5yjusX z(Qe78&)SB}AXGl|2cktUoX2=`)zQI!z2NrDIfsLrktiAUj>9vXMX*jkTr;DN39bh)FUrrYJ9i5C~v-n`(?i&YOkyj6_S{8g*h>^7!0 z_+izUxZP&y{pSE~sLy-U!;V)n22^2r)ApDWOwZBZ(?=1+D7!87kH%fCe|X0=R(9f` zZoS+n*g6#Umj3I{$%XK&G{<+R*k3n^zG^TP1_#{UdU`VluzOz>$lEx*`FvvRa_c_B z!+J2v@%`%CcPvDCEupZGpb@u(sU{|}jp{b$JCc$?uici^RwUphX4c++l$esuCc|tgmz}H$K^HT-R zxAQ(}y1xtLUT6U5i}dZ#%!$fXcgc-xTM(|8p`s67so!7BfE5e-@71KbZZDQ!NO?Vz zZI-zr9$CJ-y;!%w*-3rPHEiFo^jwN9Gr1z(oDKkZvL9Syu~kOOeBK_*(nK6z$ZDq0 zt~NuUdpG9qMo;FNN-YmT!#!-@FHhLleZ*lT@ysmee2g!vYhL$8#|67FK}6h4{~0oq zBmfoxw8F+bWPnZMErH-Q$o~<7$2urwkMnR8HTEeLQrXn*4dFDW#v1GLl;5K~Zmqh2 zy~u%J8yGDLt(M?5swGYLc8<4fdB>ekJSExX>Zklx!2VQpi+KJ+v{^@) zr2h5Ulw}~_uEi_;6i*lXGYuivbtpM|#=T(pL&A+%*)SDA7Rm0oyIa6bBlBe0Pt++p z_OMJ`isf3wftnkXxI48Pbw8z0y%30zc;u@(v-T#O#3Y#p%@nPJjE^=Ti<^Rrulebz z3fRNe38bRpA;YAIgM3+zhNwXxUZDIM!$Fig8Yf2UwJN2Go)Vj=%7r`v{iLra#H>9}mkmjhmDQS~<)AAZ{h`VtR5#~tmkMw#uEPY{e>B9mm0mcent#7SuFewlZ3pr(#v->&lKKihfU^Si4>6zpaP);6 zVD}^gO+7~Et8)$azAshltI>T2w6Ru0hKDHt$hOk1*}6~E)R};;DXrmA?_}#>%Q&M|+|h4}&A&c}Mn5PW$Pw`6%x5omN(tKiy_LV8sTF`TqaB42 zITqhWN>DN5Nvzs+nfZxMK(TJf!-my3X4L2dNOxyyO6IT|lxsEW8Vbyl9@2swNzvHZ z#Q=u2(6>7%U>2C~`A%|ls=MPl%+3jd$kq5@&0>U6(*YeRrCM!@G=N<#HlO)2#p@jp zF-@;d2kGkV69MBNKNt$`F3*blzFFbxl)YITzz2SNyy3G1G?4;b zAm3nR3&V+o%YEq{dY4ob1k3=*f*4TLA&hAy&5_K*F%8Hzqk*D7zEFm zYDshgz_(=pe0!z>zXpmMmY0Fi02ff4rwAAlNb9{?|3+H>sJ8su_cgNt*0Sausdz22 zLse0hcD{Jtw;m#jemVlkk9B}RO{4LM$GDe#@Z81X?Ie)Cmhrm1pF4Sy?h23(mv%Fg zh{wOHtmgyqv`2y(lddfDt-t0xpE-a@n)QFY+VY|f&7)yxrveDkg~z{u&Zwr1k-Mmv zXFm+H)`_AxziP@opDs2YDit^v$WvB(`x}Qwq!P}xGWz&5`VWo#&Aa?xpI3(PKPjIM zfkPtFIy1FiCj!PKfm!sFjzD4#BPCAXgLM0Fwo=qVCh4KUrk#k{G!v`0{tu$zCI5O* zp!Hrl`eYhGt=5lw}$;_UYD{E!V{eU@|&Trb^8jW zz8-do`>OeDuwNf}Ts5*spW71F$%a+`$aQ~37!CySYK!nBFDL>oK$KeP^#4)0{-?|V zq6ysF67Wa}MH3(LnTcX+r3q%pB9z_0chCaug}7?RdxVe?BK|#L-w-*K+*7HpGTSQUQ){}Yw zd#5N4>^(qIZ9YXQlggAHSs?&$>Jk7>-LC!>029cha}>;z@tef>@mhW0;jA@e9X#o` zwIIvx1NxuWf&OQ<2=OkgI8l|5us`fc1Y7{A-ld`g$@Rb4)qi+1G#wB?G?3S&$57dx?{nQ;3&T9#hYoCfR}vZ?WAz-KjeILG6l6XPm_^oNht>(IR+Z@b zYO_8Y{ONpud+!EW37IU0lpEi@GG4 z_K8?0QPjh3pz8tjfV=cUb6^laKf07Kz39YAT*6uL2oL{{ zVW6e)cH(MIa~?RegmQB^6&SQuA0lvLE=QE~%ylcXQaLn_+k5hI z@c4+%S)!PC)y7dX0VO(Zm@MF~ICxQX0vu10X0ln5v3||p1`JP)x)hU&O%gACPtJ^+mlepeDIj!c!Wb&(DW0SnRzw;d;mK20)l#{0nr6fAE!3IA>zMZTBh#=p3 zum!Bvx?DHXJ|7#@OdpSCgGg7E_|J=&KC-KX^;xQ@<)9ty|Ej`Yk1!(xQHQ(+EGRjF zJ0FI`l6a#Myw^szaK$@wIbe-NZEu+VD|ros_Z_j2FaAy#{%A$Igqt5S3Q`~+ z`CqR5KYbvA2-uk9aF!9zZ(Im?PJ9HcF=?dCMC2cv{og%t1|WhvZ|>1>{|J8ZxN$b#WJj6WL7yaZ`_I2Va#_r$ilqQdXn@%cu zT8V$i$lu5MA79|8z;{f*ivRaHH9kkT%C%~SC2q-QmKn%s+lS zh#YR)sM#d{-tj;F@1I2Bf4tdf0-SD}$xb@^Uv^Yjl?Koq)izfqE`ZWICBD)*QDJtn zEK$8(2yr>+#cgsr5*24=6FitSI7GHJaeP1|9HLsISR%>1O7Tv zZZG#gK5YcpnaN-gR`@2VIf4XFo)6B1*VDR`FW2~Tf;g=;T01U69{oej{_}y62hqcA zOY$NbQOIAiK)wsNvAc_msleiaHX@wIsp3oG*4mQ_p|F3f;h&fIudgR00pnoRLdAsr z_eGclLf+SVj<}dWi?I_S9=Fpe<1X)KNi_rQmg>(N6R_;)q3SB-|H~hz7S5&5`KSG$ zB?<%4QMe*$A`%_ex1;+zWf~dZ^{nF^=6Kob*SjH1&pyMAUFVb>`SY?!oB3LXuQGqu zy8m_6|MSOjVu4E-+uzd7@q3B|aMa>&f}AiUI=I{A&hP4G_Rj>p7m|)m=H(6If4BXW zzd^L`PkV28&r3Wp?0+0IqI$ZycRbTEVBS@)g0Srgwa1pZ`1*=Uhm%(E|D^r7@Tfq| zg+KnUOS6(egTsSkWqVoh5hvQDJYJQ~tOcdKZ zhb}8H3KUky1Vmt82AI+H^pWv&JoWWod%gKn3~=ODdI#T*DRMN?D14n2z6RDtfN&>x zNv=1FeCcO6>X|k}#Ds818cdVQedKM37yil>$fBe(0GUz9xQH#F{p(B{gOR&w2(ny^ zY=kvcjwUb=`b??eON_8Ul#081nZ}}@$mgI$1q`fu)Lir)FRGs5O|KY1)aDkzj{zvB z9H(~}B#%WWeikapP4PYk5!L7p)E@)6haYMD7E+I7d|Ha_j2u8IFdzD0oXDhIZN_LbtZMEc1n7dN&r$q`xML3P^6mYuFB3*^2dpN7m5T&ju`M~juDL+qd`!2i{D20|u zB!12XjWhSFC%{$Dmw|^N-e4`8zfYY}`T<$`_rm-ZR^t!~84-FPAk@-sajwa`J$S1$ z)ON85LK&pv--joshM<$OgSiI7L_U+xh1p(uKwar&({25NA8q@|aK*;>{q6X+GqKlh z*fz;gCiL}9_QB>#7a8^-Fz;%k^8yv+9yV>1H*-8g-RUOoFEME&d)f9V=I%NY8k`RH+Ce$&;K@aKUS*yFp~d>sh@ zR;FtsP7U^RF#i?i(HqYxx6?>xkO{muIaNcar(7?Si~ z%Rrh+1O)EKJ-Iz&L-@t&WRk#m9jUW6v}EwqF%0e0=NWXKvU3|Y-wbZm zxktYA{WZQVOR@=SQr$=goR6?7JabZQlw+d$%QOh9;dV-G0R-0DlYju3X)a9qyS5gO z#I-Qf8x?mkM5dA7Z51BQCZ=pfN;B9r0F`WwSWI|#XbJ^M>TdB*#{P{2`p)cNz}kj^D3bDy&7kZLhnosD` zH!G9HKaYX2F8#jO9$@NE`fE_?4Gj8nuEW;0bvF!e6=(-D|MsoQU#U!Y zoy2;&GCS&L4V3&DyGJni^1MqsNpkpP-0O+S{1M`j(g$8K-hf3qMK%7yvW(XWQRZ@e zJX_30e?l&MIN9kGAYY$o+OFy&AQlTkC)7ouBnX?Wxnz9Prh_(>r=+i^EB-aU2_=_T zFK4~t(F8exfbaRoMfkv{qL&oRSdSnJ!-YlKPtb_=j??HZ$Buwr{?ynps$_f7K8-u^40>$wJS_%6 zt?+^^$O$=lSjeVIesLBv)0FW!CqNPP@UA7B4kxD!|NI+BM5Igj-YmCWYdYgltXx*V zoT68;nE<5jQs+ESeBzLv{6KgcDp1w2U7Pqlm`@mSLYBPvap!uA_j;;5hv}i;nSzaL ztVJ$8ZE`y>?}EW$+k+V?o8QXNkoq>)?=7dp+}NqQ+1P1o>&GjJvs;@0*jPHhMmFer zP?|^}&zi0dEG2Htc2pAgAO~7uELNERdKGY9r<15DFzXb=VmUO|6fvJ&0!83X3N&KP7 zPo;f;d0K=G0Tt!4ldEOaT>0|5&e;vzM`5GCr$-g#xm$yE7?N3x72$+6?-Dcbx_I+3 zx;SFHxGq!7E~iJ%wYn|FNs~6S@(`@Old6sJBsntK?;hJ}hBCk`pW@e?Oqr|=%RbRF zr>aX{pQXIM5I4mJPOJyk;J?hZs%wr-e$W66G5OJ|0`jc45dvTVxhR5{t)wSJT2(&! zbM3Ba&+~hX^ttu!);5!8{~u*<9TiviZ3_lMf(3UcXyNYeE`__hyGtOr26rn6E+M!l zxCFQ0lHl$RefYlLyZuJr?$P)C#mE?>YIDwBd#^RuTyx&6`W|aw+dH&fX{69su3*yW zYQv{~bTbfiY+XCVXLtO=a=NDk!iVSVL`YMvRreDG|3&;+!f<>E*cTw5?HE|%`RIbm z?o^A3vbr)6MSd-M3$Pq%7Z_J`WXF9%17XcA9k{= zo|O621-qKIOYuYHHRt{02-IZv7Cq$ucWS(z@<#BP1~WE#8RvPjrTwHfS^hg%7|mUxgW*4tG@*QtA6F_e%3y7>Vj{Z-><1)UVst(1Wbb7J;pK^ zZfQ~4W80=+b}VkgEwK8gA<>YcoE=Vi@bP^ELu6|j*o|kbF9<_{D2Tg!AB&7$S%r$3SID z$a7!uc>Ta4<2yh!=KDzOtb{5o2x1zB-eC;iK0ux~?;6{Lpf^7b)7Az};38!vxyDxJS$EKM)FP zA53BoRWt8oqLTfeo9{%*M^ZtaThS>@FQ2=I) zmc{hElY+{A8@NBe%m8p#=FBnf$iHlB;0|}{gI_045}iz6dgDwWj`XKQ{zfa82+{$} z&nCD~Mh{)ZeU)5Fsn*l?2)wAeJYJM>=sM!un{~|pJ>s=9cpU}!E{H~&9A1cC#b>cA zyz02fbWxuXthBhtAkRz^y%hF>gEC1$ zF#jrcfQy*#p`yi0B-i@W-mpv5p@TB^T+Hv{HhLkY>p!ZW!;UX|LT*JLoSp}`CQO*D z!!Jr=2{zy)^XigVpChL&hQn8U>7W+&L+j+d{D`$2B{J_@a5(~8q(vtK#3ToQ7#FH} zcv;(jAF2~ zwQ3lE6h&$#R8CWRdhSU5H!y|NfiS^*dYfAJmp?=}c7HCp=H^fx+W4Q4I|J3*QWuz1 z04+eu?{kTpV}VQ7(fO*r<#= zZYj3YwPgH_@QQFBe(C2FYTSm-dVA!wv3XgNDs@41J<+ggyAzZ(Ah?NjSUnHqkW!?* zVGkBd?`yi{{Oz@{UH5-)&{jXezI{@)7z1BbX5sDs4Rg1-#q19N#M5XD3d&_2q}OuK zdkgWt>YfCA2dG_qh}Hm!Z^p0WJA&^~l?n6)@$&uGi)37lqvq#)#ldqQ`5aifR6am) zn>jT}f5`igEU;bI;#bBAT3n9Gn5#M%Q_p-GSEBsPzmGS1>g2=6E%F>Pr$0z| zlnvQh)z~_{st)^l>_Ot8>U{6^pbU?F$#dJW?)hi*=;axf=2hY(WDOyp&c*1eC0HwjV_T0Sx-g35C!YTxxq#o`IV2PR6rrNrmHDtT=^;deG5G7#w zj`oy@SSULC#`unG<&8qcvRYNMuw_BsrxV6lVM7qHhild+B*TEK*yJ)5F`%Jgy;h!~ zR;4vZRC#?xp)G%&$>p9s%}GRQN~Or+d`3KgK!BBVZQZ;WBF+EXQTEc;FYr`~18Qt3 zih9?y8wS7GQE1KR9$8Ho`ei-$hJ;si&VG3_LFKjLaDLJ$j@@@=?#(H>etT(>+zt6($vH zt*Ve-d!O&!$FJBmq?LYUo9Ezg&iikR*!1d?wbvfX-$ELRanB;w4~jmz)U9mwBbCIGo7GmqFOHsgKyy{W=@_$5G}Mbp+X z!YCT6cCBeZO69hy{j}ft+Z$*Wywt&?$(9b2w_tR7V!?aq_j%sU7zpa1dy$=ER{LxI z6vFr2ev#_-ayh19mq~!8)yTM1fHQr=3jJ%JNGT|#E!*b>cHsLTUCNP)73ZG!gB99_ zbK&Uqq1-1!zgTXNgF$eGcJshU!E52x`eJCO_mv)gabRN}8|Q2(_-a{_Vd)+#Dl99u zjsN&5B&x~}kUK&S#Zu;O!mS?w)K7pJz+(kz1QrlsYW}=)Lfm!5XQ)T`5@oml6m0>n z_Va+1TZP_FM?%66lAx$HC$RyQQ-GP_UwlA3IEU7dK9#17>24Y4$AXPTz}+oF&tlC7 z2TwO!Y71k1&C;~S@K2pP#OIFhCC}@WS9k*q>~Axw=mgx~MR;LEiRRxM)N#hS|E=PU z=GL7_(&EIpYFb**sG>`wV{pY`I2$$+u5nNyHFR+2U47?8{i9_~m-h6WWCpL4Z@rzR zi;!V=bR#cLx)wpbJyn%D%vK*56-DF!oy2orTUg%>3FBkn~O+&pCFV3Lef5{CC?{!$ZsXzY$Cn1>0k> zO~687Xs|eAIsB_Y{Hqt`=8hq&ow}jCPu{|vq{mEB-X^5yFRQO;HPL*UyDOh!{Ku@|!`nXj@4)H^^5w2{eRit1oZzg}=hjS=+3!NhLVTiFr~0w81R&1ytN_dgxj4S) z6yNbTE(6v8`TU9pI+JK2{1-AsAr2r@m{C#a@cUcctsYi%U*#~ta@!^?*T^JS%ySbK zinx?a{5LTzJvz;w-oQmIHu)JMnPj{4a=t=n1%)QP*`xS#sv0t*ksp2Vo9w8g(`r=a zZh%=(E0v&kk^NPR-XA_RhgLOWDY-(n$_x+m&1uHwSw}QxV7%>vuu>HVe#Ch+QnF~B zy;bF=Z(D9uI!~U$+<_S&$KONvFCQ)8ciSaK09kSBR~b#H7L>nn zOK zmIl|CmMi|*4hV&8SeT{_WC<0R&>4z?4WShb=Y(}r@X@7|qs~Qf5sa-%$256@6;A#Y zImTsS9Xq-LOARF)nNwyP0t23IhjY_f_aA!C!2l0#sg;WUiqlq2iFo8T;&E4tFIa-? zgJ93k&9QtX6MDDuHz8O|CA}{N2oeqI=0&g-UtWpj@GYJJExPw8cx6<$yX`>FJl7v~ zD54f)#`uxbxc02YGB*{_?=9the--0#e^YRCWP5E6p2<_L*X$CBb00}>|M|70=fmek zA?}+q(*gWK>@W8|CBPhnK2?OX@zd>U+ezxnSTxa2CN)rqoIHmunlkdl9C=hUKl*yI_dC&{R`^f9!g_@gbNzW-p6Ccc0Qk`&> zRs@&)GhaBMHAxSs_oc4|riT-qafqtoYHiFN>@kbW!Gjub9~XJp35Pm)d#o$z^S zxWWJBv$f;LQDEkSw%98V<+&)_%$p_2)SJGA-g!|~VaZKd;zuv0ymA5gKjmSw2Ry|U z)NL5RDYoK>H$iJ2D zpg;@H=qPM7*wK<3&W>e|m5{OQMX>wlCu_ZqR|Ki!CRG!g{}m&*OvSZ4?WA~bzAXae zz-mBaFH`M=aOA(bpL-sn>yI*LyEKXj$}DClO2kix}%bK}ti zYWO54{#<~3GX%g{^7PB&gqcZ}x42mZyM-=d0a{W4VRt7TZb6QGIs+&uq{tSoKbBTomwui~t}iDjEZ8&9Hk zi)#I@&?(DCH~h2wI|wL$u38jJ6f0O0 zN>=3pP--B(^7r83x2bFcNCdmJz5Kc3@8h=QJ1Fh}5gWp@--xt=&lKVyn`r1-{vBbd zkW4afmn6;rU#(nyrUM5=31bCzKqN~|@3AxOS1!7xjGetUenK}5W<#24AfRc<>atF4 z)8eG>#7qa2-dBoZPaV#8!Q83eS46>DI-w~Ox8l2v+>M^|iZ(n>IZTaOQy81N+%r9; z@jV-M6=1I>zk6q#crzyM&qrVBx+*GT|76-D{?_*iAp1kDbc4#?xmH|Auk~I2YtRGi zBwco6=00)d{M*N4C-=mQ5`(1FZM>CE2XA2wzN?nbMgabHYegmV+m&}p=l5?!R?%I~ zOO!w?gJ(E?h_eJ~79^Gj+<1(7HF3F%lQ=oh%@;H_QOV~NEP6>#3oO7IW0Z_0qqNUDMfYMz?NNr%6BjQzt z%U_MPMWC8~0MgnhET56WLAtrhqLxVF#totNwn67r$C-^=wXGX79abnWvkAn$NoEr;?w>o49B{v}ybUw0h?LPk`2E zf?|em#@g&3EUZdG5x>FAHF{T?%lqr;B3@8MOgING*i5QlYknW3Uf~;gh@+(MsAQ$j zob{+=vjIl~Y&E)A48jAmZ@ZI|wfzYj8<(`U^c!=4ZI}5L5|q{y@!Sa6#%1D#G(j*S zoU7dqc9hB8?e-CG83@%8*#ky1Jn&h2glTV5ow2KtrRABb5bJ6GD2bU5rmJav}p+G2Wh$2|^`$}^qn zY-NDhAYA+CB;ew`5jWI*|{^oNxa&AjJKa>l0|F{1CZfi3Kcy<0r7AiU$wc? z4LtA)?TsJPKR*3(>{A@amTWyZ4S|!mVvA|_W4I|@Ly9m(l+dhMvZ8-;_r00VaZ*K< zDNGf_JCWh`1~Jp=e+k(=UX#ou0fH9!!ONREFpIziI;VAXS^tt|7?{F^kgVLcT4}l1 zZlOd>J}&T-EU0e(aV&I~O%S#s!2wO+{rQFipg=wEGtrrsSEX%3&w22W|E?gN@EoYQ zh%r8BFlB%3eXu9|`2&Ezi(Fc!rpoLQRpnR0gz=*-6Jcte8$z4#=6i9)d6H2IK}$uIelY1+l6IoVrbLR z;V0eMoqfyRmDMSeCHZk7I=24!naNRXQADkg(9aUuzUNVq;{W#Ve{hJ9mZAKhZd6u_ zMzcRCkON%D?y*f$vrz!uQHRfa;b(v-$}9}#A#@cw;gMq(U)NDJ-CB|DY@;}~)epQ1Rsm_-Y)L0HfR(xu{AiFa8vN z7rl>Xm0p{Zf$`pd1^|HF)qjIa&g}2Lk2&y26*WhGquP$ zGZ*k#HTPB8MpGe`+WH1|SJ5j|MnSWcCBtL5KKZ(%Q7Byfi7ttNd=IGmGlf;LSCSVV z4Jz!;VCiUzg!JFfxX!j$Gl<5>zs#KAZPA;3+zU4PFg=v(q5tqwUx;m?>hQ_AcC zSNE~fH#?JEfE2|@cc9Y)Rn(1y-bR<(9c@ariX2Md{tmU8oya|m47$bKSM-KyHz=q3 zZEDJ(r~n5@>AfOfK(A3S7LFsY)GAFa%}r|K!d1gHVPu#2t3vJC?*nUfaM>>HL(FKe zcm2y<{YwU$1>Cofs>QBXxXbh56;IoK1#h8p*9uItThih_{y6x_k{!&86)&euK6b?d z9V6@{`Y96f)4E>NS(iz#Q_A!BF4P33`9Kl|y+2;YTD6bs{Y6VS>N>~HM^Z6mmiFyR zSPZ5Nc}&XSmV+>%`UaI=XlwG$;^8-aVlwD=%i`ct+h7U`B5AfiQXdL#4eu+Yq(x;v zFLIRD6cg^3e%3Zjzv+X;_Om)GQdQqIa`F4S9#GuNkfKF(K(gF~Gh3+x&Yi06cqsGM zmFq%&?EERqBc}9M1ZBIw$vZj<{Vlnmzaj*L4^n_$BrpBA^2;01`ZhiCbZSFi7dpKW z8_nS{oA&}my=qB3d7{P=r`)ijRo(gm`$<+P9+$j(jxk4Rt>`5xUs$JBL#%f0FCm!i zX`-_N*EjtJ5>FbcZK!nW1NX;>OB1~{qHFZ5Ucwl9*}?HA!Jy#B}-S`o+3Ik zBPV>wySX9U65-)>XUCiqr!~-`phwil=lyf;+!x$DPkQCHunValZKjiGv zOp7{OHy48<R<{?D`rbVQ=g1Y^-?mSfOLykpF-Sae)bbfc2t^@<{_l zZGFr$hW1@cm4hGmvFE*+;W8y!s8i5lN;o?vZaP|40GQ#kF9wt&J#9#wZ|1AOv!)@F z>z#rWoPK67zfjlj?86YkLp5N$1a7wnFPd++o1H3vxcR|_Y6K~DjCtGCjSO8fz6u#o zVi-1)!RVV5RFNpL0+ajvI*iCE=NS%1{Xr6G(C#OPLM&K9&_oiQ+82qH!dk3!C|30W zPho=thqZrl#o#ovE}qnYRSW@)X`^wn7B~^{*)ZazKewmd>N#;s;u{#g>SW!}DzfkYB0p55`xu5@J~MEQ4rT`?roMQ4Y^+MrSGCzwD5uYE^QC*CM2!Nbx1-Liz7 zd*T;uzWn-g`&=@}t)M=iN}*4K)!s12O^! zR?QqT>0BG!M^gXbM{74pva*=8A|>53)*PQ??-^#xCuZ2yB6Z&c`@_?`GQBEx_ zjzaNCo2$&Jp=ryI1;_N4#;tZ4OpeSS8cRmeAYNcLJ+tG7s8+qi<~250&0uFjv244n zabdTnFhRINgWeMB5E+d5Zo?qR_xM?v9XVvvB2T6#eUfufX zB*}cAnGCwB-qBm%Tc-{98^W^sa&(D=PQWOp{^rNW`!Zk4+DVhA?KL=?bRf<%X=fck zaD#FdN?%n{7={ZQkF}Xuy7br-x_sB53gF_tf9(l>Zc(L1-AN#fe%3m@T98qt(hEp|XrVHE=3p^m1MjrK0 zvBaZ3ZW`mTxC%oP`w zBFu*c-(8?ecR3}hF)H$3UaW7B59>bqg7G<7wObv9}>(aKg^VE&BEqbbJuLxvn()par+wu_WSPY z+T6S5oh7;fjo0m-yj1sMq*H*V%Q6seGpwa-z{Q(_$>M$pM{7`&ua4gGexfNiX9=Tv z!zq!JUNM=Zg~}dH(4Hphd7=~X=yyka{sh8Q^<;X`dcd= z>>b*C9nebgpC<-qpWV$)^2Y21Kio54hXbF91tc-F_&^B(cj|LGiudEsX4aqXDia`Y zS`!8`m`)btWdsbET!BCZYQ;5F7Hu|4)5KDE$pRj@-iAMchB&BZL+NS{`2;-dJsSy~ z7nv7uF&`UI4P58MqSJnT5yea?&nIO({QWIzvp>>)RvVR)%Wi?HTakEK2Fy-L&z&wa znm!_G#LT8po|q%Z1y4OS)#3GQ6|vht{-nQheSctZq?;28rrn&YM6u8Ojcsp~J8X>7Kwr1+vz+hCF>3ApE2MUre z{&qY-8jZuKPt|2PPP5dMVOKutdBpZfIJt)~yk&KF60)aoce?R5NZR#opCc;-w}?i& zjLO(93X72xQ}+s*@bc5+1DLJlgSWP$j>UPaF|8;j1^T`voC!Tx*dF9acl%k%W}87sL)?AzFY_f8kyEO_9sE zaKGHte7?_IYw#4}a9q-+sFO%-Dghx}?2$%ypuh0$4PMO4*_r9oBZOk>Bg+hc(c)u za>OcBJ;Y?tjv1oJW4P#kq>$BQk8^=Pf1?46PSUP3Ty2i$bV)CH9HQ@FbutmHlM9jk zbwzq?+(zHbc0M*}Q=Tt(Cny6#AF^ot_FlO`cIz#>@pgM?FljVgT}#AsS`B!d)^HYK z%jz~iud@4ZWQ8~wbSYYfGZy35;XiL+vrteG!4+2n_m||KNW%?M{w(bD@}{QKw92qi zSe0C9r?xhUYJN6W5;2vr1kgp-wqNh9L&*(VA0rVms|#r1sn-oB3H{!zEedKieT%(J z!q)_I`!J^3Wtm*}#oUyh(=U}_PY^tl;wjsr{cij-Y@>ZqDVQP9GSNS?%ZvvJUr;uC zadD7xn%5_r$1&kLn?rv|xsyL}bA`o-#|L6Zh!1#B#+;r`Yq`mc3N|90Z>_ER zm)}ADNQ$CDQ$j%nE{C7bdh&dq)K$pAfC&~9LcxGREvnG1qea@?a%`2`W~0N{+md># zRAvZ~Px%3pm_zYVqz~dg;1HY+PYDJ^l`B$01)*x!>RHQXGZz%cc!e*z?@|6@Cx5CQ zwFSvQLTofjp5lpx&`hC3$(Z%q+&Y;*+G!~NW;U*Z3oPG!FKw#Nu8s`y3%cZSoAJ{5 z?w10xm>%vk@f#f$$CXaFlS{?%T3?PS4R+$@iL*Kw_xDl$sGyBJ3{iHsU1~^E^jP`k zSAgX_o4E8cuMXL*shCsA3lftMX(-o#5_Qad z!@C^8%~3W#5L=i#S{&evb%Jj)>ZcgK&=>T1U&%E{OkHeJP3^)3=M+dgpP>xIoJc0jUWep$U#I!lHxV z@@)h|a@xG*DQc42T5=hf-N8zz5@0+vZ(+L-wk%gbyDJ|Zt328Z1eaBI8ZoFO6o)RM z4$UoSHJ-&exzGFg;H{v^pSSGU;1wwjDF=_L1d@@2d1=g0RyNGc4Pm?7@=;B7XSDe~ zga-WG8>|%2{>@a3%_@lDWf3#DIuVdCinQ1vufg5Te4pR1d+q@ z)oVpj4Nn96KTZhtM!cR+F3P{tFXlTKX|>y7T@h>sR%P;Aa09NYT8^~G3k~?%a}+Zk z1+BJjw6#CD=lbj8a@%~5LxuuqD)hj4Cnc97>WK}O##DT$NVayHU zZ|+B|8(h!A0@ws^igY`?sz(*z&IRpl8Grk%cGrnbo>W9Ua1Rc!QNtEm zDowdw4!N?>L;0=%R7C$m1_J*;2A#5)ecQEwua&j}h23*V51aA|KDN-9X@5+$4d|6+j|{GC&D3z2s3jZT3T+X;FMlOBr9& z(&iX7kloHC#yq=AkFE*Fq%!v{vWGS;p=2asf{U5Vu@R%91tOGzYvY#Pzp@x`o_@^T4sw>YJiJ5{XcPSn=dx#L6&` zdtte+2t&{d;aR^>+SnlES-y0TPW^%PHW$qHw4Toluv$blXj)E}nYKEQ;XzIbLcwP) zt7sMJiYdN}eu|_dT@2QvBwCDUTy&)cf7lB{d5kn7{{2h8)h|U>v&6zIllcLO_SOp8CVjV_oUhe!I+4~X`tX4Xodh>D{?H+Mp^$T~>I?qCbfL2@?E=;%1 zjM&&f29|Xv_X$=8Lws(f^K&5TO!T_2*9)yZz5w9c-mJ0TK)ZlJVj*$wX3dVZVax8l zO?ZEFlS9Td6E0k>k#qkOC#w0ak7r?#4Eki%l4q!llZ=)WF*z91cwYyqrN#O)FQ(9Q znwva%!lvN6EyF!E2&mg=n{azH)fXImrP869^coXqJFFk>Q8BGhOl`y2Gh zmrOqFc+pq*i_4b(?upQ~Rzi+B&lvGahsV(Um|;5wuo6qSKTmKwzdw;DI-5yK&w>yHHm6< zElWeZP#$o(qmfH~`Kcl07lF&}S3gTK zCz8B3)yZMM)}pC8xColcG$=QqrxfyaQFhbHGURpWF9jE%J)(?xEEd-j{-8<9ub(T5bWJ$L^^Pq}&A)d+UfXizSG!yN%k{pv5*W!qul!WH?I;1ETR?3y8_6XBd(nSk&8a5)_}C&lMwgI!Bj0CYpz) zt2jdnZ0ulc)>>PNS#2I1(G)qsN^v`xEJ?*tUEaGvnXp+WMo_(~kgBRO)3U^O23$mD?CE;3h!g7|Dd8JR$S5!lYw&MW8d45C4^5d)M_^B z;kGM)Q;_vSxw{65y@+ynw-bRvAB!l=#pqkopCUmR6x@5l&^5}%m{-Sh3HcQ8Df!n` znTU`KdGdJDpI3P7F&>Aj)SpA3nK|jj;Yi|)XbHxEef)c=>BI_f`NXI3`&=y^a@zgw z9HCOUD1?nX%EX^hzgDO8W2AUqz$Xq&HYtU4*#oW@i>m@dg>aM=Kn}j3B|25dIEnMQ(JYnjc_4*=vYnX3sh>2HWO#M^ei>z zCtJOPZ3UW)VhY4fM!kOlKtp$z&!6z{>Q%=Bpl$t%nk1aUy_G=?-D(|^STyN*Ivlq0 z3w36kk}ZD6K&MEfuQ_~!m*gb6d9!O-*_2M8`|CaS+#g^Nji^&;iH_|Xw;o2dHGx=n z7~;;1tE$nK3qP>W08ml*RO*w^57-x$OE(lf?~-1=U$I$DG?JHA$;zs9o|lg7$Mr-f zOI!{cj<_%I?;c9Qh0Utj)&>S7#owHa;6y&{c*5aHABRbyu3xRA;R+bQ#YYc(+=2!G z8&a5$Kg1_d+0#E((aB39Sd;JPJfHHP5mv{1-TC%mi1LiTHii+%(rCf#6yt`+1i*Uy z3}Arm;T;V^kN|&?P=_@swQ(VK7TD1&;Zu4X&8yhkNGnn?ZEo8k{b(>Nt>d`XQIb5A z^bX!ys}T>OP#H_UJR#*zFQ=w{s`V`S;Ge*Lj^Ove{tudOB~R=X1N zx{YvH>!{eU%b;t-oLI4r2Ou)feT@szzBaQye6m5bP#X>=ppN~wXg zi~qE4U`Sw&m;K3}ITJ}c{}4n4E1fidjrrsYcY5!HA~bfi1e5~TM`s&z?--!liG#5n zrELE=J7dx)4gh~}0UA)#hxLO|sQfKhRhaQg$Cu@EsdEY5^iR2Jh5b$R%GHvbR~4T$ zWMV9gfAO#9Gw%+Amur}ssm}@{|K}mYA;Ga{rKbt{J+9AIYmBXA(^|i5%ssPwp0j$X zE20&qW<06Wb!`5&VP%o^*<;%2?~WKL1%^a?4!4AYZWDF-C#6(&_@_pnGCA4OJV&=? z3tu>4%0|0cUJaRTg)HGamq1Ibe(HaERR7@h|3uhp$LhcROW5c&rD6`@ey;oY!>nlh zz5loJ^qt6^u;|)L!qkr~6uH!?lUJBvw};Uqx06}_HdU&CWTrB$sX6#sl;0aVZr z`7U4Rx22H*Dcl5<5jin)B)R7EGwnKt-M@#dt$MI*P#^r^g1$&&9&s4K5%GBFf#hXN zGlW42a6AJHOCHKg)g9vDuVvBw)vhSOkU`=h`kVXT*81Q702n;renMg`Z6UKnGh$7w ziwGUNn0X}XKL zh70ONa!ReX%V)k>#phS29=M{uu6XpdCxw=R8iU9CWjKw2Qt1vi7}ab4CWcHhMi@*c zg)GvsS^Ym*D#zVhmdxuGN#nV*&hnL9=#1)bm z!978*U6*~-W~T>CB!g$6yhG0u{5p_5k5oK7Rr?03xwO(GL;`8pxNc|MTON@%8R!>@;BV2Yfp&{|>2wm4a^# zRf5`Eh{`ddXiwIxi=iCmHb=cTW3RR>JUcR1vb0*KodBG7ccW)u z5%yVX)6}aM4sAD@X;bBUQ6!B;3@&GMz}Y$FO4rMmV*xK=;ONZXoh+Qhao$uePadMN z)7q)F#bMGfn0H+LU5SW>*QvPU*5ZL!k9N1w1FO^EK;Gf=6h@mur%-FsU!O3=_p_5% zseM{^=_^3Th|I@-RIrkO$LbtPPJU%*jo(capCx@0M1F8m5F^z^KBGGfyVFl^g7Xt;`q4Zq2BDy2CPxr{cd+je$A^$PYUs@ z!F$uHO(17%S{$s@6hC763e}KOkTcuZ^W8t}f6Uu8DaQ0Jb)_6>OHyKwAo%&;&z%1r z$N!0+bkZNXnxOt)T+YV!k(lYz99KLpH}& z9gQ3-o(u_Djh9CCitxPSGP-$*VumOvQndE$unR{V7t_X8qpFl<_`dObDc4RU*Ib(B z`)RRI9}GFo%x13z+E&k(ph1Ll)?e2B6KWzriYS&=tv4G@Z`g?WRUtI>`aDzkSc8QJU-pE@ z*UPhUAoR`Hqzr?zf7ePZ1@8~cZ_6lOEoq@(NC03l&p(H!Nc1NrQ1tgitBE+C`Tqa$ zvs&i`g43OdFK^JA;yc#F%+Pzvd4!bJ6m@ZKE@uPNuI7`?Ca^;k`>TC)k2%rd#4axA_0y z++~K&l>&NbxdZIda>?S2n-U0<*ZRKVE541DSo>crkQUnQVH*w>qdOxAG(lm+0s)CJ z;*(sCt5cuDQE2Rbf793!?mHe^X~Sgnu|YGoE`TQ*%0tiE<3?WT@fO&t_pHY~=DR7rPnuxZ94%ujE&J zS??*P$Oqz7XF%XmiRt$m3qk>pplV}{pghImaRX9-p7GtR7^pHbDQgjY0UIjd&eICn z@Y&nt7;84j_qg9ZGcB+|z?x`wHc?GyHm=<7&h`Q*9ujlOiV6K1`T^s)k$zf2%^Gqy zdb+y1Z6Cs4fJ#g!M+u}eQ;Nx_L0@}p=A#++(>}L(N=oXS89alQ%#HN_mW}*>o(%ta z(YMgAcTyQ*g?1ZJlA^r0SC0za&2;ZWO4N8l?UW0Luy4Za39jhY=+baOlycV zt0I1CH9aGH2hxzY?cQ})=yL-{mdKXpwByp-%96@83kdX`i>lYxG0hr-X~6PDf@PLArNm5z z!Sx-~MH)ShZKcN5u$!SR7c(nwrEld199lO)At5h{!$og_V#}9^NC@Mne(is7``5hc z|0lcn-+yJj4mkHG$D!MHXj8-+gF4!*heJHA7PIeyjT-%XhTq7#H#w{obeq#f4>wgB z$maN7k)uM#MnOp78jol6i}>8FxFq82KEjuagHh)g^;+p?j)6poX@>eMz`uTh(nOCGqC-oCEt85tMlymw`{W!T8*#Cj{4>Y@0>^gWY> z|6DRS_p@I;19jS*qjxu(@VW|^IM6o=gyJWFb6G+wu5xW^b3xVp>!4U5@z?jGftb#u z-kuIivbSe-02B1SRu#p0waZeoT(csRc&Bn8ON)0Y^~aRyGlPyzhALi{j1pxuHUfQg zMELLyfGCD^*_D|rJ}MDdb=uB5P65qV8b~o@sZ}CLczOiJ;($`*kqO@Z%K@yl2=cS4 zs$^(1zyxJEcF`xT{8H?bsjn)Of-F0xED>6vQI;)Z}3Y54}lt?mzkS|G|5HWljj<01^D8H|SexAY*ngUx&Cg zoRBlDUPC8q!0X8yWLMlu!?rWE8>tG9;6Ac5UUbf}KMf=?dSp?MWs*$xB4qmjR9Vjx zA-{Yfc2?a#sYl`|-mY6kchl76vwTOEtclZKc#@%t%PhzADW){aZUw$hU<$_`Z^^|* za7v+1K4KwKo+0fSH+H(*eGmQ}=K6*3hWPRGST0|@YB~5TM42cwaQs=!?eJDcq~5lY zMyOk@*-crh-TQ$PAlXM<{2R6;GO4>#-*W>J_=pd1J^~E;BV_ksx zgjiR#N1-M`!L&Dmn6#qRKzO-QXTz6eb$4V`x5>IM6Um48vd|^;JFhmrX`4llg~)NQ zj_q7&Ztff!1cY89otr$IN?)Dy1m32qB1sh9kKrvhXxToS^@cREfF6O01tGZw`Ty`8 z{}cSDFt0~7OjKU&hm^tht|uu6?C7)w4HfEuYqqx9`^olr5+Rih)|9=m4qx{AKu6$f zgMlLd%ROg}4to9$!=gJjMJ3Z_|5q_S&UX=>RG)^V$MUzlbkrH@8!d8q3yPnu-AMl` zr1Q$bRFoIeo>hr1s3cRl%T`o+o~)Emj%Y@IQ|XJI;M(g#56D0_=&<3~|w=T`w znGUf?tg^XkKh(SM!5bN@{tDq8{0{hgm4LuxOG8H_SGPkLnN5R`WW-QKkUQ_D@cxRm zNw@weqKn`0$@dBoiX8!HfDLy2lDex(zdydDj@uLy~MMajT*fpn{6WD-kZ2(Q!RH z|HYkkoYM&*S$b$w?sAm^*V{gjlu0DLhx+p5KC83O=2Qyzva=gdz==>BIfGk{Svfs#4-sg#y0s|i2ZowG%}>#az&yAbK`OZO1AP)# zL=J7R_;)O+l#PnLtlEU{8ILK;t?tz8(up+LW!OmE_>lW<<|~b^5H&M7-f6ila16O} ztcp8R2b^YCJVSFEk? z|GD`8Z!pgCD?e;mh#h`_4P%Z-&{eu2G!BRH9lH^P%H#6-$@PSgW{X!WNxHAkn;jIe z+5zw<``F}yi%oBjSrxRF>lD*$r0Vi|pkGYO-4bJgF+ zx*dwBa&Z}R`zHJSpmPd$l!CDMP>Pn4`s5_hTBaEiwrJFT?rT!%|G|iqCzF!g8Hhyf zpC;huknUpWndN`NX0UeBbp1+vN1&L$z-30TFPwJ;CSL2f&y9X>-o7uQE>p^(Lq1%R z6a3n{A;+*}jtl>X#L`dlVgHK0)9Dy!DlSg~WwK|1(h0nEZfvCrNw%|JL$G(fO{YxZ@6YP9|BX?;4t;I|SIUO!pOn3QQp|7*l+(IrkX2a?!+Jgv3 zf!gNvlnkslVxCuTk%qNOlq73u`R?Z7l+HEpC7%~7HbxQRxATcWeyx4$|Ea_HKcE1g z6Y}=_9Z&D@!`e|vBhhtW$}|BeDG~CccH}c8<)0pDOtTcTQv+G44>tJ$YMVpB_ku@P zdss69Oc1otx&tJM6_84ls!IS=Gmg&q9Ky=u`VlC~>(m1{OO^aTvk-m4Sivyg-nTS2 zIT%XC11sk@*AqRiFMli%$!37`y%eLY^9 zX!`NN%R@SbD=YsUo=(@T4}2X63)c0gP!Xcrvg-sD+N2i$T60Jq^}H#=#%PAb-soBm zS-onFbUs}TNmBXTPf&(Kt+Hc;F|UKy{h-EttwZFWY&!q`D=2KB5TbuWqlf{DfKmD} z`aYXRa-PJJ;QedATkkb22A-+hNc}$^*8i>K|LX;yRllN?W@pzfRwiN`XhX?0dldWg zHRkL`f|t}+L|g$v;tMUt5!OtL@3RXT?eQ@|`~uy&w6^D$+@0FaVbrj5+eqP?72k_Z#9-y=2-GZ#EUly7SWz*39K289(T zt`!5dTjM;H`(1jQi!kdB6NXeMF0CY>VfiVI60_SVr?r=C()oTk!LM9}3is3Gm7*58 z0`+9@q^)lmt_=q0!XwfDd=s$Z<^-}ZM92Un(D38&4FCE66DEYi0f^rJovpl@sko8* z%NjH`jfO9gfScHR??>NSOR94DbOG|mvXqAukV$r7fdu(&T%9iYh)%Odpkkinr}+Lv zgi+fq@y8e=-G{2HfAs)n(NgM-C8qyQ&4&c9On zoE{#Q{tYo-t_Nj*hm48X7{CY{1C~UAJYLduie5(1J0tBC(wl~X2erUa^$73|bMYK- zLkq_#LlwVOOziauVd%8E((AOCkcNniVfLpl+rFf?(I}^aovVId(YRHcWhb{!BLM;Q zBfhX274R8REXzawo#Os`kMUo5?>~HTQ4|QI$7?rp4k_q!qlM8M)UQ2I*?gV*1wMT? z7AB}{6+wj>Afe_1s7Z*x3lLL6(a9T^z0nSF7&L@mFSXTvoO0_IT7IV2Q^g~S1-b{I z?NNa1uK*yIMVfi%@b>+#v5UKVS5AlBQpHn+fx9b{m2C=VWPzpkjYfBL`@FZf=q41Q z=@Wl~w=5?y?XE0T$k9M*Webu(vx%XPDUOoGLK&(NzjGMES?O5I_&rz9Zoj&GcwRZB z_oLvD;ouswR_$1P$qeXY?cg}U!R<-g%kJC-t{eAnmnw(C=5pP(kaD2X9Ltf&F^OO> z45$W<8dYdADZWQ1fKht<4%O-hju$DeFH)WSm~R!qUdDmMZtIHN{pp#%8ZQCU7p{92 z6O8^S2I?&tz3<~x{fATc^|t>@dFZUMe$>G^nK_;XJZ;1JU4 zZn|7L9XiJG3NuN+XEpw5&dVA1&&xX`2hhNW+gp!PMzRH91MKdDh11nF?w^#fZCSjE zjIJ&*Fg=&Z6oRs8!ALT59N&f~dSZVftyHC9FBuKn@nTa3lXf%1DTEy+%%?pl@>bF` zJn&@&rngePtv;@c%0CG1#V z4p>j69EBvzu~>ceb$>ReV%aI4=KlVQpjff)qwgw`(glGkLv|rJ8!b43ap7y;d-rRE zi3=@N=DdJ2Mw5{%ztmF~Od0BA(wJ8Fo9|va4GAoOOlv$}TI!?W@5~SSogSg?@&zy4 zGELV+XghY*4GV?3jBCA%%Z1UI%z7gH z#NBO9Zpy?P#*+O)&Xv*}*_UX1tNuaed@5eyTs=Gl+y(uxKi}4k2pc-Ggm@wms6}o$C@Fl07v`}k!05a%a?bw6QFYrOW zVVsgiXMPe&(EK-%t0t$7EP73)PfFG2B86FO>Uq@d0|z-*Wv37BdW~XW_F!yK*(kg# zH4xif4g2{4uD|c9e|urg(e6n}kVkgM55>)_;rLR{%{#HKdi4J-X9|CB?^aUU9W)%^ z93!b%48!)qq~@>bTkH>Gw;lWE2hp%zQz(tXwZZ!ug1XF{UitA%fu$nnD>_wnMxDxJ zuY1>e1$@4GPfSqAVZ~-}K+Nv+xpzdNgVqaNlNGPC(!r-CkVXN@QU0H3#!dc0!EIU- zuxKi$71Y+iQ<{n=*Idg91iR&gRKSaa5pf_Yv49Z11hhv;^|o1xzgDAG-N|UHe-MJi zp3u9YSYB%5so-oyZt!m)k?1skiB~WlEQyC)CtK{1Np=k+?-i?OkRh4?27>nHd%(zu z(La^v?}C!wbzcHlCxU6RVJwjY3X_IC-^|Z=xXuNzuJKngh2WamsVQb%e?^%N`|YU&9i%x_LM-+BvHFanyxx9kfyoCX zt%m#^>^9nZ+5>BFVCVZo*i%J-{mwSELeUwS0pvX-DChJOAlqqkU)t`uUTibU{oqzh zRjp9;jiLHPkwYkOKh9@YKc*}BM-0sD)BiWby$S)-VklBM zsYx!sQU(jLfPd>$fI}7Zn)z3f0+VrA@o0Cy-2+$!4D0*{Bw~I|wx#a60xby4{Sm$9 zOw?poTeQR+3z)vswax|=IomX9pb^L=;IvViECj=7$S13OMS9E0`aqYUfb03RU!#zP zjLXCT`kp)V9+^|#@Ot}5tMTgzBqacn$8COhI>$J2dD65LrO0BipipY!hUp+{su+&V zd=nXxEgZo$^EyZmhZqB3f3wr`mpclq7R$lx>JXL(qlJ3#KgagJ^*aCh;xcG8W(6DH z)g$~X{h9B0lhKi6kzxL&Z-Oo6Kb>$pHZXMCN3=+#mPGr^q8Qaqcu2qIy52x)#K0e9 zEXfoCFqRzo<*-`r59xGHn}kqx1+lQZ!yaMtB7P+NJs`&X*MPVH?G(fgo`Y1yj+Z=* z{wF>C^UMCKEdX)0kfa)BJb8a{HU@&ge}%ygOn@x#X2cE&y9^);6uvX5LmpCq#zFLm)sxk2!;!eTk^cFZ|Hl7UIg-fQjVP4Vxkdr12_`g&bt+4O zwGVFSuXDc2x3$2;f5FCj#u;y=j@N%(;w~nXn%0^VS>mskf`*S~#v+g?vs9Ye#H}*^ z%)35qVFXq~$Z?o|@0^SH>2=ckpUxjzCz@GHfhYVy^wF^_6Wg#eMeje~>?8kLuw)RW zk1lahkp~{1eXYLXlP3hxojQgaufDTGBm=k<8mqK`&H*tpf# z9NB(>Td}v%8wsF3Mu@mfr4vtf3BZb061VH$V6dRF_)sc+0Qj|9>(hT_OSLaqssWrS z_y4*fN#v_Hhj}>Y-wb{S8>IV);`u57guX}xzT2$K1HQH)xE~?e+w}pL3c9GR+?{+( zt=vqDbU;KoMSi_21RL#TAA|vvjVjYt0RqM)9mc173t+Su?~1611AqA1H9!LC3(P|q z%HT1#~YPy*^Vpa_hyy?mhfWseby=vF`z9X##Y& z^S%yTDz1|nzY3YrKzc21AY^Yd`g?9r;a;U7K^=?GB@ZP5ZR$`+no*Bt*HVZ0{A)Ly{){1 zvkpXndU&Z9x|NL*RKtIUH}gY};iikx{{&VI}p5FL7%J z6~HhZkLJ_iEXM=T3DCM--c}B|h#8HXmx+5->3mxnq>4_g(9WycVIB<(O9cMkERM%m z`W0URh2cz5)Oe4=$(5a53YzX6HXu1ZZOZ}kaJ;-1y7!*3&-4|1@>VM~YVNv7l7~@@ zh&fAnVOagl!N6MQ!`tH}ULL!BwynYRDTeu@pY${3698;>ln_e?vX_pf%Ufa#RvrLU zG$^4&jGCFQsd7H9_dAtsyXWzi28)V7wb@{Aa?#J%Q}cfI#eEH9sop6Ja8i&jQly&M zA0XPT=U!m`+Nb)efr+7k&$dJzp&+D;R-*Lrqd`;wccbb}Njpk?TN9HbQ1>>z^Ub?3 zXCsAsGA1E2Yn*nOWiz|3g4Rg)VjS?TH>-i@n^%*0aNc05KFGFAHbv zZMlyWj2!P7P}^P0>CHHvGVghsPr7zUU1@NSe4b9H3}-S32#zCjRg8EWC#e*OVjAvz zM<_j^XF6h<-1fPZkInsDeS)j19Thd+fr~)_Ybw3Y6*@2!?ZF=r z@)_bpCs)UF<@a`FY{5$wfRNFS;P3f4Ui6&BdQbREMAC@d!YkJc>7GDs<>X!5pN{#i znYh9LlF{uCEZ|AP#3-WvS4Lja|IElEGcAPq41#q8Iq4&QzJi(|(fwn7}Sy0Oq~ z#S2W#d4>FiTM5}+Ah4MgKL`;*6;D|fdm2@~=(|kkR=#c$op>CE5paJ_6%S95l}V^T zj5-Rdx7*!m{xV2+J{kSCKUs)Rf&y7Ss1&6O7)MBZ z6LRBZ4u<2k<^!Td7!oQN$z3s@CL?-@;B4`jLJIHVHM%=Y3UCo!Xtkp2B=%oHY^Bvx zLdkRllc0EW)Q6C{0!bDtz7Qx7YzbeZm4%#l2Dc3V!;35++{t`{BzQdK+31ujhJXnZ z?7+F&6@&^SVxk@afC{?q)>Oa<76#1(MWVdr93Tf+ zmK;H2I@xB~g$O-VnJLWHKh!b<45}2?%|d82Z_ON^_h2j0r9wEa#3RunVtOS%ebrme z3#uUgk#EOlYoBHJoeKGE@6|E`?SHh)fbm62JQ+)K_ljc!6Uym#@%M1Vu5;7Cki2Ry z8|@w{^F6R*$MX@F5x=&6AZ*_D(8uyTYn4! zk>FpZ-#0mpuTh*do@f63}1(_7Z&rgixJ zHaU3@6QJL;=uY>8s`eJbS9W(!eLnl3egs-c%r)%(gnR(n9s?ag4*@7K=v}aP3C<9@ zbTL^wz%-t*Q3yetf@a+6_D#cLx4`0G0s_Qt-OAVT@pwykI`ZO+X*i1b(#+|Cdo6&8 zoi<;s><@Jd(85KOOot}AfD%_l3ZCSR+GFcm;i<1v_Yr=4exU{5-|I_TI6J2s5YkOs z6pp+AcpFAA`>Q13=lje)xOXD^$ zMCG{UlEErlDXp1(JoPMEXFJASA<_CyDEK3PD4n^{+hqnv$;q~GX2xPtI~NboWW_UU z_2bohupDjTIhYORngfm&Ep25;*A(Jkit%{*Ukte>eJBx-4pcp--=8@MzLp<*^|HwV zDZf9}qJ29WvH`4R{Jiwq{1hoQkuQMNAKGzlh6-vEc+y$q9xE@>tx$Y;~Q1LHMx zcda9Ws}1_?9jpX*uX{-APo|}E@807mRIDqx6F=D@W zu0p4im%tUoJ^nfju{$lyMd>c0lKFbHBoF9WaQ3Jp@V7r+WY85s!a!&hQ;7ePnSShX zj0snvuEw!~?+V)99}kI4jI!QG?In(tNrox z$z{0*>? zN+nA^7$dE3JW>vTn%tbN<>d%mwu!QwCsnd(j)P{ZBN%97s2v^}WUV53y~4SF6Il-e z)4W#MK8PM)1q1`i#c2KozG4XC%wHsLA^KbB#1yg95Fju3@hZ40ORF$t#PB_;*ejC_Uo(U-`p&5TvcH>bZ?Qt3~6NHL_$k}K3 zS9l-C%ic`{uY(^31r-fRmVP(2h}aYKA~2eSxv>W{ z_xzsu^(zV`vW$+3MMP(P4%cVg_}=~ZCxgG)Om={4FNo8+xnXyfH?~>}v|v6J zfW`x?M}Te}i4CQ=_Q5_EK2AVKghSXS@Y60or2f(29q;A+5U(oc)hQcL!Rrf&O4>DV zL!nUUvizXIM@ua58Ubj;5|>+vXVvb`)jkM^0YdS;BO{R*l+wFrk$rSv3=;zVR4=}Dmj2qoFf3qlIqr6S#inwR}R7CO`-qLrgvAAFbv(Z76TdDr8OhfFfG0PMjUE&v<*pe+q|8z^@y?eF2FOnsmVNEG}Q|s#Mc? z17n}ZNR5!RFX60ZKGZ49@te@M=rfI>eru;|3{7z|&LP0KnW``@n=VeyeX)FTE@9v9 z=d+s4Mt%j0GtD?1){`KX5(4szvHQnPg>l%IAwp8$+9rOVZDYbunUfKgrxppDaMaTZ1UEOcGDGddhe z{4!B4r~gVX&X)qdnZC0tXl78)TalJc1|H*u+p47}99@*$gA&`^9r>LIKsLqfJJNAD zjehLRqYtnYGZ+fs9CYcbzH0h<0$L76Cs)_0h)QhQ(j%3VJjceu0S}VG4`8LrCwPKZQpleM1YfN_tR9sp9 z*Qt}^8l`2a&dZXqj#BoxJUhXzH*d92jE3CjFQgR9+ODUglUH8#k0DpeH?fLI zIu84qjR3F~;tFYB$~vr)UC8QGXs%~DqgE&ik4@z`Qff@wBHNHs)hj@H*>#YviIr}IdS#`ey1fh%&py54X+os~F)1h}g;Jm?uC zZF&FB>IOojK^v_bjH+6)!ITrs-#j{`p}MX1DqnP!27ZBvI4}S&T!<4g!0C2rH>lR) zWB2P=<(2{-eHHa|8G2#v#_9^+(1a0oh9llu!>n5QWl8N}B5k zYAFi)bKgY4x))VO$Z5DAhu9>?`8xOF^a_i@oAeqR%Nu1rnKgcDfKO{NMsx-=G4SEq z!I6Ls)Pl$7RMOD=u=oTXBl8?gF1=Q7sXD#Itl4OTG2G~Wj1oeNIDO99f-(JrqvPEqo3lj#waNM%G{Ka99ILMM`eOj#+8BzEsg8NdfoUj!SI z>4O2NvD8(JM~ip^l$(|T3~oo64XH!8VPby*>@D;nekm;2v0_P$uuz6c%YlSykM7u^ z`JcuFPKWxWUyfI5J3@Vc-~)@dH&?Y2N2Ma&e{V&l5#bfLxt=;#H6AmkbY=VXwfa0n zXFnfcHic0^E4fvwv@FsTx7)Xb4)LG7j&s)4ipb$ITrFA)p zI05>3I)VFaW?NvQAGLFDxeuyWEk-$lK96sQLiYB};%~Zg=apz4awhD0L z*<+_BO4EOQpl&kT&*82z28Uso(@mDzV4ECtyNrM<@Wer2jo+8tNYy)aQtOlTuCO!Z z==1!TDd@TWzwpv4k|!&U(9pX8e&MvvwI8LdO8;wjA1kgk-TcLW&hG4&O7)j3%_TzS z@m2hVA~_j4%|f4a*qI)n@CkFZIKU6;CSk^9R8xuiG<6WzJe*V}8f6|0H$3e?7@XGC z`zcpW%X{V_%v6z&9$5b~PSv3D9djk+Y4qP-0LK?HJD&;wXUH&?pJ$*(fFG7!jLn#m zZS-#XCQicv;kFRPsHc|k#kBb6O0j4i#0=vmC}SwSZOVSF*Mv4nF)=?H9SGm-mSh|? ztJ+S&PXbxf$ZhmuU~Ony#`davee)ty1dz14qnewp)O|hSl^mLP#6tdc<&jjNu3^UvurLLjPG*1SMD$i^ zUDT$*AGNpqa#{16XSeYy>;mM2ee=Biz{2@gwB%B^iPKQ&1L3mL{mr3tPE9?K978^Q zX;0&E7V~LaOMQF@zkbUrTCGI!cWkTu#<|=LZe=6Ael9;bqfE z(dPq=d`;4AkL;TA zJHbFT`Al=>cG}yS=mCJuZ1{^fuV6F#E7)vF-g)#9Bvee8EN=g~P>cjHrHx7zxt zfDj7DJ7hWR|M^=~w#$$P>R0YU)K)_!C@i0xsR^!c-kWe(W;a8phDH2u3hyYHLE`P#t28o^UUj zRAuvF6VPoolaotK=#%Rhmi+}J7qcvNOc(Cw@at#-nFNCM{&4}Q0=BGF;lJ)(A|u(6 z63R1$yCnAHDna)`Q1PX~7nNP!`Sy8FAvy4|D8%|gRQ^BQqu%-;OG+v5!H{;F+3Rkz z66sKeUgL4adFj-sVwpyk7SlNm|6uu^EgnIKH4Gs2pY#f3EMq@YE)>yK3BkU7D$%S9 z3BINPV^PFia-WCU3kO4ely(Aqb_fK44S+K%NtDtqmRMi$9+5bLa zn(N2u!?gM-@h0BR)P@k7YHw(sAzpN7ToS5KBULj&w%}XCzFvbf^wsW7)zTrbmNfJC zmBoUbzhwL+b`o$^ZMEcR)hS)@=zm^~sl?D)MHkv0!Hgl6M~J6>St)K%86&}%e$tak zLo>uS=K_>i#Qa{_MI|+32&~^WRSU||Kw?*4qxUrXvB}b&leN6gb03T1QA#2pz0&xSwwc#lP<8|-r3fAUb9sKYTH@MeT zbHG_-aP%hsC@wIoLQ9o#N^rO&g=NxxfKraJ&M{t-Y=PPT-oj|}B#;Mro1#XMg_8;?PVl|QN=Uyu`Y#GHA#;ucfeCiX(+HvILg)j?17$#BDt<69B zt+zfzq{U>`%_NDEo!wfqMdGkGqa_BYvC%YcG$?0D#GjySSG~7(QU7RSUEQ=&}*9_(wYmTg6T9%iy-7C14Q&c zFg);-SR3%T*_>XgF5_nwO?{V4>9*KSy=hKk`ozE(6v7_OK3zfIEaC@{vLR%Z*ZnJ$ zMYSqF;~4j)g5gxWW%H)%fb%*<1i+GIrS`@HcjAR)D?A3CGZO~yD{Kvv(gJ%& zE-+`_X`ALMNd>_xJ$#V?PZEK#ibEBS{Gpk2*an3T8*+cVBjRxL`$SUXB(D^bosD(` zXS8^3EUnmidxl_=R9TdrUkh;aOooYuPv%(r!9R0PH{6i&%vc@f_MfH;#TZzcZj~fh zdA}c!5l$BFD_777RChh{l^ZG=V_5_hE2dM()LKld({PZz{8Bk61WbHS5miLL@cAeS zZf5Y+E4ATDQS#?@5c>Ah#c>J~25PPV6%ab*2R3UIbabXi074RpSL{Fg9Yv~N z9*@56kG4eqfo8FjkUL^g9efvH2})dsz8qpof}1rn+|EU0OfUI>d>}tS|n#E45Uy zpi(`yIQ!;`fD^$I7A3{^!?nV9&&SOomsaQwJQMe0i-2?bY%<&J9^?s zpmpFy$f%W%seH3kD`A-TANo{xyqM+XFR_bgyw8q#L6AbTn%PdfQ(Q{WyKTiA)~ucg zS7$TMIn)fa)%MtojOpA{caeMw-d+4^?2O-S>%X2XgL^cQVW;0Mj3pPl0yLP>lscOp z)+7qQI+a2fAyjdhkE?xe{e59#%cn?7LDl&cPxUVr8E2WL2 zm*Bu+Om*`_3cW$lsNmy~!BQFe=+BVKBuDqeV{JmFi2?HMiJW)ZpgvkcdtpC)Wu}nq`VoT(s^@ZFWc>3b?2$VS7Ef}H#WmO8^;yaSsB7HD>xEhC z+^{!YI_{`w3>NMB(7*4Ek>as#;h0v+!zM-Pb)t5JtMT8!+iHaRL@p-yaG^w zp(zy(eoo@dh63@q`-5z*)8_xJNYnpE$(JDk@j4T!iL!j=yH30gx($a^7FEIA7M~)$ z)5j$)QDgpL39|NuG6CLn09|VI=k@*W4}fBOkxN)fJw_T!p$-ZR*Doawkitt8i{P#{ zM7stOnVn*AI>YI(;V*JU-Ot9Lhy_oDH|wU_6#Z^-SVaqa0VAh%F+jZu0|{X+#1&Jl z0qhotUPd=n{@&>Vs4!+iU6A~=08zjZ&JG=T(mG3e6HuNOIU9P%tD`Yy(jnRhIKES( zSpkK=6MhqtBTW%q?;1-JTKO%MLcroj1ER5vWo}0+q^v{}ulx>^Cf(q`^28vw3_JTE zJ56C{X+}Zn-$TH3ixLfP;XE3;3Jo)V>E{G1zlLs$D@F?Xob@!>93qwRL}@q0iFWU^ zb8I@Lyju8g^GnUv1h<>o&Vfve@-5)f3^44*W(Sfic$pe!4{mCVf~-n zr^4-u$iwA*^er1;sA;D4+VEpix{9Q7okCNp7J9GEhu3^GE(N(Nny9Gs9OZ&aAMqbKZQ+Ydo+8<7WV4_?xSTfaOAYBGZs;z+e`a0Mk~7 zuQ&qxey-XHt}ggcU1h>QH)!JLlRE~PmR|Kt_ zPZ$f<*TF1Z7>m{5Ex50zAkl0x#BSX~Jv{@I^aIKadnmxOFSiHu_@stfxRT*tC^L-` z$74c=?z}oos(D+n#V-b9Cb)t0J^xgnVPwVdlWgXNJoBGIp-2EK3kv?vP#Nlfqh|3z z{pIkp+C_mq8%|8N8Kgtwd$qq_5l$-;XQ5v!Ny3trBO%q;pF&@tV6dO-`60?Ap4Yrs zn~}{)T*~637gkWwC~PthUNHWXn`6E*tx~Xs@V)s=O`?LUD1`DrCd3XhwcK#dmmF91 z03h9y&`HMHkdVtx!>a+VNf@CjlFSH^r%f9;fT}3d{>?qD1gI#<%jHzk{upLI>Pb#0`cX4a30@{_DDS_f0oFRyY(ilIL{bQmf zO0B>*fQjr5%QhWN=C_7(V6v6csSAwNg#`lqwkWJ3793s~GM#6sv>TT-*$HJa0pT;Y zQcQm9c<|-o1zxG_F%^I*A#6ZW&rI&jx{-L!>w~ZGac9S! zuFi9_K@cV19-dR+6>1%6XRhxQ-@Fj)wIHzri?q^3fBF?e2i&_@^FWuX;QU;aOBo^D zX(+k4beaBj`ZUZU2wA>dkhq2j>d=6jz~){jvL2Vb*EkX9i7U4c+LzgB5kBc{!aUZ2 z|EV0}FhCDOe(N|uAS-You`lVXtgP1x{O#;e(q^{xZ$Q- zV41^c6I*@!_K-$qGzO!yv4F;}o8DHSpY zup&_?bVd{^%th0%ty{_FCnJRr)Y4hVwK)|r{qXUx{`XVu8KwWjnNh7SSne=4h#=#m@v6<-cf!c5~hjfx<2 zcYz9Pt<6H62Yo-JF~{W9a(rVU$t`i!V(%ahBo$8*uq>yWAKF*Wkz< zpERE{PMax|$&k<`OBQl+I|@_&f*r0fIn>g;$0M+;Gm>Jxv*vYk7UT(q&z#@U4M&f~ zKGLS6HS?hHo9$qXsXDDQPck5T9x)fEJLziAiSfRpmKKZsB-R!a0UX6@=1aDoX3!+5 zJ<|1b5=5_Bv=8jeFmC#yg#PmM=(y@56cDy*ayNk$igLK5lgw^?t2dmBYm)I}+CXmR zGQWqiN{o?^ZDVnIrnyb*T<6D(RbpoP6@j4AbS`Q6%SA<-O5;eahjmi{M;X)coqoll z(~Bq_@_J+jS61n)NYtC?Lpb6JsbaC3@_vPW z+JD9gU!BkpsP*qN4V923t%>~!xH=J52*;Mq@(;(5jZ@r=}O!HA3z3)#^|0KR?s&gf4nj@Eyp66-CC( zyyXkuyc5iV2MvW_jV&2Tq_^fE1@ygM#d2m2CurKcd2+=5+c4%3<#0p_{Ze_T ztn@9GWmvY<`@~vlgHRgT>j9kRVup%cdy@Te>$WvjR2-#MG9FsaF`l-WajeW_99bu~ ziKj1xP*Vyc6C2c@`aL6(n-I;M+&eYI>1q+hX+oX3C$7x6R6=nX=zX<&57=Y`Ji$0x zFGC-ix&Q)F?FeHU9`62qvJ=5pNNt)j2Xm!Lq467ftf`%l#LrSQ4{Zrnn-fD?Pm2MD zdK5tHzO}0gFFLrw2nCo>8YY9TAj*d?S8y?`5-4dsy1%7qihI5~gQQB^L!AH-M(}1n zu)wf4hUWKj1OkeS7is$yUqB&zz6%77slMwpo+jVir|TDwQM@!WfU$}Dv}j2V$-opr z$k{h>U#SsHiv?<32W&TYT0dxLJRbr}`79oWD6JJS$w|HupMQ~GSdX1hq%VyUp}Fro zOdPV9kRl)igxY z$_4W87~@Zx)j}*6sR%ogpN6n4xx!8to!wUuC1^qsoxL8?!ZTQOG+3QfgAv}=M>Z^3 z4pjqbn>6N|I*$HMf>ZgOLU#1@Va7=X&f)-zDP72gvdo&V;1@*yb#*Dw zZeUKMe`p3|znc{V-2W&E2g{y$*HUn7Qxit3u_-ove@?2M);9YRjwKoaAFuTv?@EzQW6&seTu zcnc9;gPI;AL$DR(bG&pYhOh40J08XgzdV}OATmF$>c^E$TT3kfcIZY)O?wBJ zrLjhbmZd@|T+EWf1kPgWZ)Q(RV-??|JT&*8V)!S!#){G)eqD{MxlWTAi6A7qS&siK zB|~teNJR03BxaPLcyoBhCEhdzmaV65I}5k+C&H>OZB4J4N}{npdsb2@|G_ zU0>Ww1G4W0f*L;`eJmQC{6%7>*(-JrytY4)rm*RF@bhHEi|$<@j&uZDyCbSYCA`kZ zjuyll2AE(>QZEK0je>q-h9ULB*W3Cj;hz8HA} zj%?*%Kw0r4KTlm^Lga1fF9NB2IxVmS3x z8cKU}tK&$pJTLc9ep%<(jE7h>51<}vea-|aZ#QIvKDimBv_f$X`#!y1+3$NO@;&j6Y4cZyK2WpxWyxx(eJ-&e^lOOMzbh4W%) zOQYxGK(F{*nb=QMDg>szPLH`IsodVbmpOE%Pq^+QWS=dPs~OMY7UK@Y&6ZEcia0#b8@2J;>Fiq47H&-<5`*7`@L(xy|m&k*7<{_<751eJd2t zF;46tMCj)~H$g>(fy{F->Myp$Q>((XpY}j{>wn5j3z@{4F~b1^ZJQU~@kO0~Fr6_) zPcgP=qOnL%#Ig&kW7pT#G+DA%AB^L-(`31n^~N*R*qmb?BV`YN=Et<Yys@soAW4z@Zq?J>hZ)?(DFD0v0qx zGZdMOe4-4IH`g7>%AXGQ4Ki7p1Pf|~V?rPlt8-0-w;ps^# zZm}G}#*Q;COHt0|QNlsp!Ytm`W%hZGO^z+YTLR1537#oiGHrLq$Pda1=P}Qtd*-H= z37~HI+EpJjPkC0iVLjQM`;OyABj%+lpB3|jw474nl87slE>_tNWVX!4luKiZ!fC{9~hjhJ~*rvQ)0GF>(;7uQ25-Y6!TurqS z9lZ0*^)&aT>&B2=x|Rb-<9V6QAD;1e0%oroYsVw^=lxM>anN%sPh4Wg*ZqUN<4>95ef$U9sWH}vIj9e3F2Pe>3t;GW?fgg`mH)GT>_aLYRG70wfgoL1ZZaCahW z`P_)@geLk)HvV%H9vA56PP3XDDv%09o3> z+&Do(qjp`Py!cIgW{sToaF)ru=I;E`2OIJy*SuCmMq%Lq*hClkT`+W$s=<9DQFgr- zOIx{-nD!fC{coqBis;TKbi1>(JGan2}RiXe?X=I}sxA5yHFY=L>mJztgxX@E2fsPgL`3Z#P^ zSG5tRa!*{HZ!S>P4b@djj9G0D#(D~#2HQkqg{ArWxelWMBl8;D6Fsuj)Q}90`GQqt znT+VYW}EU$X2C|LJckYyd*mF;F zY-&APRBA4UCCZwyiM$b(kItIA{C0Ii{=}`b3iq6kec7YP zW2rLIJR0yQ50 zm^@jl2r#sOD2=Jnj?>%1c6N(>0x-jaKUQ8)bpFz(nlo6V#@BxZx}0befkZt^iS z6T9wMIu|%A!*@1%TtJ6h9C!6DMhcL#y2An)2wGa&El0O!gPioqZ%!kbF7*pq_O*5# z?0Fjmwj3F*@)WNPFD6IKT7)1sqfHjhb3FM(k(&eYB0zq{$H*rW>_d)JcGZzTGkuQ%j8#iLxOZXb_^%TW!~ewfxtzmqCGd$>l+XAI0%C!YTnc{2S59KF&)YV8x%EL zYC_jlyfrs=DAp5dl_u-1uEA8X}pTq-sHEP4yq!6 z>ADEPiIX#AW@@@YK+18=3zH4Aq6qhVZ8)stb%fx&log#*%8g;gb3U_XP`;nxc$4{r z17j!4(3g@xJ}*>~m&2NVtw+&$1!{_qmc?jtV+HCXMBTxklmYhjSh({6%VwXR2?Cyo6mFg>T%&lWngOlu6vvBaO+K6m z%=06ihs;zMP-neHE%!s$f87b7MUmh-2%Hg%=*L0vbvhV*f=7=cBcGcBvp>N;SN5!F zc=_%T?qu*iDm>Xwa*VWLuH_^4UgnBS1|3p{e#Z01on5BG-;SHCms{1&GlKWG`s&iG z%b(iP%A{5!YQil?C<8vooS)>n{GPEQiE#4VqZtnn&HI#URyMm?O=ouCFGtRt4-Y_# z?YO#Jix4zi4q>%xa@2BU>i;=}Qvg^KAUF4f)9tPMn`5`1JWy=M>#hx=GGn(w3mbA6 z0R!xM$7kF;>bI(l^JuQ2I>Bcdy*Gh|)8{uAkqXeWx$;6k(+0FjCrTyzpoWvhn2y&y zg(k+jykkgBq&qE=QwC@R6mol}4Z1996m57KdsheUP`>AkNp)6=y@R2Q<;$2yAOt47 zGw9{l^+Ef<8vsr|-cZ$*jJOjSZxTrt;0l~9_dzu;M{zm7I2jhq5xVm*dnuS(4kF0N zcg60YdcxNu$Gj-2%xt_#LC@K; zRsEz$ajgW#@K_JBOz>%1MTM+Tj-Ye!xNa$D*Z+`E zWxG01^7M6|yM8TfZn-8waiXcM6gKs`O?_)r*G-X##a&jfhE)HO7k%HQn1Jc~FcDh9 zIZN{}e0x*}HHxD2fY&78cEDCf?>8(%XUns?jn?L-?d~eclcZ>>M0M5p!$5+7INGLc zIYA<`U2%8_isl#B75F@+i@?dyd(X|;keH_%|O+Q>0UW*hB*vz?T1#}|SV*e950 zwU%dHx@Du)NyJ*B`~)if1( z(q)x5_6OuU)ul-(p6w-`RI)Tnw+DNdRh1{x%)OD6!2lxiTjpda0@mk#El^(Pubv_I z))%iV7?J3x`lnZD-lCo+5TjWA_9!s(X!5lMHY(t2JzPTb`0byJ%y7X7oJjHT<(8K> zt5d|Wm-fa~cHUNC^ZDbQcX=E#{L7JAPnt}Siyb=r@R{r>P0R&0IT5LCs!WkE(73Ed z6abj2h4fo95BaMmClh>|M?Z(+yZbKa$2KmBjcFtM>Rvv1Q9fxH)RFbGcYbPfPW~C4 zZ@mOE23|&quOI!fP-CQjDq%gc6S}+CG^6vv{r4qijL#j%Ay`(gxLRac9#*!`JY%m? zn5VQ7U$J)c&V~ABCMf=#>ttsyv*%aJ*v^u5F4v}XZ&;snj7MPV<{nn;ZczV$xy2Xw z3=tyVcH@Q&R_<^e(tC8E3@CekX%r5<9AHzZP=51ST5;YKEG!L8&sCOZZ=olc=u{wy zdrrRnu11VQE>Z7nr7`fSB&iMQsz4&Yrpo1)H5v{aG+&&~Rabk&tynA^`%?9~4!qQz zXSnsHlPWh9E^V#bHD^QpEW^||4m)~ae#Tf9T83N4sXlDMgXk^e0TtlDU7}30koEyR zFpd0XyTC&1v+XVa;Mi>m^vOs7n-fiTEtyx(YNXz^VsK?*omY|k0Nx^CGTPNc6UEK@ zA*U8B{bB zS@UcT$MqZl|D->@yX`T(w7bSiI9_GCettZ36KDCje#jb2qX|{nu~A481$u$<4zO0-O-w-$Af>E&u%9TwtqGU(;+xc8cS?I;2ejVD7Gj6gwi*(v{k7VAD z(Q2fxmQ^}h)-JW%IHhs~mnpBrjCm;`?)t0G1pB`%E9^n~8n1jLPi|@FJ@Ow73#kqE zG!vyRrXHCeKYWn&y76! zaA;~QrqnHWLy3TRDUa4q-iLT;X|OO5CRxu`h_%LUd=I24Q=0s>z!o1}U%oWhSFI_) z&b%0qX_Dl{yz8`jO$<}NnnOFfb$5)t=U-2X$r}r7T8HB@b8kwb0+iRLa|Jr#kx$@T zS%&qNi57}adyCQ6U)Hx;Q6o#N&8VsE<7~3Uraerz`YU(h2Aw{v6bELTCk)y3dNV`! zN$*QYZm*qp>P)}q8B-g(wMb{=)96ckRR09ypluGP;Plp@%lO>dbu{^40+3CJ!9%#j zcB|a!&NXCvEkgXP+M^WSP`$48i z;8Xc#8dF}rwBN3g2$Qn?D|gwnm4oA}>ar;0-K6C_ zMpzDdhfh=}^;tOzfTT}Ob!htSbJop!rV|8)xAibuL(s_rcHA|gcE&tNg34)sLiA>J zf%Ei{0^KX57=y++DT#r{NAsQ3{Y>vql{AwB*lfPyFo|g47C$?NT05c6*S@X~Z5_v2 z>#6qGHS!!5D^#iTyo|LQIp5hV@oJ)&_5ZD^d3HQ!Y8hak+6g8>bWk*IU8fa#uUl;i zkLR1OwpC&(*slF6P}3-Nlt)iAu`0_xBo%f{NmruVnxm0ftS6c&_7apq*QarH_er8V zz_IL&(e@+XSS|MUMxz-saa}0SFln7Kp_=;S!h-Vfhf-Wi0JD>s-fD-oVUhYYhvB+#XMa$C=bz8FT@; z`ylkOA@fP~@VJRp6BJQ-;$okOgp1}vA{E-auP-wu4S*aSCw^M^2 z*C{nAE=07GS|z4DCW1h@#LF93=gaDBZgV4auZgs*6EJaxwbt1@^O@mWeE^+vvS&-5@tWU>%6M^%=7Om@cQn(m9?RhySW zK=h6E`4dW#FpYXF{lWR<5TA3%PY6^~ZPH1=S_Ic)HO1)1Xkek`%BEsM3Hf@Or8r#g7f!X2rJ}Aef_|%5hDn9}YKmO~J3I~P9FvoJT)}MF==JKqm z6UvOra>I|uj!V@iV~C9k><6K4Y-5SgrTxX%Yc$f)5vnDuSrhJKW3qg&q{%Jf#R6_! zl4SbOigl49Fr}P2x%Gplh?}XabW-E;S%4H9J7!1x4Q;gTnT~k}M$teBs+C7ly3;2v zFpu}Lm^S9I1vQ&X+^kN9N!;U|ORO=t&GFc!Ck)Gw=v9n^TGTftw+%FbLCdbBE^ejU|e zm0}!pivnMU>)n;Kt8?9*ad`E;g_CeHcJUG}DrUm(LMmN7;{zH}Xa9)SjHscCt}v5X ztvQ;=7dOOIF-0Y=4z~^6g3z5`X z`lDYnnLFV~H-`E+@ND5_`ggV6m^EAvQeKu0K<7zS=gPGZZ9l#!!e2S&(4MV+UxR&# zb$=X|{LZ$ol23yo(tRZzO+5Dl4kj6&gV^y_lY+W0T8)Mp5y(Pa)e+3y+~-S(Rqq{0 z*j0pvoHkt4thZ*H?5*jqmXTa!Q-$8~bl#6=K@nNgI)6uw7Li)RhDgdw4JBZL6|w#x zQ1e1hxPEIVaw(i4&Rx&d^+2mbiO?<)z-T(qL`U8zJ_1{!2;lCjn&d#r88n*PL1&!Z zStvN*T^z6&fomqP>$^6!&RMEgCC7-lJVCF=VI^$4m5^?$7kVip=_eLu zZ*taO)_WsreU0k$Mhrt~8)K4QZ zqR<0AU1q%irGg(^pWTOp$tb)AQ4!XB?i=qvYQ%#wq@!D|rsD>86f_ch66uT#b?H}E z;ac#c_aONrl&v-lQjfCDt)Je(6J$t829$YVA?u_ zT_wQ5f1MgOsf?wE$uVmK5m1cFWiJ8E$>O1f$91-z3e62I}<{w zILezNDOA8D4XdS6rulFzs3|4lYK^9X7_YRDvDedrwjc0Rcg)kB&M+W~Xo_bsf#PQm zJB4vLNyZm!#*%}u&Zp=Sn*#}*4E_m#EgcmBU@OtV@W2az&9JXy{@G-uGtloYN&NVC zhz#graq*u0F6gMtjU4=gJ$UMq!xcEEoAx1~a*GF+8*d5t{n=hOQ4{S;FUz&eEmaQ_ z@u_&A14Mb`Gj~}uFp~^7W>{=Q$*q9-;7jtqw&MxGKlwd4zaxrK{J;wVXgOdxg73+n zZXiFWaLQ%RyYo!wP0*`>v@Q0a3ZRYhV8 z-@Jmr4N*=+P=DPo9FS8P5A8*NJ(ejTn7Bh8TFY3Y#cS5Ae z@<~j}=f&zol{C89n0Cj3stFn0SzaOYK$bEK+p`qL3LJibW`nj7AJ1us<5Qn)wRTTW zS)8;iU`X;*Q~V*U8~NbQtz)PQ?^3rzU&GHp5nqYyTZVksiNJ0(uen!&$Z-0=wdenm zyfsn}qxqu+hfr>==1{qv&zcP@-W3^g!=k=x5*NxTsp5#eDID82e1{;P!lfcCuPqR_ zf{&s?_reR4m~$($E>1kc%U}8RPYlv@EqUE(qMXv%*DcOD%rA(~N7~VtiW4Fd->5H7 z66qf`b0av{U_97KHmrE>94_Lo=EN5HxLJO7ZLvlR2?4p{5LQ=)2>x&!krn86hp20M zj@?3r$&A{%joZqVfo~qY2RLXK+sL(k|8UTr;sR8#({BqW8#irRPsm(n-4p z>Pq>uC>#^+hNumqTdnC}v<^C9*8YuVcBYxPBGs|-TdjJvV>!~a?6a0AH1uOyj}Qvf z=^Ei-`^PRx;RwWsfoMeEu@~L=nI!Xx(>2woQM2D6oHH|3@NPST3{ z)3^NluU0qWY{`D|`qGu+6SA+WQl*>%93*HFzJJx2Spu*abz&BV{AvDK^aF&d12X%u znc{TsZaDN5kH0hun-S$de}n1#@Z0S_gwm(xkvD!=s$3%lnVn4@JZ)1rc3Ox7{& zt#8}1$2XA|4)_v|fB9%$Bc`OHivRf$z@rX(@Te!q zEinJ_sL?2JKpESM(e8$~EA2$v3|l2ss)kJrPv!LSAHGIWi?~@zLdjUi0=A^qhj_X7 z292(srRr}Q)vDo(eG`_?GweF*Lhki+o(kuXfXE^cbNCA0Ur7$7@-xm<8nxteA1?n> z{GYr-JpB0c1rK$18|_un0;XJzR)*129ycLL!-c-CKR43)5EMB&H(W94v@8%?1?#ngTA!yedtJXxq!&GjZJutV z`auG-{^T78JHJVv)m#l)jiQ#^Bp7q53rgkn)>+i5{t!+oNcr?+EBbiDDw0oC>i`mC z`!MkS?dlcM8xAEm9H0D{4OK;u@V_p$x+yb2t?CTOCM z(IBF2f=4YRmr$-B`^S>@k|TSfrs8jv(?t2+0sU-)(w(I&uYr%5N1N~uH}mfv`?JXu zh<(Sclw&48C{A7WW&PDi?@)n8vOVLCNc^Xf5D-R)z#o4T7*PXb(>E-6uH%82JXPKE4=h|DQA+9%q-Y1UOoEfGymmAXdO`@$xvPc z@7qnX9_n9>jl%-`@VB^BJ>EZ`8u+V#0R-3;rBo|2fX@`fx1S@|^BTMy~lHw z0`yA=a8jWMnEQLR>1f|ZoDTC3I~`iWV@RBNC9ycGrLo9AJ&J%2>~L?$4<6e0&&&4% zP-*Fa0Nj5cG5^CWwi3WX_-;SmCb4EEDXY?|$GY;i2mg3&Wz6p8^trNBI55e@7MT<( z#heQ446F(qL`rSI#(%O5e3gWKhQogGMhTDndR~e6cSZiG(f@GcyG{x47>;eiO+hD9 zdvU6&`*Gx0DOiQ6MP&o82F(d#eomkx3~eI(oeKadHZ}CG5s3U)fF*M(f&lz6f?D#` z|4_!iy%hoi`Vh#jotp!jc2@W}utYs~MuJ_GIy$xfJ@s2y@3+9Jz}U10BjusPksiuf zk_F01qnD)mw;%hf)&INKLogr8>EhVTX>HpmKTU?mCf{>a7LMlPK0k6nEl}jN{_>QS z>rWg}3vc=473V@`VCMbD3zBeYs2aoHE8^e#z<(L9|Mnskj+ns?VumeUyr8r27c>n? z`#TT4f-f&f^cm1`ZXMDtm6amQ#_z2}W)%(8PY8_~D8PbO23-_=T{3~) z^0Q=c&chr3>#H08abs#k-XcmS2=vneV(A`^9LaV{l~dMBY2O4v=YMVg=WlhB0)6y( zjv7EtAS{x!|6O1Fr)~-%1Ntbdhi#L3P`64qsJWFf7k+A~AoW6(<=GgI+Pgn{#{%`x z6<4#BE(K^Sb|cJxZ;=1tm63-L?(mLAk{*t183T;&a8qqn-2_p{Y0>}N5`H$vU@now z=FxbPow&($oSqqGk771Nbb;-2ep9)Ir@KUTd@Shv*ZhT0sdxj zC(>(~@EgYufPz5a2Z`8&`E)GF68B)2qq+9?bIgQg$JbUpET4Z~zQC^WB3^cWkF@HL zH=)Txx3W4A}sHfAl9hu+>rR^2uosIpVEw{`FJ;GUK#7 zfW3}d-WYqdGCvxn?yuIO*mwXB0#DUnUK8Bj{NkK(wa9}eDDoNG(%ZY5 zPI-QP*b{uiz6q5zVE1JhT(2INmkp?^1=XqH#910-{WJLf<>s@bUc0f#Mx3B`s3olYw0wVF?3B3ba0yB8_>93Pt)1c$a1A|@#`vi0QzGUM*8cFTqfIkiG zM#PKe5N6r3(aa4uGROx&O}wo94P2I7hX)EnqUwHdTZqwpA<>MzfOXO-Fu(e=U*h%{ zguk)ms8q4A6@>*bn^|tb>w?X+Y#fYad4&0Z%64K$o0CE=32_Pk*gO)ZG=dfeB3Y7}KyjDFpL9KBe2CiT5u2x3 zRlF8xxoElnahMq*&KB>)_l5tuwn;4$=y0b!|7Q+#a{w#;TBAGOi#ov4IUdg*#((v> zp0maC`GZmOY_dJ`&k6Ba6fkPkBH=7t8p0!7PQ$Wx5LTmY0S8NidnB8%KTHD(U&Xxp zsFST>NytE)M5BYLh=3nJbn`{bQ3>-CE*#iK9|Xr8&8omi`anUr11}Ug${e^ z7Xia))&Ie18o_>FlX;i^?YJvr?0pU<*T{sbQ6%*(Lr_x6<)341)#p(faRn^E1XXm) z^WIJFo25pzxZF;B$V25<6WV?KKW!{|-^Xgj8AcBzum#MI%LQc0MCL0#L!;c5>EG~( z2vSt$E&rycL58W!^a5LWMDYGbQG;(nhcs+%xcshV17L^P&Jmv5ju{We0+?+iuxs=I z{2XfO#J9FfMx1XPaY9ZPV|nPhx8yx)H|)(vC)z?^!~u#1dZ&e&(ADSf|K6A`=1_z? zZW^*Q-$=gpRTA=<`oysPfz0m@z{iA+z;P>T*1(m&+Zek_ceP4)ngN(`7Zkue^*9xg zD~WG2YQu2#RFyOBk{+)UXEoJo(W{?Hi1>4MV4(ne_q9y>Cz@0Gr^lk4&!X@GGL45* zW0lj2Rplh-<+Mr%l4#F-4Ai;+__6P-%=s5rQ)_fJWO_U3^He{eium4dw|QFZ_`nj} zhPAmL^n`0lELemtHTR>$&lqk2fyvmEB~O+m*xh>oFMBmbK>uo^FD8mfovkTbCWOaW z-TdY%DW%eW>il@j_lZKb4JEzTt)rd65!B#Sp+>7&$&LB#37RPrl#QcMRlbwC>}`mk z{pMGXid%DfXUQF*-ppIzru?{pm0B%zJQKNM!g0GTXQn4VTZP!j~FGJm{O{q_1y zMW4;~AOJI`rul`B zZ331C9N7$!*ywNI(EPE&Z&(K>&-ggeXV*&|mk*D*@;^^dT~eca&i3WI(YFKHqaJ)K zK|nJk9_x!rp-Omsr&;PX)x@XDJna0)Mz_v3x{$#>SLy-M2rZo0qH_7 z+>=J`vCh(*?{W62XS0BU8+PTb?*qV}2gpHqlB~--)O^b3dVETa#vT?d2xZY&>GMb4c8F7t9HoAaa z2My38(vn3Q&t3=ki9Hk7MJ%RkAF@gCs$5ar;c|$%slFG=9EBBVD8F0d5Mf=YD_LRXUx~Xz5dd5M^9p zLNE=j;=*J$#HAE^-XR22uxvVw!B#C+fN5w>dJrhHS}9n5{o$27w~ZY@zxEMjQJ>}K z;oQhl&MK)hvg7uj+K9L3Qgfx|ESJk`v3}N}j^r%%DeX0|yeA4(2Tz=yC#kf+xFQeA z+U`~MJFa;;8QD|g&^D|p#_Ts%soNi4tna&fz}8&D4lN>#vqi@~mSVP_!vRJP{(jSC z?n}et>6Iv0Uvuc0C|+dpQcPqud&9}`m6+9PF$?#D$}f+!K<=&XCL^_FVzu4!>F@#J zvkI{|K}msLJ8`1RgNt)WUf{`3fHhydQzf=y5x8+k9=uW47T!pU#&&kOi|;3ua20(7 zfTjZf2AT$^YgQO6iJNlTMZ-IZ9U$p=xzewXH6o7f3|6*7k^Kte|8mtoKfnX=dNt@j zKG6hba)uLBRG!{OWZMrLD{Jcau7=MQ7Q%r>t^MIRM*Fp5ZP34y0)%A#BydKNRt#X( zB2bIlk!#rrPBvy)4kAxxNh~_}8xEevGpXH#r+BXvRUtm%GkRwn`tHDLTFGm=Nmg{K z<(iq^PMLDX5|wr7)}{g6v=j8Xa(iM%Vo!e))7cXyd%ZE#h)t7l8wO{jw%?R;YE;aV zE$Y~vB4!52onD4L2GjsDt@vnFHKSsraU*LqXJL$iCaU!f7{ir=B$wC8ixHkwT@E!n z7JAZai27Jh+o3CWkl_wcr^WRe1kITa#LCUYyNYN>{Gsht3geJwrJDtW2}3S>W0`Ve zh564T;BvbkuUyb_UBUnr^zQRo>YRtoGADu^FgLbzlR;~FQmUC{HRR2t`2Bi~gR@aA zi@b+-xODO7i7zG!e^KA7WB>R70nN2mR|$7tuCCjbe&*nnk7ta>2?%|kfhHOqZCW0T z$)H?S*nRthNXX-BX4J8rQ)6go;b8cB&tgWrwEVR^Aelgy75vdZIy zI;ydpxLHHd#;Av(Tg$g*o%fFHoxK8$H;43Dngm~H^T0+<_6%H_ zN#4|`skmxuxNq|H+_5oTBPnK2?jT*Gp1JqwZa6atG|%B59x$6m zcJU`Fzy1gX2qCc2K0qiqYp*3&Er?E{|4k%RxC2;IH)~9)FN2)Lg1~72jeQ^f$ zb3amU>?7@S%hy~5g3RQejsAGcwSac9(djT0I~i_Vu61Z?ZW?(SST!$K+oeBydX#5) zGHKZtHSLbRb*UblaNNn{dT>dsgiqAMsVTAOB9gfo&_^TxnDWC1hFS@U;({OPCQ+uO z1amqF3VZA&;6%sxBP#^Obq@d1uCHOijwg4^)HtERPBarpAT<#lz>NYEoqviJ%06da zfB>ebJQ)qq11D1}ku{51fJV}D0iZqK+O07NKJH8NzN0sw5n!?3YAKkVfhL3>Uvx=l zEp7s;FcUF5R?M^X`@3s$dif4x(Zzl=Amm^Wh1>bHcWtA#FxC$wP&#(&w$23@t~`Qa z5Zi_2FDCPVNhgt$c%Gm55qpOP^8kHlmacfPbGH~vmVdDmu02gp@PlhOEc)lJ#VA0x za6f+jDrM=VlW?h)1HcDJW5XQMf# zu^By^93h_)ukTuMzP%P3vhFjf=4$9$hDT~;s}BcK01}ZDH-JCH$fnIqDp?Cy+ivb5 zKC!>I+PvO7k=*_)EeAxJc7{ghM>qEOsnJKeQZf9rUe#l9zZ|ownUAtT3^mR-b(JUQ z+HAH>_e%*Wrt^T_Upl?>KZrHOzVG{9>Pta93yGHD#7T#~6yopi+x`|LsxCU;%E%af8RoysBBrD7ZHx5dF7 ztAw3HAgG1>>)M)&?tZ&|TK0rI3uPE(>RKUTepxX36xq1Q)XsCy(yCet=Yv8!}en z1sZn%^GJ8(DGGt@5ca1gKSnZ7Uqx~zt_&owSI*&u-CL@MH*M|~Q2|kLN<#8bxznlF zpT59aZxPHt;N(0-Gud+Ohl>JUAINu@x>TIfL)hn$7<$zLo^W>?bPh)CUTa~eyyC}D zLR1Wh*WIxY@0MVf@-`8_tQ#f*%%$t|1?)G0?4cq-r(Wl(*$--3aF;+G&OpVE2f(=e zaHjsMwKEV+f(+{VOsc#gyREynGQ`QV?i!ifaW`gtAVCC7!2HGjM-6s=Praafjrvs4 z*k?`IsNdI_72RLHK0(IrUD5T5?YG~kOkH!mMf7XL0urCUx2Y95ar_Cb)%|QUvZ23I z+yqdcL;E<#f}6-5h}A`D6FQlKDa)*BFHZTfbcrJ)C5QrMqV;s3!W=(*PV$eW%fGnMxJHfw@l+}B<-Ff&;{m#HGZ#~fMrjh zNs4#lpX5v}J#{Uu7nU|cjp2N8t*1@6CH)@AvjoRDE<{Es7HPYArK**x$?x1ens8K~ zx5E3LUD{gu9oP^>m9B8f)N$^R?;%IcVs#uq)o`-VIf>*clhqi`&@5au&HI5CnCbP7 zc^4C_omTc7n~Xzdvz1e~CHlU4$(VjfnyzurKO#plqP0*S21?AM=}H8R4~wf2I=Yv} zn~JE*4p~c7Y4?Pas}57oUmsceI)8gIY0vG?5lIYN@lADh2_mmv4Ev6~#64tOtS(y* zZ5HUH?(v}aeFS*-I%uMFZrb6QqXkO5n(dc8GlJ{OJ0el+23WnGrdCaUKluXd-NqqDKkA1acZAI(UX+)o zL$In++r1=R4+^+O7Ie;P#ORxSjtcaaPl1dwhM|AHWCSA2E@@i(lDt<2{52 z7_374&Wj#`=X*B67pM3UVr$n>YP--YAmPPEKj2TtXFQ3?Ngu(d>6ekj$$rA5i?O{R z9s1cpi%N3e4FrHEl@H`lQGK8DO)!Vj&EaFu^$sM*{kObrw=%mAYN{@?+?~x48G@YH zk01>O)je!3Q>t6HD<+>rQ5HaE(4O$(D$A?d@@0GtO`=er#HcMf^`G}Y%CUv>$iknkdTu(jh> zzG6GOUx!t#u%ZW@7)g)K>`{Nn1F|8=S~|Nl=2X|+@jgLvvQ6vq?8LB4^U%V)T2;dV z=q5NHvC9v{>s1pU?-zJmle#(`q7d#kmpv%7bi5XfHx8lF=GuXASJTbimd|2R>y|-| zX^w1N{0%LR`>v=4&U-g1yIiIjvz+h-d4=Nb8a6=j>YJp?9{>5!%z2^;BvIn(9hye1 z&yF3Su~B$^;Oc^8Rq;VkXa5bLfyH`HlnSzLg*#=gW0ss`4@O7yDnry%kWb#}w_LkH z-{IP%`Ni_tXxtsQ@@JN>KT>=wLKDU}vvM|L7UaEzC$Q%)Z zv<+73=UmSmXz$UT=&V)K72>zNxi);xuMeJeka6?H!NUJ!Q;c&!x!me6{ss^;W18Vb z5w%loxC!9pnoQ+_()vF@`MaA{GfK)QFWQ31s+VkS1WOd40*+qp3oqr#J`C3_&BH!zN=k_H#`77k@HwrIzA^}opejf6)j^L?{8g(JNacaGenkD3*>aJoM3ydu-~^z zSDSbezpp!s8z3CL5x0v|3pDA=0yn!ifoujtMP9?$x7xq+-?w}?pPnfjP(0_WT5wzF zf6=%YK~1Bc@wKdN#_*HBJ`@tsprICMIJYx-w0sk+JSRUaebm%i+FDqCg;k)nqSC}? z|CA(e$U|HwsqNQSqL6|)!P|hm^T%!7`W69z9Jge2wIR%%({HYuTagZIk2tk_vEskp z+GNi76DQek5ZnE{fQ^no`Pqd5?t>si_Q@Eud!Cp^GK_YvKw=>vGhPjhnya&PTO>F` z0h)7Ext#K>e!DF$Elz4^=cy=Q?V0s8jZgZZSYCTbWB8pE+Q;@ItnCTupX%4Ao@n?s zdHh^FBTF`|H)g?(z=@6Rofr?;1nFFL<&ylM=Su0x6-pe*Ne&{A3Vp$yo*;uxqCQIq z)6_>G5+-TNzW3%lb*HG5V7WTGGUhaje?6YcAhS&H26a+xP*(MM1xU%cR zNb!t(I&>asa`!%KJ)$QaZWJ%N$scrRr$E-m`-329kh!(s1t#Yebvfr@@Lj}`I!+8- zd%{#hNeM_lT@TdI^8Z=CZCvO0BbsN#&zl|H7HJzS-Mq9jD=( z*&AKBkpiPrND9gKRX2j(6L~x)GNP7EGu1FVp0WlERk~T{-!`rWBY4U&agJ1b0r3q= zhH1)!fcLIedd}8=_e4;WD63MU0t$8mQw?zPOtoBfCNPiho3Kv6KjZBA-t(7oE?lt@ zSvV|MJs4+zT7R5S45RRTf4)t$A=}wJsg`6H@)2EV;Vi*$$H7Re9*Q2v6q|Y*j5x5E zr%CHt?dnI3TGpNG!bm@LQXe#@3Gw5ynB7xOu5{bu+%EhPqw|?=o|iIS*vI7gsv*0O z*z{g#o~3Vm!*Ig^0k~6P@wIHt2|g?L$@abtkVR$w+^5|wntpk7bow~WYy>60?%9`Mpvz7`$5oGv z(%v&YWnA8D3Mw7bY6Y@jH5|;E59F6m0UWp;Frefyb1rQpu}_Ghwz5}vdTjbQp83hJ ztQsp5q*g`!S8^)NrIimK5b>Ne-cyx5g$asM@~{&z9)eloXf zG8OeBEP!=~s>uJi*CMSU9O?;>y=v*)_p%GvEOTMEWBok0$I9j#J2DGOtRmNN$WKgY zfulXbF#En{k+@o8sdd{D=v-i0%QA5)X3=|fUEDR((wGBPyeC0286Ah@{qi#N5FSa>qK&!>L$1v@JvqKOhB z-KjmWzURgs`N0~$-RG4qe4M132eR_b;R9KjGH-*zqg<_-6=2YzHqZ1N!JB$jGp@rH z=LDE)B#EeCH5+SDQY+0`m_iXs2*gMq9l43=;mVrt#kuTa z)&>Ic=taPmdtuFw_uie;!(M4}|3bR<-bL7p&qE_TO(096Ka#qIpf^cWf~c2S*=hh3 zYxRrpJ!nAUk8sTQ(FeAJEA}dYYRLD4zER_i`v*Q7_e$^ZG;1ffdd6x~RH6%Vam|fk zaE->)K^Mh+{2sShzC(DC95RhWACC)~qwe5f4&d4F+mV0|B?rXb_iO(It+K`Xj*H*L%=O(x_qaWcNnE5#J7egH4P zi3RMLkD-c9)!rIr3tma;#VxHJ{;7nD{ylI@{RzijC`co6)&+>fyl@B(ps`QjU1V0XC@h2}HWh*(8&?^J7^z6mJ=67%V)ck!9GbQPDE z6o~ks+G?cZ6wAHU%FTU;FBOEnmqpWa1D{&z>&x~E-k-_w=Nsufw+e!0npvjRxSf!2 zMP$WNM+GXs)fxuk2vDw>k1+eQ$Hh)Sb~bUsD#QIxp<20X>KP?ESi57|>I1==+G_9j zM~l+j!qW$ymJOWZTV)CXWO2)GPk7`ewzxiYF~}LCS#!KGD@ZGqcLf$!zK2>AjiSw4 zEsy`4&1fKfz6!fSi)KxmD#V|+PQV1;o=;KD13LwYVGRGqa^EofK~6zBo`;7%_-I6tOfI_sMnP31)QB;l7_eN(bL35BcoIKWLT}(G50B~9=gRZnAkH<;5 z>F7=k$a-0WW&T?uSt=u69JZ>n^~l5Gdg&D7xMTIw>~nDH?-d$?2_n%WzM00ewGRj5 z-hX9dd|@dg3|^;;I!RJM7q#^$um09%u9q2Div>QvQGom+$3Fn_v?R+Ff^55lkJl@@ zV&QUpQz|9e)=TH}2azksEB{4-2N0T-Pn01>Q%i($D#>1sv-K4nrN8zWYD4jn&jg0&MgIa8$6s+*JcS z_#z2U9g_n@!3~0%te_#KEG3>trPV+6uZEMksi_Crqe*r0vnB(1VDMI<%b5Unr|PSknf3~X8%`Kqo% z7a)jUWp5U$%4b#^?4nE@?rk5hz>Ov#>C6=(Nb#FA~Tsw`VY=DE2 ziJ|7^7-Uju3)!!ISnPn1oMy`iSduv`^C~saDQVT(lO#81TCey6ki#(WUEa{Gv=T>o zGPm*77eV5aclUGZ5Oz3~k84$)WCL4{LlqTXMm{}S0Ap`2z|kTsGztnyI+$45bqz2*LKmjR zYkjsV7!+jtaKGN+jH%fVz^53RW2^lfTLzN|GIo764nU2(zPNs|O*_|oD@E80ZuNL^ zv1SG{ZUIW81AO#zn)4L4@Ap6yBDTuz^+~lO&5t`@y071X7HS&jZ!F{y>PJ9WO1)kD zUB(097vXPe%Bj9*t{<0PmN9Dz-uFvxI)m}!SzJXSPSI;1o|QYK!BTVH{Tz7-vG!4-L^4L4mOrrraGKnN1EhALZ*z zvK06*S1hNA+f>!9yNh=OWMwfBwwj<84G%3RboS3NL)u-bU~bWa)?8qj%<3I>eh?E$ zb(2yz?s1Lip13^0Fo|mS|KYBIXu_r^u$8ie-20XvZGPA|JDAju8pH?0^-UIETg_7@sZrvA-MGt>?2K&x0pJ9+vl1oQD zcJ4ZBvjXuBThua6jqxzsZr?h#>kMn1FnigrOE?<=0TwrsRFtF`RK!NuQF${x@-m3rx^cbXAzM0 zlyr`%Zk^g44a@-=C7s~tK>lQ37Im>`jdx+RVwcIFMt6L4Ek;#yjyFu^ffn?TXs1xb z&^Pk@i|sg7obaC0Ue})+-)U0#4$R;4rDNd&fSU2OLPo=#}M@ELq6C+hWP z?0E)6Ibq;uAy}QsBihh{H|GzukIwhZd?)c6m$uRt0If{(ysf8ymJsfCr5eX5GD5xd zE3GD~67)FwU9nDeZ#B%8np3eq=3b-PnvntuGvOKp+c0`BLZ*NbC3C@Exn7k48Og& z0OG_(ksJz)UD|pO+;tBBql!GaFJ;&j@01bN8Urn#%5s)&iH9ZU(|SSZ8Jr`oXFjs# zDmZlQ%D+Pv{9<$w>nQIGH$JAz>JQ0HwAe{51DwiIN41iJm`8k-BRM-dVp*Yt=MAF% zS{MQZ+@v*=<{3_Pnj@?(bgov_v5iM?Ek=aH{@W}C3RzllqQtHmtl-{6qO9~pjRe#4 ztvs5g8annp&u=~oGN@F_Rk=$r&~$n}U_pd+LTjI1N%%WdZ{|f^&JlX;!@!(gj|W*8 zO6~es%NvJTgM_HX1_!=t{C$U+(hK;8XKE8>Y1$v2TRxm(dB#%{k@6Vd$pf`=6cir# zTwPAqR)CMTO@LR~s%;}MpB;5tu~^{nkxWeH&5`S2hsRgfR97j=1NXcM(`{2)e+Z{O z5ZA;iXot9ORm<;K?2|1rEV=LD^+j{VJhtuP*@SqcO!*JpAat&8nh=7XNZ-XBp4Np< zKy1f}Q+5jV)bqhC-|u(F*-G!UkHQb)J2KV z(o{QNB5tklUjf}uWOrlJtYzec;*>{r()tK0A#1_=&L`J zrxrR+HrPmd-(JzuG;L)ALj-rz_S_EvY|9U69$(yZOeJ~Sgn4MI`ORD+zD*TVfj)f^ zQC4&U+WT`^?3&oEN2L&}4(m^xKJ&h*)l~%SUB6?t1M7@~!&>zwR;y^&W=Nw8@?!a6 zDCOXl+&gvjRVhHI0BO9c*6~Vw3#2zy3ZQ2p2_=wl)cAODw4Jw_IW6=2S~5=8Tj^dC zPPx(yRcj=gfEj|wxB1EWSD1 z8j%dF(!G84G>Wnlf{-_y5`Tc}I)FZa=TR!{q4$J;u|)}IU-L)8TlYA{XeM1TYSmmPi|cM`9IZ*d`};fce{J!&#r}k1Eljk0;J2~9w-cM6j&=`BTM2y!D8%P;b?nTSgQob}+#*c#_E+YW{*ZdlnvK0F!ifqIu|i$z_`*Tn zuQ)&sm}{CT63#j4i-al=x`e_=RY%BWXgn4p;eU|}@5xW;b$gYE*=Bupi|o>7-}Pw^ z!`IJtXbY4MW1&v@4l2(0;Qs*xov8n#^tOaA)glrpXdkFgvL6k)cCykvr1;4+m(c|V zMh)y;ZT--VLI77`OXR^yHP~8$k*Cn#B7ui2u}U3?*x$n`U#`6dO{@Kkq)?eYnXM;0 zM%|enaGD9Q!t>;|6%4lhS^_})5X9#u+87)jj1}97ymxMOtQZ+=X44%{#z`1#uQZio z8Mg8mx{)SbigQ_TLfqACIbt!DeRVM^KzA{RkZyG~@6`5AOK|?AL$7YnGyR6QlR&^u zSo3Qa9}=;qhS5ZP{@Ht%^^CW$2lbARfbjdwcw5pHVrU4WlcodnudxT@>+#Tr7D@RZE7h%*DD6zyPpv1kOKO!)PV43iD|!rWVr~%^6Lyp| zzC3lyR0h4v9X*&P(h2ZqEkl@LIl|@KwGubp^Enn>~ zibNrSadmXnEuPnp)87s)gqm!4Pg*pX9AJ)J=c-xUrI3NF2m~ozj|U}pzGjv^D`8Zi zA4pW*`2P$4Tubdet&mn|-YoJX0=jn?Z@em8t(RXFfgdtp9XQH9i{E~d+1@$YaSNwi z`JuynLu%_ttG$FF{NX^0t%Nzyl?<5%e~P;byT0Ce$rLf{x&f(1#_)4#ueomj>r=gl zqp=M5Jx7;JdOPdK9C#cZ)ylX(Coh&@>;?J~rKltcw_*%LSIgW%}@R}!ui@;E*8ahbP@mv zacB3mAt0GiJ`eHD%VMx%EUab9mts!4+0bAZ;@U;-8V~La8s}dXEdFLZKxOH!?O2X< z5v@{EY1_~mt?mZuWHr#&OGQ*rCtr4f%PqCpR436`EV%3N6>xQM;ueab_t-zs8Rpz$ z>@~f78oy#dH0&;LQl1-j`d-gNBp?hwLUrb7MoSujTXfOo5PC$C{@SyYne=Gw92GZQ z0W>K{%WXCF`tyy}>RSX_180ky>~c|pd`SS{+>U-ZMeuu_X=>4zt>w&)c(U1F0Ozd0 zO%xu^9h%(6?(~=EQ_o+vt)tGb$%P51$< z@o>bvmrPir#Q|6&&kg-w-7+Ey%5yT7%qdY8emUwP1}YV|)8RJHf(~6ZPS`}gJ}l;3 zJM59tC9$iuTL(1^JrUwt{3=tl_@Sre@L;yOYI#4sR1M0OMW1#m>q@p@VC;gdl0yS< zHNW!%B_Z9iNpBvSqiNlx{m@(gL{3!lCBMuO49l_;7%N40>rottHHm z-6!5aH8Z!)XRfkSnrUsT`nog@a4!42>f>G!r!J2ciHdL zTPN87U~{e?WZ#rOw_lD5)0p`8;>QyrYvL5xYeN4>$Zin*Ie2B;MXg#6fO+^;7b4X3 zpwkNdV0RZJ*sD{O(JbpAyld1P&vt@N-%u=ji=#8xVqTZ4f7j>gZ7}tWQlvqPZLLEW zKs(OaYeEN51vqHctsky&9ZQQfTNEqVB!3VHxJP1!Z&z+A={o}k=t5fFo4U<7GetlI39V+pb8@^etAJuG97Jq5> zB8lwiw;u&q*}BtuQaXF4E?U|K{$HE`U@_~VuWPnVgsCsvu|sy5e_Geil)npi8@HD( zKJ8fauy}s(99b{zb3T76+AkdQmR1Oh50#S&FrFo`U2j6Oa9!3SqS?zOI9&Fqv^g(n zWB2SA9J(w3hyJ8YqiG7jcm8hl}-ewHLxE5e8|-T9v%6 z?I5!L9xlHdUVli^>jZKD7%Q0-Qh^#eD!ueTx!n%cBp||yR>q*dK1>Fr(53ElVY~?1 zcvff87E$ZNB{0QKl9^ut<_7H-hnAxXx^n9^@|z~?8{*V&Spz-M(}9w{dj+2!6CC&` z>Xfc;+jz29*qSBfC|xGK*_gd9gj=M>awI8Y3O`k>aeI!b4yOnh+a%NPIsb~svB}QH ze~_~7cg&JHIUB`e-YD8}x@L`+kL{c6nM+eN$OOep`J()4K$8-MeCQ@&D7QI6)Fmd=i8fkJ{uCSAy|{%Q5;OI8^?=we1L*aX`^wQ`@4vEfS$ z-;HMODitk_rEk`JJXIc20091&Xx3B}0ve7$4+=q|nHMLo=bjLUz*>H1_lJ}Tgi*Mq2(Vsk0SK%xpevfL8lu4Pj2IY>%iS8O3zWSmS1Ua41tz_~fiGJEvRIa?b#_zZ%pZ=y2J$8#-u`l*=~7z;X08z)w> zx+#4J8tL&CX~~C`v|ba7sYGor@^qrm7*WhYGWF1nN1BGQtxQnc*ROGpTK|%UmnU>& zzZ&~8r1$P>lTAnfJ`){mCoeREaFJ9&uu$pP(72eJRk%rmvWukh(_NELRFT%9=vo+B zwX+g2D<^F7kZT`0RARAYL=gM7E50h4T-KtBfLigiy({#1?(14%*iE_VnU;go)v+l! zAI2MTQ@T$R9B|q5!z~bHn{Gtyr1qmTjT}S0h`@F{>LJR!h^cf!EYQc0Pdpz4@k-|< z3-sipMceEzH~?y|7rwoDL9uN7fd3&!6W5IwOJe7KaqW#~1%bCcdH1KUh8)Mq%&#Ha z1>x-&xkRPfhu%qR*0=IoiHu>9~*yT0XQsN z#n1MnH#+lCS|L>`^jMev*!Saik^p^z3K$Uq;Y3yTI0a`<8R!N*!3bi70sdZzW9R{V zAcPYAh=A@LBo5%}A^KAmstO4W&(zunXEzLJ2M?)KTyBobM&H)sD%LW4)S8)3s#%vh z$d-=}k%uIex-5V)a6D>tFobP!($rEaPE6sz?TN8Ju-9;#{A$7U_A)hqG7;jdhON@vulCtF}h*V-EQdja@ zK9BGQN)mpOlm%^Uzc&z2fu14N$BYPY$1Gtqm4-OczZQg?3y7)aE(SXgp44i@1&*J$ZUmOQ`L zJpp)o;v$s%%AEMM4ySQgCJIcs<8+)4Imz_c{!3OkuZr7 z44Wm=lAZ-!Ul9i;`*rZmO%=fsU%RGgSCkVNFH9EV*>u6< zva&&5SZM8$9xU{Z?v&Av2~qDp2y*E;O23wRXs(-fwV$Z-)G2FzmOan9w}bMvm$(DD-MJm91Rj&Y-_Owxm<#^;C8t_2NHa7Ma~T z!N7bs2$Dx%zT00^Xu|{#n7SxgY@Oa#hha{?)}t6eEp=d+N3yz*py`WYuL%)wKL~m@ zyLJ`cA5C20z%VhR20uwUR@pb!JJ)qRvw?DFpZ%KqCY0Or_%NexAk|c2z%jFD_ zA}i8sel$f5(J}lvvS=+|M#2eGCO z+RZU$o{K2kbnsFbZBRA*A~-uio^tSjn^Vg$loorf;1 zu^P9x4Z4o}HOx^GMa!M*_uuImKjOu-!c6~|y(86OsWw~El>IIu3Ha%`pGgU2DyQ?c zG?|y&%3fE2{AV40ls+P)Z%#^+N$0u^6$>4TRKa6?Bcy~HH$8bvqe@=mgGnJp+ZRn% zm38j<;5$*cq=DzlIyI_<1MBisv`vVlyT1`Etuikjx>a~y#lr2x*r!`=#FpH;9Lnnd zt{zWu`YB(7)Jthi)P9J9qvb+D12uHa3C;7SEwGMb3bP4#6jnN3a>Ns#ZHT+dqW{U> zqGN?)a0rt~{`egsnZ?ux#Guq$RI86l5S3ThlF^<)_{=_A zfTd3xpk{K-m;IkB7GEAtj%0W}LA2a=grvpT7W8rChidC*Q8-~7l7<*zzPez3MhXnI z33NTf-F{v)?K0z8mMA*P@^*w;DU2MiRF9b<>Bc37ce|LQRJ?)lV5uT>!h=Yv5Bkh| z)+UQX%UC@n1oGx}?+4q@rO#FJpG^_e8XWL^sEw^CEegqb_oLD_7(!{&cdR;=lW=h} zFwHaNa&HhZZT;n^Yei8%9LI_rgt=FYZC9)+Zk(>NfHqWk5cV0lCYl|VI7(E=Mp|bn z^LT1GgK6K)36A6g5xzg~TkSo2pM`)q=baOC2&GDIgVWD>W$xj5pP%tWP2z}fD}--_ zUaHKEsTRdi(}Z&rYZUuVvRlT>uz!9(b%Siu${3OCbc+4xp|2s6cGf;U6hjxkrK(9H zwWJMs>cSxzO}g70U_`ZeGCSBz{sNft?WJllS=A$;-18~6r-Xl7plG>d&iT7k?2A15 z6t=EV^dK;Qr-H>b79Jp)K&HXLGPA_qrBKc72UX!o)*%OS%vo$5-^-k2}ljTM)F=5 zcd1fYuQBTK^18d94b}Kutb0lyx$G8SIK&>4LPs#)|CqlzDNJv@e6=Z7JaJ{S&XIGU z#@Ms|ev={E(^ve1i#*fw&)cwsZythR$$sYh-oFkwGQVhso`k}EeYj9XmSn`=?#sqc z&_>*SdW86Nap|B0`64jUpGx^1-vwEp+lt-RtEUVR_)C^PT4f&|hsh}f zL7w3DJCO9qp9i}w^46JT<_K@8$TIh_@v~@S$g#=E2AqJ6f{`JVu@o!BFQif#DTUew zjnSo2=zAHDZXh{7gZo^pdW%koo>6~NuzWUMX`xQIVIT}m?( zot+1fIi@Toi8A@2>|Dg#qZO|W(dmS#c@EFzFiB*&G6Rz@WfhV){0b>8qIbTLYefyy zY9A((GWl`s1qVaSvBYN9V{GSy)1PaPJ7zGba-{NuWSFkhhlsmlsc5j*2mJzeC>!L;cL}f;S#n(`sit53AN~ zDi@KJ6An=-XCze_75`e5TrQQ!a>_w6Dt>Jzopi@H*YB2bnAAY_yhoW>lNa>-F7GB zQz=%QYkpW^$A)2Q#1aZ$YP1R@-q^kWIj5`L)H__CV(`m+b5EiyjJUI6D|l)?__jkI zzw>iqroa%WhG+6iHG*;e?bu>#VP|p_9dBQ;_VDNrEf} zw?2f@S;ErCFZ{TID=UPx8PV`tWD`b5BU<5%~vf= zS_QW!3=<@nO(Y00%dSG$6M^~L+Y{w|gh7@NReXXvo$V_gewH-Y1!FuOfUCm9p{08ad^kMWJLtu!#9{$%@vYj#sm=Uj-79xUCqq z^Tpe$sCM7IB6kp?mU33tV)?$<7! zPl_T_os5N-c>8frk1`j~bh;B3-!z(UR>aw6n%&!8rx)f@?tLo@jMLf_x8(SMjpE20 z*=fI+-a#|JFWBIL8W8r;UQokw@@q2n*e8cKX~-s@y9U%W{kA39y`LT>(n1@)jM-C= z7{|f2${b*hlfNry-agGVKuTC#qa~x+x7JGVcLRyGNMZNSl4{`P)wCI9o%oldB)r2$ zPz0SZ_ob6-s>BEkF|yG0!)I2$8O^l_Er%itCboKq0anC`HJEeuKyKi-x@_f#iqjd- zDAmk&7#yh|R=)33f{HV>>RrmzX3&-u4@}mMq|D5YXA*H`(b&Hs(Z}|@W!i9hfw+*S ziJpVYX1PD<1?FixdqSZI3UMf_*)dBvq#8L+CY5ltEYq3Uv^& zfKF}@MpA3unr-^WcgYMk_;~B}{xm-iJm6-jceybTRw|b8Y>Hx&cC#`m?N)T*h;Ofl zw9lwiW(dPY98XFs7uPBcf*>!Dt#n@IG`~X4&7Yr=cj`|JK6Ewov6H#Mv7sdM&?i+~ zhh3>Su5bj^eVc|*Wxr=>N<Mm&^z z9%<*!7g+DUg%k2)Ti$NOe6?84*V1D@4lZ7+^rE3dvT<@}p<3bIIsEOG*UwCube56O zVnj@{tW#pe>O>ZQ4b^mNh`LfhU$Pov5-a@sETIBi$Up(=!$-~X5m&p=Cu&xllCXZk^ zl?sSid~%YCX?%rSSTHKr`td{X6N+UU_X=}JzJTx=2LO)q!g*OYwMWb3X&KYVbTPTP zQXW!%yT+5F!IQH|Bj_+1em&+T&!q-zTR@uh$fXskOdjbzCG!HB()ktASO=Y(uC%?m za)n(_PqN5m)LLAYHE?kpg^ymXWqoJnC-~}5IuI-h^TDg3MoI_cFKG2DHuo>yplXn$ z?D1At(L+D{O+s(@8jmBhTQV1z+*~=sKU*rP-$_2A_aXIKbMekI>Gu5w0gqJ%4{3-P zQP&m`QmDkNaf7Im$zoC>Jy$w|U@2-NHtZvoCdh3#2rh@*^{i+H~jSOzfSGRF5C0>`F z=v!jaB)Vaf!l9e9EF?3%+98d69}o?<1;YeG>H`!W%h*NW*95V@9Z6M}3a3)eMmTk# z*3~h_qMxBwfKbwRlYU%%;U}*#WK>o_rvg5C<1)_==K_L*}YS1<$tn#j6$+YX1yJ?FX5PM;DPNR3db9SBK&;1^=|c@=Hm`YPlz39Zt% zkV(tVlvwt0?=S2RzB$Y%cUO9eL?{TFR>gaCIzJUzLYr(b2{MmQjp!aq1^2_k@nUpd zPs89xKE6h_QbU=lO0EfnU^pFYU|WAjHB^Qy-)i6=8Qk=gnTx`%MtZDQW+a~DW62anl#eEQJi z>z=qkJOnp)o;iVnT=|n=#O33$bwj7u*B`Y-)1>EzW<`IhGdWsS;>VLrg3b?^ zBiM@(=HuCjoD5i)-hO@n+hHkLy6Ph@_Oxgqi&VTF!BHW=pI(Yxta^5baQKs?WrZW` zA=bx3r;+E<-EWb9@Z}Z4&wD4EEI@7@kik56y})ypjt70-n0_C)5xe0705ljCgzzV_ z*XT65j`qJ7T@K+_ApzngT>pK%Ls`hz57sL`>eK~|!mN;M4ny{@zcgNkK9QhOaEGaz_>@oJRTjoZ0VTSu2L6ckv&LfJ zq#j!6_%YHwuwVwsccZhGp$vv7a-O&ZwG&65f2WU{cvXxH1f!z@o&-ap zrihEten+N(b2>s;CW#Rp4YDCuiv)Zp1d(N6JVfs#%{1*sRctitj+M|fy#^$o-&>#^ zm`zZVi7x86SW6tTdt8Tt=Peiv$xL6_+|(&|k8{|W)K@hE6t+@@MO?CWCXCa$?M*2R z96SRB42)blKZ$}60r#86Ry_K5JB^x995t*!m@7!oU2OUCFmJ+!U zhe(g$^p5ivLwGdgaD7A-opmr>DboXc-x*d*n^YrPf`MO}5CX=RNhP$U&>!QglLW>n zl(OF7LAdUGiLFIFjZ@L6Am#+zV*Wz%@k_PX=w{r_emYG~Z0pjnhM@BdpvuR5fIpd9 z%XH%9^Ip5?PDvAsB6(=ZepZgB-hMKmg_AQqmnyKfH}d7Xcz6S2G@5#RS=T;u>|U~3O{1a&_R@bA^DB-QBnTy#Fk)pi$r_338+cg}<7RFXYn=9+Cwv z8iv?*Wffcp#DTM=J~KmE_E2Ly{rmL(QjzGm2!l7~neTYcCEtOtM@?ggRg`u&a^Wk3 ztVz|ve@6j65&)T*GicPTzfE;ux61*7j|S&?0!4GQN8Wi|s@QSv5Do0Oz~-wS!M_(e z(sSP53Xa+-tP$TgkET)f)-I7;9Xh)|yO6xPY86slx<%WF15q7>aX2~`ZBJTGn~X-A z+V7se>`UT`0ny#onhZuR(ouE%%X@#{{p0GraX+?tvjm!4sv|Cux%KqS4nP;YpMN6i zg7jyPg!GRAVtNJB&wp(f__d&q7$JKwhrdL{loyn#%8S4Ra?_8Tx@ z8Q8bC0(y|Bs$yYqz*zL)KR(L;yk>7de?eh&?3^UC_IiC6w!dBh#NP!W+bGt~=+b6? zztq|hruH}udE!Sx23vP$Z2y!`r5dvbpmNCP2~($&`n8WU{8xXgn z(MNU>GpYEZ^!Rk|559t=l%YzJtc&yX#gu=2<$rGPkyNZ-Kq1O%#!5jreoUe^VR)xU?8o8VsP&-*wnPeyypAiHF74hiC6!DO zWzHTZMl+?Mm0vHRu4Bdy8bA4J`{%}fNAdrD6T0_h@UKgrK1}b6$n%WGdM@8v^-$WC zj4YW#`8B(Rq=^?$e4vKBeBMZI@x}rk8mT|Wa4G&#RPo`GG5$|9ix6t`ksw}?KKpef z|GwWp@BP2{1Yjl5Q%o>PrJ)AhpS2R&V*n4cp9^67ho%4X1OCT<8i8L<;G*IG3qKNy zJ?1|#h{^x=OM`h_S~ige%0ElHf0XgJ<}_2W|FZf2OjdvX(^?V^sJfbKyw*KHVg9}i zA2C5J@WTzmcJZL#pVR$s56>GnL=YlMyv%7bmv2MQ0|@?A-p}%X=!lSrI3pOM$=o#($By___Ji!dyy(9=;Ey~| z4t$5<$Rff2NcCkb;GjK(I}rYy^Z!k*|3)@{-8y0WBiXgT@|*mZL>0l~t+jm85c%Ie zt<@K}qDHKLAt>}m-iAYb5rg#~7Vsa}$$*ng$dyhIqSa^BM z*v+)3S@pPMg<*Y!MSNqos>sgO1+bQ*o)uK|ip(GlV7U}YmCC@bp1RYf{6~5t^dz=j z9weGMyLo%OR*=5l*@b1l-(q>RDg2la+c}hAK+7GX>pGyKM#~)Pre*9{`(RCMgZR0 zFT7m@=whvU_$3(;{?dG&Ol>-741T}&&{`7q$PD&-C$oR3z&rBsDoMX520wlYo#t;D z{NT!4)8H=|Px#Mz{~@EuC+II)oTJ^n?De5)F%PACoz?ZsRWs_G z2_yd8srQFK;MGT^eHw;;Hn98#uot$6te>W(0|Hzd+gm~b)6q!YRFQ(1_a77J&m(>v zUTaC9ps+HgV>MwMI5p^J;_saa-adxenw2C$<4ZTElC7kbSv z!|&E^C8Cy35+*k7x8Vmf;ivi!F$fC*r>~%3jQ{6YmgB`9EmsB1g`=B1&#&&QX_zWF zXQAjM!1`-d|1rJ?hLWoyCunC`weATb4ipWgon?b@o|_5&vcG8_?p!iVnSLvL;J|)g z%wJ0bJ_z0lKibs4*sf@dXoB4i(#Z_i)#&!jk8aNIEg(KhQ^b;1?th+egyj95IK-N> zzD>*YHgCytB$3xwrB|uV=9SnlCbfozc@;tTYRr^h`v+Tr`5jtkyr#*h0%8`+tUFFG zRbs$zy8HK2BlITvW@I@B;{!Z!$aPr0epDmCA#?| zCb}44DvLxLiW1(FpaVgI2aILxzqe{DzC1YNRU9N5&8=#G0rQLus)iBDo!@$;y9Jg$ z74Q^EVkmdRrG?QpPS8Ko4LSu6IvJJ#?+$wQNM2!126TTY!~28Zqm8_E$19LgRGLs^ zEePOx{}LK~2(S6hYi=)=yrK_ERqWp$XA7yby@2G$knWNO_#o7e*mEuAOp&Uhz3!0N z7&YjFL_MC%B0inaoEI>24f90zC4tGhz1ik z4;LG>3lh#Z(->x;e^x)bI$$UPt3QB?bbwJ0>uvK~S^g})HG1-14&m0-{}%_ zFuY*^K=KHfZ$XVP>5oB&z<~da3;8n&(Nij3W<@rj6CSc1N26|Xa*kK%cq|aBe$Yf= z%xh7wt@;>yDZgkq+z2G_itfaj+0KMN=_R=$h;A6m{gig;+M8B((Z56?e;p>?xfa21 z6t(1@u)d+;uQ{fm5Xirfay5|Fyp&!jaHUlScl>PU*jVa$!qMB|v^e1$nrq%J$c*yj z-8zd9jJU($O*QScZC&BYL-Q@G+;t^Fv%A_pIWa)NIYp>SYvy||hmyD|&a8)Xe0>-3 zxvrDlYgb7^5k5;(t5V`R+}HNo-d+f-Yg;~Bt<0{Wh`T9&TUE*vlS7```4aD#2~7d#6n_kF`7DldUJ z9KAe<2D60ML!KCFiHy)>JP3%1t=;3dUaV}nHOKk}daAB1!51HPK>U%#CTw2Rrym6d zlpR`mxvaXqPLH@;^eJu;c#I@xi9qss=n?s1M?_4j8Ry8D=lrXPp+pIpA5}E-tasJl zB25rx6$8jFHLCtqGuhRzs#wC}Za`3=Iaxsvku*@cyX%OXEt`jb{&n%`m3?Pxvr^_e zbG-E`kLI=_oZthuGRCd8$AV6ozSZI7jEIpm9*T}`nOK+5c+mkj=lTW{!7}S(l^N#I zRdn0q396lmin4bz_vV$C04jR_oQJDK(nJBI%m3BS5rOCHqZIvJiFZZv?AN5VK8=Xw z12@Re2d+*Ydgb-^!@f2uV1~UG&?J{l-QlnVqW$YbQ}_@<%z$wmPx*Bc%2<U+p4c}YJeL4X<^%c_N*oX& z(&;-huAhp#UJFPy%~oaWM+|dwZd)bj-I)S~GSo{zN+kN!IS;u$Ops-H!C`+_wW^k! zJbG&^u4t08Q+?)z%}SHfp}!UYwg0nlY}j51AGfe}*vyCZX^?$uYu44AWBUJt5gZ6EN? z7bk+1ihr&-xgN~dBiKUmThDn8--1h*0zc$AnNLf7qMEm`CGqNLy%M=vbSiQdMqWFK z`lb~-ZA{#HGbc)7A)o^>%jG$Y>kP&m7(HnLWA7TH?J(!{l2Tbq6A7f=&m33U4vF{Y zFUQv8MgAx#A2@utrT5ak<)J3_YYH~)_KT!3e6s>5kNy7t59I-1SxACDiKDzxb=>IL z%l4SAQOU_PQ3Mis7GC?^bnHS0sZ1UFwkNxclA(QCUhKwWFQ`-@i7li|-ECyfYnxV9 zYy|n@*dH#5q=!yp-M={ar+OXTjBi8*p3L-oud|5aOedb zU=q-35c21{{pMS~e)lruMit2rqU^s!G2y)6^9YVTyB{HDle!X=5dm;pdv33eJ*_)Wx< zCbBWlLh3Cb`7E#Pl7PC6kffFGXq)pA1d?x}YXB9T9dD?+iVXEw5Xx;FO37{4|Li5( z3Lf}+w)#!oyywmSHRx;eq*U_@XM@`npp6vn@XK6jQJ@h~sAnFbfJBONcZ363(G`tA zBquFGdwYgKFoXkhT(A_{T=1vOY+;ksfn^xdv7Wb)d?Bl2x|iB@%cSal&z3+#^LG*k zHmgi}!>;y=cBQ3HBbOI~Gg279AP7j;!H=1Pn> z+I!ufu34TPf_MgPo;GgwWVbEu{Ft7&Oa1D-H*-yAB19omy^5+KOUg1z6tX!I5XzT} z$#QpYTI60FVAOP;RmbuF&n*g+sJLmxn3%} zTLqR;QiqiT_4fNA!1TMg!Fi4zROC00#Y2_q^zXWE;R0Axs;qGQ(yUE#4{`Vm%o{c zyjbxpm&=+~@kCc0%a+{NQak23_=)6IY~tc(G(gkN9Yh1!rWu;0gtG3qW{~P($3ONy znU|!4d{UD}&ZA4&fU|!WZOud_@J%UvveY>9-E}{%)jOb3(aAdgdwZpJx_5|QSa8n< z@}@-hvmI4Op;$bACrBet$B8l1>@+DUjJ>S2IUs$zM5iW96jJ6?;JdyuKvAvAs4AYk zep8Fv26B-d-(u__HeC8a;Eo|moSDWnDTFl@8D6?&EF60DHCV9LBcW9KG1Q8`h?(kOcm)WxW*iy6M!2EsOn zWPSRBS;U9Z{!TY}4HLv9v0RR~lrH5e!GfU?+YVl7mjkch$&QpN!?ux@KK8erIRqn( zU`LL;q_pU{zZM|!2U4x;(O2L@Z>{j ze|}j{KM?x;v3$F8EO~NUHkYl$vwA(;93#;Gy=k$9g=f4LFNX4!KT>)iB`vXe#6G5E zNn1T&=Q>8XsQK?fGV$TMXudZuq<_yAdu@3v zxslgTMNHc+&c0%jZwFh+$+8BW!m zQ*=~7J|$A$laCk}>#CT|>O~>OSEhS2vYU)KC;IlSD|)&C;S+PCY8I4mq1A^YF9GRY zm4fx=ADXIKvKk_dE&T8?Yk)aUx=jLe>E{Ho?{PGFt!7ytM>XS4ODE9N zY#5)8H18IVm2*Hb|8p3-x=)9)nAK&J`+-jnCY8jMl*)=M$D)}Mjmtopd;$}iH!Nm}rf*Hc*w zl)GYiw=Yo_TnB&*dTjJO>VRqOd&RLjRT%RO&-^>hiTg`nN(drZTe3B?R|Ud^$}3l@NDN$?J!mF zI8(mE*{7S8KF&iiT_G6aDpOR3czE)O=J}q8+a75M@oH$v9?S(B4jrG~E)@?Q(7JQx zvlh?44C6k}+EM`bx-=l*9cz5w0lR9EfV z`>C9>{wC-?e9?+Kdj){)i!Jcrv9>|zJ&cd@i5Pp0W36Um7U}-p^EXU5Etvw^TZVuM zczzv<20otCY~bwWWtEyg!%#X#BxqxdT(ZUS zOm|f$>sXBV%}oN)^WWSgfkf&@kla{1}0$>d+Zpl*)c5UuX!L;Vg#-kSN|J#%4)um{fo)da51 zb3dZ5%_OcpByDK+i(=QAX%THyc7US)eeUN5yLKlCI5zBDhXG-75 zAvyyFay$;l_@p7@_yl%Y`h(S)3?OjBk)0dxIb44d^NuXj?&sfzoLARMcV)A=O(#{R z%uEvcr@sbFHV=jwBdh+755E;>rtQ*np0l@#E?C+gtu z_cFFs`=@Sg=b(#hoG!TWXG_(WEH!`2LeX6Rd+`uyo)gA7E2slX>RfHsW0@@G-?6E) zEOzXiX$c@Syk(UUkQ4Y*3I-@LdFgtYz#(~Si<@ZUsQpWx#` zfWMC8#H6h=zGjx=_i>q=YB8(+Mi9|fHb0$uO=@eW*G(h{C4bLe*`j1`@z_MAYKf$o zV!rmi?z8SHkGbyagcro=;};>`xPC5V&2-`|+G{&kV?EQy*xqo7vC$K+Tf){1A`kLT z(rYlcS7QN1%c@2DsiSmM?F33^r)`Z?#tnGxQOE~p+Pm>vJ)d)*$CXl6$dimFlS?q> zpSz#T^GCQ5<#I56tc$*SSA~(X~!ReOkso_~?wd;r?%bJ!d* zscee7^je!($V^U0#?qed#OD$O-2xzCdBp_mGwtgI#-<<#3VF;sxXdp3fCur0BASvQ zOOkZRw17FEwa@Y_f#0OE)qz%t9VtSD!zk<471z%s4oKgeb4?6J&xt=)+LTnw&Q@G& zq&osb=y(Fct%v3wqBHlz!#6x5FK&Lo6RuUWYNv+zp@+L!wn@hS%zQ;w58`xtq9>OQ z^t`)tR`FsR4oD9ra|eL?lEzB2-8fplgH(uT{R)lLb{L!CpP-f$P-Nu=?`e&87GTZ) zY(5hYCayIu1hG{w|4wRe3gimbyie3zDtYD;ahK@Z#+!bLxf0zuSrMA?eslW{ZP_g5 zE22sYFpeZp6gj%qM@j_nlY#Nc9>)me`ZExne-f1Ntc`?>zK{xa5||Ys{?BoP7$}9T zjI6W7BwY)<@tN=X@A(DIxn1{F7n+^gZh9W9W(~)$?9&=bndy(eWl+)|jxzmA(_h~u z^^KN77vT-Jxxw$;VEqyi_MI0kQl%8|Wqhb!Hch*AtZ+|UToR}n_{L21_&3MrIUEI& z6q@6TE4pD3odO|oG;Ie9NdcW=z4QLm1NctS#pD*HK8u1lpX*4B$XP|Zqf zhLc&oowi@eaN1w9OMam);4uZ@W{cmecgyJf=_tpqNk)99AvLcyAcJZ;+x@<`I&T@9 zE##C@_mLBkz1u$Evq7nYcOeP?W#slx>BJepxVaRCnX!9}I#!`SSg91E327~ufRbzC zsH4po{ebA?b5WZx*>Lx+bHT&WoU)3g_=p{eRQggys&en*LsMhCKmYSFV%E+>s^g5I zgsvgzI)g;2OGEwlK;ww+6&Gx1;7uA!9lX9yOw@b8C>(+Lv14K|;`jC+ed1ssI;?x* z#_73ToD4;;O%f_kw{~n?LUuMSFwwYAxrWEQeAK2&$)sHIQEjbLQnkXl_xo~nQ-Op? zG-;i9xjneav1Q)BI>-cXH@GDnZUY5Qg!K@7tRbsSu&PYVkYXb{nijz{>@ox)N!N7g z;H1=;^X#E+xNS1chnYF3R8n#~!uDPrfqH#cO(<(>`GNFTni=E@O4Hfo9()3*bfx9c ze%MM%VtF?gVS5USQ5$A8OYRH%3?u7;P|-z$6LnsyS7cR9U!Y6T(0&-v=Lx`2JCD$c z8`81*AkAQ(6KM#BHoB=5|lek)dkVhU@9v+W33b>7{-JzWJKguPfuDU30X=@amVRv%P198)y`_WzRy#r<6LA0`Z|+ zbF^4w=B8#G<4$g!ueOf(*qiIC0;x>0@u;XO8EjVFrc{cx&4eF}zNe3Q`f!}Fqh|Dd zApGtn`nmQB;^X&iCbq1`=Y&LO?Rb`$mEdSH=P46L* zmd52&)3KV6>Db~@yJvg}i2;>&yF%Qobro%IP5Ql(X#(| z9xDL(<+LEwP&`K69rI9Mv}t8ko?f?&Hct{cE?+#h^!(t_cnHVmxN+*5VNsJRi1hp3 zS)1W)v_pZ!t%L%ZsB*&YZ~^nAQ;|sw1mxvPf~p3VY2~IAQz-)6ItpO*Bf0o*RzLV` zK3f}w8e^+0{>IcKwH1vNzDbQ7>qXxjGNak$AZpX30@sAmhYPm zypc`VseDZ)wL1(Fua3w$~wj<9?mM9iCVnvU9p2xnhp zwMUeQFbPut4uQ9`O6IXzDhQcN?iIIWRpxQxb3k-imJ3Im?JZFMM)F9}g>Wcpn^TDd zHDZ!kRfU|h2`i;%+qT>>wlqO;$6lpFtxlU;#?WKPi@BLuJzWTMdq_PHN9iJsFvDN; zhUA9FS;hd16>bN&c&hN2QI=brh6T1&>GDv({=tu_xow6>JlI}& zU2IKZ`Feo@6W-sP>4@f)pCfSOf8SSR9mlWQpfre6(_oL*Jd7=aOY^&>FBADE0c!VQ zs@$PhowP#%8zKrCK>EQz{h^o2lZ#yW3ZDcjP4JW_n7+X8RFXw&x$}IEELdirIm&cI z7s-KRH`*mo#z39Psnq&K%AdjM@$Ke|D@A=uzEEJw+_9wmG_gG9VW`|%07Oz0wlPTq zVfCWj`5!wrzv(&d5%Ta-!E%0*Ey3r%t3U9tV&DhG7&H(W>IEs`z6VLDDh*7m2~s^o z84fr)dsu*NGRzg7b5WfS)lYjm=dTh57Ye*+O6~;dSSOJ0u1J#166Ak&XZsgO(}c4( z!AX!1bYau0)AK%bRNPw36qjNXt^Z2@^9oQ9ZrlFhbuW|2sRy;0qKX!cx{oPv=mvs< zavT7DD%^%Fpdj%X0fG>%HHV9~9)?jDRttFV2~8vhg*t(;9vaRvl>oMuEFMd5)Gi32 z{Y7+(@MGnkz@SIvD$SufTf(o4%$|-?tY2SC=>c`QAlR)JzsItEW?JAE6z515v;-y+ zmSS8wycEpMNe*_uR{P&7g_LQ7`AWh?vAE#O8obO1g#;e+n_XUOoqh{!aqLo4*G&GE z^O!mPkA!=c?~9$0@mOWB>fUGo^ivm=u$KqO+~G1)y)WN^cr0=?V?V`&phk65p|igH-X*A<{fgkQwEgR0H2$U4#=BV zR)G`cF;?XdyK!X&m8V$%sm$a&vXM~vx^*WaUq5ouoY;IkHC-yVIBd0|V+;^@Eqokm zV6j6567YmGdnHw=qp3KUA2f^A)132sdO}amtgbZDA5%f$cc0@MFWO+RHB6o4eq0eZ zh`p%UhS-qo`72cXMhe=#AcLX0k!zo0vsu!+^RV{HuOsp!y1IwMqymJ(f2wE$u)9wj zybhcmJGs~1-<5eB(oOSpJe&2W%=-e_J`gyz4z3}R~kxUS_>>M4-svPiLQsSoRlR#COtBDYcdH7cX{+i31@Bc5_HliPOmQsFw!% z7Qc5Qp_HF4u@4Lj_IbJQr!dQrkx2-bJ362tJ_J@NQr_PMp~7SD46mE<1c}&l_oMkw zl6FtH%fdYKAvWMJ4y%(xbE)Ou`J|g`nU1}g&!e~Gpx~@+HBZMNKe0Xx5i2gAR)OW| zr=7T@mW7lt$ziQbRY7Z?fs{3}{Yu|7c4bQU2Nw7RnO-$r5m^6{kMfQq57Lu^3UPrD zal?s=)Nr3K!a#?Jar1DU^5MCyV}cpdmrY=pW=YSN0@WEk66zQ~bP<8kl1nXZW%_t# zlMd$9pIcjTQLLtx7 z-zhE5cLl35q)@sPNSD=>R)~KHm(DFdkm?TqZS3 zJXP=)M{~9>{PGTfx*S?eX0Boh0$$h7Wz15&RSeQ!=&n5Yu z?SsdnUoM?KOJ5O#^IJb1c2}uHcpg?#6|_lwYqz%ka$y8~a2faSdzB1!kKFpWG0zl= z9;#cKVT9%4zMGY{v{8LeowM1kcpN@oLYa~Tow3G zGBwgFj@j#<3Qq>p-wcw7J6-AfAor0@p|KX9jLl+F>}&d+5pIu4*@?WwjR>ZQ8_9V9 z339mrjI_Qh86*{6L^0#6!)n{^<2&*{z!hgV<=!mwcJDFHP8>Pkdp_H?=nfh5Zh>my z2|(Z!+n}VO8h&&_)=ID2GG9ez*H6QJ`=^d0Mjy?+}gN#vxk z8UE4iENcWXq5T}>E?#1}%&47WpNmlbgjV$zZ*}#;7BjL#kMGgq++x+K$X)p8aD3|E zKVu*ywxC4G2kQo%aDWw8AJ=#qs$PH4@hVtL#tRch0koDU#|INatgS>~)fD>QR!uRe zhwts*VXAzW)hyeuiRHuWIRt>IuUedE(Yr8=$(LN6GqQYI7cm*VNrOm#QVTWj%T%jM zP%iy?crdi3r z)1=wPL$M2$A*=AaJZfkW@NBrFh(XEu;=Hvl)Z-5U#JZ{#>QyKSr1;CpsW6j6dw}NA zfejBGm;QGGzm)P$gFKov2;tkK-s13(*S|_xD9^vP48te6So1m_J4Oe~l?53B7$P}P zvmFNUOocMp;_zTG5-#m*P3cx@`TA-FrjUP_<05r)bkNAs=5{hqr}H;0!!^?b>r729 zbL=8*JkSS4(nY6@4_Hb=jDGkyg_Py;Y;c?;yUDxc;r_PcHKN1`P}?J6*c*p)WSt9@ zlq-J#u~9qhWD&pS?&bdcY_{5}x~I=2QCL zj{=w-jt8|oTGM&;yRy7h4-pJhm!H70>)5kdDcf|q`2e1rGQmU&-+-USc!2_~Zz042 zQW{jb2OCXL7SC@-uX{>#(*|KCmAl_Zw`2uP!mj)|U$^nlpiTD&Q0K%8HCpz)+!$SC z(np8RD~e|>(zi9pS>Uz7)mPN#4_!9>(L-^{naZNBuN*VX((Q@E8K0mpdAF56{AnTa z>N5mDTtB|$hU8Mws!tl~80u>$E@ZZ`d0Eo19XXE&%6U@a&?%BUzb>fL9_2~ekW{(?0x6aBIAvt~od^}?qrMbnURZV`e_#+;O1~s!I zsjgJYn@vB4W?uor!Q*f7HBp(`jLL`>)<^vMXg2Bd*?xw(3c8N+F9~d*FZy31s_cj# zdYP2XLAlKiQYAylro8BXe<3b8Sxt@=SHv3bHnm-tDyqX0SmQ%EV?ez?De>2)M z+i(fJL{Gcj>^&3jMAxHFHLQYt&KJpm$Ecc zU)cPas?3ZtvO!UHU!~Z9Y@b90#=$ofyzh~p2R+dC025WL*5g^~dK0gY#FHPems$=3 zzhg7Img|CiU!<4*c9aaulDg777u5GhO>LcJMfTIv6`cjSRVs@!I_+{dH|*Wrb(jG; zAO<=UIG=aC>p2VF)rZBx-OU2#!e*S0;8lqXrz=rniNxU)+Jx0Ih5d(3&%Ne3;D7dN zH14606kop5WJd7QKSE5rgR3x>&NWR&O7*REfaE*H$H@PyXF##IW;)6&AdY!P8V8DI zd7Dt@pH`i9@~-A1L8b7Sh3>^IYTqzKCSZ5zloYVw3ygkRGUv_o>s_ZmbhjQxmcqRJcZA6kdn!!hvTE?h*fcNhV3Ofz}VTuJEn!T5L@HY)1 z-t?)_;w5T?!{0-?D;C>HpPnN}p&SrvDpe6@_Sv7a%dunyCM#Ln5yWoDTgpiM(&dRf zDd|;Pbdl$bF-QKx!go6iHraNzIZJ@fmhg1b$53V$$y_Cl32m%FRi|=OirrF}M`|V* zS#MT$OKkzH%QJ2mqovVv(-aa?*iaSnQux^JYFuGYS!&kzYeX**#T>!3KO4^z*yC*# zkx;j5QsVkr(Rr5#k)agpBI`9U2mLSA07pRSMV)gAVOD6a_34iE+(pc(`>G>1iUN$5 zV2H&odnA9ZX;G$ELd3W9vwmLgb~rv`LY5XdgjB#k*O=G+Dcl@@o-}f~w?IpN@I) z47^}$yp&pbAl>`9jB4 zU;lDP92T>{@q6w5P^f`EKzJsI$8A7w@Mb^(s4Bm-n;KmT#~QT@x4cVqAKf5ITIIS# z^+oQ*v-+3&RC7UaC{|p~s--#2MC;16YVvNmu4q*9`PB`7Kes(=hPid@g8#7}q#Ese zEl0=+1Z%oYT{n-5Bd|@G-W`$93u!MU^?nA}aHMG*=AlZocllN3&B2|Exfu#dz0b&k zpg*xB74hY2(vi~7RIlbYa0jhdA^=cdbI)(%$I#(R1xgap_`KoV=Hh*`H|2?o{ zt2t_T_lY8Rf7dDt?vy>b&a%jyXq6ox-6d^`AW#Katz)TT)5^ag&iT3E=O0p>>7^LM za@AblDO-TtEPC$VgYy_+d;xhYW+M^f+|C6hd5fo=pN2+rOW@u+Mdk2 zhY<~a*JEjT&w`&I7c|I%qW}zwVG)|IS=BE%u77h(^ELC~`++!b0MXSqu74;SAg$c} zx;xb*iG|EsMBRFyFiWmh5kj11?oJk;`8;Hw8Pf2^TOr_*%YC`yeSOgf+F8|8iA0s1 zHCM+v&+1p9Hp^oGex=S2rfly)PZpg(poJcPB8KYOY3))kveJcZ{xxPTjebs6v zNwAoW+46bXXi5cBoIM%qlmE*!vCQ&MJ5yYcYS6KV51v?5S^F07-Jd0|VDOzXqBMHT zg0OtCg+F;d(iyM-T)jSlQc%)zvyFH>I_C)1>$TH+C9aAvtGi6+VFGbke+fu;X)cqyjOJI2B^QmjW(?Z=EiSnK3C4V{gH{Wx{Ukduu z;j%IXD#cvL#N6`P&c`gMS*5BaQe4^|SFzDpN}vxxLPpWnYPBYVJX8;Ih=(Dy_3H zG@omE`4*o;X_roe6s$zzvJ(w50p*)N9-$$3*B``9)Wghpj$*1eEAK2zAHHYjq|M>+3J?A99@O zbffL$-2uYtGGa63_eW=+O?MkY?w7U#VNJz?FUq2TiK6uC`Hb?-?pHutiopKz-3}Hz zDvdh-o1Hk9_(Po#P0G5}1|6t6A9Yg}-$Zr{&=i1DmILFh29@no z$1-CD{J5C2ko*D$s1}s}fcmgj|8dBSBI-~wtsxHWjztyP9w*G(Wv`)GKX;Oul@q{R zb`b7|IjXnn3WC34iQI6mHyCU;58R$9a}lidsJ+wbbf%lT3zxwe2Ha2oJ84x2@ROhk zTWAQ&TakqNgGx_UxzA#Bg4)W2*ypY&2CnD%`wL!i0`ix(GRQRt%c*676%Fhe9(`vf zceyOi|6@>MJj6gyXK57AEe4m=W;4LjuP-&aYL}{b56<*X%Uk#(@T*wQ*N!~YcvOrQ zY5^$Fm~KArK?O^(#Nn+6!tJ5S1amPo3#Q^e=7i5hJ8TH_<&BnWpSIRAtoQsNso)B$ z|0xlqKEQ(lDw(#KBv4OK_Gyh}srH^1H;XYnCp%^vT3Ne{=4%YC=S|S0&xrcBo)c>M zZ@idXe6#&dX)5{f&zDovUukDfMd+!S^`aC~I==a_)J76*KjgH>EbKKbsltKlesAvR zl0)c8^AHsq;g8X#K|H$F5hoG$$EFPm4!PYihEOrw_6%e=$L{gvBiV<{be{(YE8p<)BMUsT4oqx>%j_^;EwcWDSalo^{lerm%9C(iH$pt5ZN_VkXZ#OIz#DnbpW04J zWlZCjX{iCJ7r>p}hTXt;#*`{s>*{6I(#}Ki8`9H-;!U6mEEJR>s=6#qEUfJq`{k0P0Hd^bw;tKj4xmxh@xV1LSQ)`du9L z%7cq%l)UGIu`vOyGQB|8T*74`=jk8bGtWV0h!aGL?SaxGtPCt zjwuT6XL^b-}cs4!q4Z?`3iH_)X^q*z%jS^rF#sSJvo$LWU?wQ=Ynu3hnaKYIVfR+1 z0|-j+00y4$5Yf6Y zW?P)={mYu2E4|#V=fL21XEt}(NC}_^rP)h`BZx6l%J}yCeHHa)pPD%!>m)(CB@tcU zvuJ$=N~+RsjFwKiS$lmB`0?soTR;37%#%)^C2_T~22kH@)@r6GYdv#+0BY{-56B<| zP{RLfv{29b{wLQ?0DWfW^;c^3!7OEK>1+ocvqXO*UHss_RpMmwRN+_(O~5x{X~DC_ zW({dJ&Z&c~xFQ)%3_r8$oDQo+fUw6n3E|OLk)%|T8%pDs*`KZ?qTYorG6FBY?c;I` zN2OXw?raq>q|;0gFbEU*uf*6U>>CvfFjz?MmOpDDxwSQ!DAz6^WT{6G;cMw$uRG3_ z4J6R%SXfdibm$o?KDHjGRe)M;2kZ|f&a9Lviy1lL-{A4t$)aW^fF7wZq97Ea*R9%i zV`-wj27qGZHg<_m5HQ2DfY+BbPjHo;vQdB_Sr6?xeOtt2Bei_G#7fdH!o4Umjb}yy zBMqMnVmM`N?u$|lg=|^@rc91|GM6%SRX#7*#O|vptf4Y- zViTRn$h2HjkQIQBPu`j`8AUjyD!$0&vwcn>^Jx4YE@$?>YuXXw#Ix}R{^prbGtLNT zM?7PAoV-{Urb-CRV|g>k6}E41UM*|p@(XW>vG?zlH&I`c5xM|pd<+HBQHYv?65CZ; zAF+J>kR}kz2v?>y08|jxg`p(s;+FGY;v{qQ%PW~eUY}E|gAD*Nyx})EAh^shr#aKd z<1elzp2L{)QQL&tdG=Vvnu!ck62oNqD9#@?pg&DK$-IhiS0RF7bmOro`J(?m|> zKo#?nu0N6pqEe?Xc&l@2`J6r%3aks! z*Cd@*nsq#j-28>L%bP$gaZCXy&JRl$TZs>kB2Kd0+HqTiB_7P;~v6Fi7K_ieFR zv-prfZYcA&VU+I`D+JYo=_P|KAUPH#%WkVQ!GE06-}MfKDH<2o{N78OgL)JLuyOzra09?%YAB$^zSJX3Sf0HeukWoDfu&F*#ch?f`O8`2>vGG$d+UQ+lsUxZn(1B)hd1-6}xZ(bX?_RsAvHZ>loM! z!O#^(+WfN_ssYHJJ9Y61IQH)C`ngI)vBho_s3HQmLDG+Ug~u;flH9F66FT;Hguro1 zX%>+d5V7;_B;G;m6zZW0=4SQCBhUPTc8vHzg2`vz>b$`J%Be>?-DjuurLWZDP zh=M~`(Y>N|kZM?zCXLCeebq|!HHE%eK&1sR!yUFV-YevGGn+GYNz0>|8}F3PDwuhp z!6+G``XCc?Qrkj@z!UvQ+8y(p!)JDlV+6jla3x$#I&YiSBzJ^=3DEF8@2)o6bZS(~kO0{$zvDAz{rQVhtbGAK zV1-67PvK>ndN4)#r(s|aIJ5!(xuoD66918TvC0FXj@jtl3p+s(g?1VNAY7#yAU{sR z8f>78Of;>li}1r75AmyOoa+RftTxi)$M7e&wiK|!>yqI5nQqqu%lwjFC^#3H`lF}) zxUsBP(HZqMhScq%Fk9P=A76smQ2)$YEtezze|Y#X01sd4OY#y3j5>+{;t3=cN)mWa z>SoSFa=7ObHoOBij=&>AtR#o zns){iGR&j{3|<+IEibQKK6t|`lsT$PIKG6Cnd?%A^p6*%uh z6L{=5Nh7xVy4E7(=kU!(k+vT$;36mW-KJ=7*=95mC-;ue@=9b~6>t1MX%>AO;y@A4 zt)At+IzaH%-MvaAhr2ZfY`ls3q020DZEe}V2*CKXlS;5qW^q+ z8SKrefSmCxLfCn)ra6%E0MT$p9D-ZTaK&0!l!e+_x>7;FfjIr@<;X&MT6fyD>33#M+rlQ3#sw1JT5=7 z1>!Z&t}yH+j3j1<`%UUip7fS!<+kM$dFF7rLi(%IGn!)z>gg*T1>B(>*2gK?n&O-XUrFZQuG1&Tr{ z-}Eldc4R)+%Y;=A<+D5}Jk>bXmvKTT&)jIh^Q^;uS^?91s;13;>c@4ODnkOT9(d}D zwf~SEDyAP*sJ{#}qjnRpOpvTK6u-$i20YXy%AGY_FlOa>1+)m4kYZVK7FkWEVd0Oa z7g{r5=WqSU6fKe}<;EDeo-u_#rJKkOxw1`EsSK!w1k^E0tt+^lng%NW|NQv?B|9hc znRtlVjw54W3ske%91&is-VhEXl)T*byO!-Ix(i>&<=Ju&28(4?%d;ngrm#o3r0U_k z^7>>|y1>&eejbmN9Z-h2xNva2;g|}K);{UKF-=l|H{p)~`gZW`S%Ff~*ZOxkDCBlh zAN)Vm-E8du+_jU@DJU-jz&K8B_rTRcVZo&=vXMyiTh@eQ5U_Pn;wgoYNi*(!d$9db z%0t4|y(^VM(o1;P%@7j(M{!11?m`X~hI29t(0AUr^biF9;nJ`3LI2;m^qV>X{&fEn zmwt0;?7(}K9EIyB@@Rto$K%~GsT1AZd7*$n%f!bD<)4c3(?8zhq0mp=_#JNUrQeO>lcJ@tV@Htk}K2?PCiHkW+jU3?BUsod_k}f~PoVnuW*R`GN4<_l#Ac`) zD6~ptO_-haVP_7b4h?CgP+~J+Lgmh(E*)9p{EBHlS=-SKc@Wbm-UBm8$TdAAK;GL1 zvs>tm2S~j;`y!I_#H__xJlZAxt*UZK$`-Rr)X(RFz860m>-I(m2I7itavJ1zvR8KV zLO%S2yeF#NVlr%AqS#A)ChGIkE;m7tC?x5;J!YQ=Q1m!_`z{G_UrS~6V=blUu9{^d z63fb0g_@JHAg(NH9>#igd^V z2MH}00-4sRtPS8W{{m8jM2W(s$A_}paz`N zo6i*#X^;on*zNhR&HqK(`rlFXN$7)jjiVorReWTV4K6vaaKt;i$lBYBk|U(9AyMmm ze*2@lPEQ!T{~_CUM_7zKpDhCSa9lF&k!bg?x*e`&X~ z6<=jFpC|EMFM2=E>AdZywk6^exp?q*^fvz7=hi2$Tl+>a{vZR|HR!*3F>BO_*=s@J zx*fC35RuPpBWVwx5lN&i=XGaMQqLIFXtyfcvZjo7tG)NtOp0ltB-Y#YpW)WJQrmSp ztn=sx&)5J#rD!ZYrrU^mVb7(s^b-+(vJZHVhC8z5YLSLvAgw}EjX#@`EuiJ!&>plO zK=>L1&>$IwQmnWC4)CFkrBNo)rt{8ZCeOf2+eachEOE_nuy&2(gngz5uq~N^5#K>h z-Cw-}Qu;~aIkbQ3ZQhAUZeYY+E&f#96H@DEquY*D&GVk0I`CgHpQ-$MsrP?_-^++r6XBvT%_Qg4#yol0 z#=N?$6sB|<;~+&=;1V`RNTX_MLyh*QM+K)PfJt9KQF`^eJ~Aws094rAscSyjO~La% z$V4Ow36!x9R66-Rj!gS$xauZ{lQoH$>OBrw_Kp! zDr`4f69VD}Mktp@PrKO-X>!U%h_~<|>yJbgCk{6LzKpu7%U!i1^+*g7N^aM7+zf|W zt%mTDAeRaB0xvVdGsmn)--GE2=7hFad4RC*)t4@VZ>H)~uhx;CbJgY6qES(l(2Qo6 zY>Wl@Wf|j((SB*eQ36PHEyVlDJTiJ-JqhE~q~0rOH48iZ@aB7##@$FvX$c&A+4)>Z9;5se}`s8Cb@0Rhsc$sH<8pi(OHy*`|Ym8G-TvR@Nor+ zG)*HhTbCao?T;QWB$O3Ze$14{0rQTC4)fbBYC_^{%0WKt;Yas9y*PK-E1r&5B=KHB zTyjT`S*3b-Wg)79!Y@Z2(^rXgVwuilzjNu^@{8mB_QG-7LRb$4GsTa$SV@{ac?u;s zP6tvQX2QLERINglsyW8awEP?E{^Bu=ejVj*;423@{1#@HgS!6C6BJJ>X#h?SKp*e_ zwC{~QWG%CFaq%(u9v$a)Yd8OgD`EFD7zjT;;zi0~K2F}TcjzuBG3EulSO@*p(dPbB zH}<{N!G1Ui6Yl)U*`~lYFn0{cP33gJyU9Z!YMz(!ZgBl9xMbegg(YTF zJ)BeFcjf3jnJbtB{yfRi?u!>3QE4OG#s0*G7bHxH_oA3LFZLXl)!(Zk6xanQ* z_EbNzAAla~WGW6NLiI##{h-8rp~QYoL7jhQ=7bl4_^23%jL)}d!ie+!N90G=_#|CR z%yDT{{RzNf{`gdlj3x+}%#C*TEQ}^5cS`A`Klx#Y3qnmdbeuWPiIo?TeB-p9axR4= z`}_V5BxM!Ol?L&?6&1?}{3Q<0ioxJ3G4g@y3*-C4xdy;Ht-)!W%I=^^K7@L-ss1T` z9g}CD2i5F*^$NlMuXWf=+4W?6Rp0$wnI2qr#}C3Cuczg{l>o}WspBzTlY-!ABotzSQ!wP!06H$u_mP@yd7xEz&@TEj+%GX!Ys09jEImAA{}J5oPf7Zc3f#?L|_ z&-x(xAxAzZhc%&A+o0S+RI#)Erw<`iFnz!=Gupa6hI$ct5TanGca>AjQpBn`HsOqY zy?&WoU~X|X)eB2+uEvvDUy7MLA5=lZ5SvOCh(;*}G})H~ym54o`xr}JNJrLs`@XA? zNm|UmwCfxTnyZ{LV5gM2jnrYcZRQ$^P73q3Mr1=l8~MAtt^`t^%7xR~=8JmqJI*75 zo-dwLiG0sVExHa1RG2|zD?=4r^E+u~8ACETpvE?@&guJM0XOy>P+%b)U5HuJnOo}z zPxCo8X5^uZPnaT{wh+Wz?mXB#Ige$aq^}LJ?|ixs$W{WOfu0}7YmG6Z%npTG`9NR> z$FFS(@m*n_LA8*BgZPI;zWGMeM|$l>Y~ur<+7!xN7wlSDn*90hR*l3EvyLYK+e|X* zVH1Y_Ex8-rvfmA|#!Bm%$JqX0*2DK%!H@pqU06z7{~~=s;iDo2W4giWN)<}x!B05%4`SC|Pc(nt z?;t;&R6(w$Y~8}{n~R-6lw%yN?5TKo98{m@8h-gJ?o>rvfA4dkBB-qrCk^w~gK-R|E|)=!YV zHkqz{E-)wcAvha}qaI5w>MO4#8sF4j512Y1HeF^n3@9Gbi^LFBq+jpar+rFg+To^0 zl5pj`t9{QD|LO$2n^SLJS1BsI;Wp@;gEVG7^H^f5ND7#he5YL2FXi#DdW@%Ve4Fd- zCVgS<*G3X~Em<1{qO-eiD(#d;onhHtin>0oKu?;i%MpvpUo}Bqr63$!EX{@5 zVLTiA_DE*fw)b7hdqV3FUx>u+xW>Gll2s80<$ww!`s**aSg0rE2GyeS3;$lNA-)dy zYeyJ9=OA&VJg3lD$(Sj(x8%!atY&5see~f3D^l2GP?(JNbBHbB394lSg$n(@6sp*F zH+C2iI`A>Yd@NH&kajlG_+(h8VQv=Gm^sCqHwc$|BN>v|>iqh~gUJwO)a#<>^c@dJ zGp-nbSmo3n-w=pm{Oh_D>1A#>3V|GR2LAj#%Cak;Zk>#1$ylU?3c%{9>0hslp&|bY z3H)V}`ZA;pNP|itdN>gn1irEyP(V%|q-WuB{ALMeHy#9WIvBcG-%fK8gsxWxmS|t8 zjiKdmy^yTw9T_EIP|Bz?6m8$8>C8*QhWX_L%*I!@*zd|sb%kiMb42V8rS*&Q;FW&} zMcU9ZG9xDU0gqon(=f+dag4r}3zXZADu?2dSm1p6$Cr#vfGPLOOjc7|3_%DLs4@l3g!Z}usT?68tJhMIx1Y_pm-gT6aHi=T3Zu ztKk^foFs2<24bIo{lEyU4Q~9ys9=PM=h_D(XI-w-Z>J}cy+2OrqzObUtO%Q)wB9O| ze-T5eDboC^3tgllrF`}QwNuaiTH$jzH@iqXk<}X3Mbs828Pp7{H$ORhzIfiLpI_zH z*S21pFRrta8C(hOvyw?{K%*_+yXD?p2g)2fPY>Q>t%7O3@0Mmt-`h1_tr`zQpB=-EU z`sAN)X92FrD`}RAnT>{V?R6-~{kDaD-=Bv~r8ch-{C&<|R6o_?6nd$|9A#U(k0CnAU>GFr64awa?Se znZzucISi~SK5jR&LVIa_D%hdcAXn78zw7Q)$$a)N*(U=oH}}PE-JlM2OG;YeFua}S zfh1pNg~SYZuMj~m<||ZV$q~uLt%qk*LrJ2Uim^DH->_fnz?zO3bM>hFfXg*mxPF^= zkHT-AK$+z=ATxD4qdL8m2}I4uJ=RfKXF8%BxWa>LiMO@QIMrDi3M1zr0&*+TI?GjO zik!*DW9;BXoLaxkeynyyR0(OKL!(}9!hP!>e4*N9-{~^NmB~#%UaJeCllbLJkZ9B> za|p^a+J}osTU&R_Ie0Xa%5O*7#FJqs0L+O;&t9vWpkHVKs*)&j1JByrHR zqd6>zLs6J>#h&Bl_sb_89@oFs?g!{oT0*~Z*FG(RX~0K4m$CE^p$hAN;p|G%@=>6j&jS0fG;K|{c4{|s?QnkYGJF#FD!XvnHCc-cz&eJr;svPCsT z!y@G}i>~SHVE@KW+6;{)`}mA*c~T$U;=&EHNH%VLU7z1{S|-Y@=b(&(&3!GCSGTDL zp<=tipb#@hP;SmKrO_Z}V#JtC$;EY@vpnu!e184vlhyaC<4KwgO-%+}nBm=4j%mt$ zJt#^y7-Qx*SQ!hBDl>LZ~mH=SnHqY?8C-Zkl0mQTh{#61R$QHz7} zGuXLc?Fpc7a)<4L%HxWB`5{bFdPNa0r<61{_6I(Y8Z*)pMU`zY_by3tFY{UHb1?Eg zT|*hay%A0P@GbBzCk)%3+me!;->p$X(eK;*z^6$@#?iY-Z-SayX8QRK{^wT(3fuj2 zyPGAkTg#N#OTFq-@}DG7u3qGDD%gi;Z=du>e?fT{`T^d=xd3*}+CdU-?Nag)#bvf4gDsc}>bXDe( zqiL;z%oe!aG z6I_B@Ah^2(2<{Nv-3jjQuyF#x-C+lUy9C!DA-F?ucMI4nW@qd`^QFL+d=WzEuVHSATD|C4)2TeiGxK)n~hrzTj(Hk*63xX7nQrxx;;(*)=}ViiF3ev}H^6{h?(o5o~3 z8$xGXbg|4JsByD5z|<#lrH&?ZeDuox9?>%%f*`lrC`U?_V-9YF>v*;tPa)R(~kLh z+8uE#D2@*VXy$x?t}w&Dsv?Z&3}?1ISqu9>tK8> z>`mHeDsI~vkP&wNK&U?8V*lKGmuJN@Xueyvk3%$H)04a_1iyveDfa?7JK$7sV^ER50 zj}jJ{AWjAVxn${ZJ?wp%;1U?g;-hOP;x66u7+ZtD<}eweozYF6OHJ7S`~H%Cg5L0A z4u#7Ev-I;(c20bIIjLb%eWh-VwnpU7PorZ48}p_xa~aF)_320MxAKAPA-^_tnbfn{cV{wV}9E z5(MfgJzSDvk4Yqr}o-nZC&x%XJ} z(`j%gd3lMhZQPGZvzh;@akH+)Bv*KBPl?*>3@5L|6JOC0Lm47E!)O@Uu!MU zCK7e;CCaGRlw$ld7f|iSt^6gJeJUD9eR^uPeG0^VlbKi)zpn%*=O;Y2;{6|`cMrVu zy^tWZKf?LH91v0f>qz{~$EiPK{KfceZ_K|d#r>Zp_D6L8>A;T(I1A)qANl+?U)3ic z|KVgr@wLcl^Kq+Cc`q%nJ#TO1wW$A{p``I7hOeOhfstluK~ z^G(AX@b)}w!7q7zexK!E32&aglPCSb%mn85cmM6YKNt9q2NEg}Gdg4tks?_-n&>X= zC$%+JjCw7vRdO7VqGJ9Iiv9IeYq7vcPvGLk088jUN$P+7m7E$7BL*fD;@_$lxUobO z)K>*Ix8dBId|5|p3_^_mkE_M_@w}AdJ01?M`XfMc)EHn~FURa5|G%!&`#iU*U_Q9~ zS)VQPfX#GVk7o6k>G7}Y|6ZB@^Eap>z*$-F|N0{;CGfyqP~SKH_0|7=g}?r)9sxXr z`YS#+nLqkX1$f74D%w#Olz`0S{?fhs^$f}2E1LuXdHfhe947LeRe;!0$+ka6+jcLwNMXUlu#QjmKqHhiUU(e*5hWTB z3}z#>9u$2Z#EG!M&p5Ty^(>?lCAF`?m;?H9b2EelHbDD|e~t0asm}*7uizpU-wM?c z&L_Q!>b^p?ZLcc)O1(755oh)1|0JWH7vyvAir+Hyr;`N+LbnL9AOIiJF(uW3D3>F5 z>5T1yzRLYS&p90sR9t#|VGZ;y{T_Lz%Rd*A@C4)~>uK{H?^&1s_0jnN=w-cCn3W?y zO65`zJSeuYFVCK~`;3ks&)H}aY8t5azf1kQ1xHTrzewd1pPepFejvxI;2F|9*Ux~9 z;QpDi6yo>51j&J$Mh4-X{aLa)Q&4N#)J@wPgtH!o1^72tOg-%T7n->WABE!tK#wJ9 ztSDK}I!^{d&lzLt;!8;(JwVF~=Eeiu_vgAE`^mKTEJ?QN!x@ zS^jhq#6WE4k7<$i-%X3AVQ(p9g5~|buHjf3@GI-D9q}$kd4Cq?e>p%;5e#4C4eQ42M;vs_&w-`V)$+#HZ7O4kK&7)U=n<=xl50i zfXV^PaUF)|9uQ1`)e?GbAHGGy0K~H|2ihMxD6#6VOK5!Ng(D?WN%LfE&{_mgYU%UI zeqZxHYSQOrparE>YD0&^q${J981=c1rd*Q5h%Pden5yQ_3vl-b+zYM&0PKjQg5Vh2P5`mYduQJaK z7~3stLpH&Y`E5l0nZ^Gc#05_!Ef6!%iSwebfVBe%@q5w_JO6UJ0|99*nZr&8{5GqI;s26WMy8Vp z_ug&rUT{Lxr{^Jd3_u~{^U@|W>c$On|6<;5%4m_!sF12{Cq@mj}~2*T&VGhQz7ozQj;^BXq}l6J!h^6F)=2{cMSGIrxP z(yYo)yfZbwZ3qzq5fKjsiJxDt0mi!0pns z3+JHi){5~90m37{6pSiqPvn3|7mpHx*kU93m4+V5642W)oa34LABZ-ElNrkvls@|<&}a&e=eK^NaIv0*9w<900N3}`9rBng`$H-b>+8{YT7772-6?}7 zE!JwZEYqoeghrUrIC`r}tFF>nE@*-3d$hoH<1-+y1Y~l)#fh~X0y!$EkF}S((kzRr&1vB0BwYLBIN{NI5U*{^nG} z@N-5IowL;TR_M$sn{KWO^vr!CZ9+UpZ?yB`7Iq`xaBDtYyl-qjZGBFE*h-?aBQuG6 zx0z<92@%Ve>!`iKL1=ig<9H(OjUq}u-yQGcGm(OpNmhAxAn>cX1qh``?`TU9dVZEt zDst`ceDv4|^?q8P_M0C<0t)!QE?`ZhEAkHjv25W?47X%j8eGjjV*|q(&PBNwR;BQ@nwF9neRN>?jZL9295Y@s*bby zOq&1u!tF>NED@vjJpbv?Sg=P{?DBU=te2iDd#k$S7GMj>Q|&#vY|`_)cKqqbe=3+L z#ofPs*7uP~6QX4WvTNddWI{jIz|BUu@#aR6@>}Cc_f%HjSp7@-RJ(*nzUKZwRoXin z5vXqHXVU5^eed1+2O$6VW52Z-7C+*009Cj77z5TEk@mVwd@z}#+`R#k^LJUgm3012Z$@rwh3)}VkgSoca zmUA5t&*E)GTkJ639lR*?@GtjB@jUU~x;Pdim~Be%MI_Lf8Zsp6lxs$v-e(4HW#BlT zF)h)&M=kp=t;F!iwk~@@C7Ls*ifK`MW=?LX$OI<__~}#_%ihvl^?P*zoO)M?m|>Q* z_vHSg@S^i>sb04Z`|oz=n%k}KObT$zk{l|I#)`@|24ffPw7;SOgzBhpZPXO zaq|+nd6reo!T6tyd)VFO1`_WVZ9kgz+B}$+up28lm9bcN3YI$lJzA=UfLA` z-L7YhQ22;JO>XF%uD$9V(y4s6$O#qiY)|P>@vJ!D7Z!*gm5Re=)y z?o|mE6O_A8vr&W^b=uiS{5^`#kOjVO%l>HL$-$0!Lo^l@vUEI;OGSF3Z{IaD=1V84 zo#u^Dg^b`QwLkLhrBP1)I7t)_PGg%bSie{qqBL!GuhG?@19nY2Q~;as=CDKS&)!Z> z0&yKDnQe}4$y`!Az<(<`=jtJ=iZ>j4wd_`*rFSxG>Gi^7yfE9f#lu<4+2A`@a)JD7 zimRmdUR;7{ZXHfN>uIfNn`^C2I{mr`%=Yzn14HKx^cpRbj8>~Wc0h0D1=|Xvmk@#C z`;*D~R|l#m>_i|9gpCopW_pq>SUR<0&R65~o@PysN~&mzkFzy)?YtUiMV!(%J`dZD zT}T!O&INMdq-cQ$9e@g!KHc}1%a{yxb|H;gCEc2a`Sdlk#Y|2SL3)Y|$@l@QeQ2v) zeXv0EeO@=y&vzz+%tcB?IZ`lJUvHUuCf}@O;-RQ3=O|=|3p}*w=J_|ccmCj*tUg0o zFug@0wB=#nJEXR{37AcCazrM;x-k12IG|N(5hkSQz<}xU-6$P9IITR#lsBnsmSfzD zCMAan*#9QqmP#v;pxP|wMPo#b$a7ehcKd}kA1|H8v3j}AR$l;&yx&>-;Y(Rf+yMXi_Rx1WcM>L7>9!z;I1Bu6w%rFZZRk$)9I3~aNY z1FuRPgnRLkqdQ4NJUSWJ=~Y6WE{dadbPrbbo(9ikRnpKP0rntqA_UlEs);D@TU`JS zLGC_gaoBrI<$*>9r2rYygZ#0pRTnYMVKHr_N#ynlpaQdVut|1^UrvZ!H-hT=Hf#q( zrvmtOn*@Q3uTk<%(}m;6dA(83C}!B4c|*((D9#t)A06vI7pHC7B@R6!4^%F)ymj7c zKQJ$dwSUF0M{bWNI*vMte17jg~zm@i=`V6t|UHA?j}lLQgpFDUiow0fb-&b+JoMF2nH)r8m^>9h^6yqDy|se3u(#rqR`CpM zJ-qKZtKR)#np$O(M1V645u8)?)t#@q`qw!6e2+BHrT|z7?vc;ttrgnzpV)B68GxyY z7gikktCdFH!|3`*;WtD$LT2h5f=c2ztMQynbSwiwqniLX@1O)!L~I5EvLAuX@z~q5 z!TNd)j4qa7@8QGj()Oosz2j}#Oo?BYt#qLRxw#J>U7~sKyIC!r$1I(rgpgKO%+I?+VB&LPEXp$EV9wPF_|$@zEw z?slYBR#2ytGFaqX0i`?>rW=LNW04k-#w>QKH38#u`shtD`0Yls%vIL~Q2v<@TTt45 z0Y#B_NO<`RT8iB~6O?fI!Y(ik?Jdm!`ushv?p$r$d>Cd@dbR1ND;k+ESlT@l)02h@ z_z}CvVHbiBO4h8pVnd*m6I%%74fepL5ZvuxlQW%sg-Jw)PHuAcXXE+SodmrH5gm1{ zo!ucKdVS>?v0?Q9TawGvex2cL{ZKrN%>>q>-rLGLT=1VYyRZC^7;Sz5_I*TyBQhIK zt*GWAD9?a92I8)8X_tXPc3?jr8M9JZITMW0!DbFcF!p_;c~UoulVohdpRR~>a4Rp`4LS<+^Z0yZn>c> z?FtkoTc+)^tYEctk%M#6pad||pRpb3?!O*Zp@mx{Ld_ykaE4DDXgGrRfYeCxTKzJ1 zOC@UE-f^MCUWN%YgjY+4|7e+rmB-2KPh6Jgsf?8(`uOWsf)uI8^1bM@#asvA%sBG; zXv@OeX;Uju4qALq#>H@-CX8o2&&|9-_y(Ng@i`hsgdJALp>af=64nx~t9X868sqv(PXGG``nHZ{cTb^5`!^il|JO_npu|I(RxSPDs z$y^%D3%mSw`HX}w;?e!G943j*78AEraOjZgSpbAWLT;dyxeYd6Hk&-(ru#h7w1cfu zp3PlIY^bi=+3k%XcLS%Idu7wy*4Bna62_rp$WbfMekvMj7<@dGwMsP}NEeTdW_{xbAuQ$%7lmO$s|HB1d#sTBY^3TucE^VKi zBkA_rCSyfK)G$&u_ghJimhWWMt`F*O&9BX|Z~&;$5ydgnlSY*GwrplvG<=2>L~sZ_ z3&n!kkkF-|g^RcM+bNUxw;o%A0!rChE)g2sE0(8|F}_YLz4n_co3Ap` z5^nfO%KIS7u)A3MC08y}s*I`|3|KPxp%Z03T7|oqE@=Vs1%8;DQ1j)B?_(J!AINOH zKRN-RbVh0V$7SEAJ_e5MD~EM>6M_64I-Tqtuz1vutk%247chokgO?XA?k90m9CN5Q zfCth#-%Pk0S?&XOEYV%X=eT3f74Urw2t#y!3~{u+<$Sz83q>#9tjSoe*1YOc2pFQ6 zs;%Q8+p9I2sc;1PPV^?vP;{at=Wc>li`dKbeX=JvZyN8j~ks|TgPBB!sm3C zKnD727!PI4Hbt9Vp<(ZVKDQMj2GkIyRj}&KJZJ@mGopZpLEFQL6BR&%joblX75}WD zN%EUtS!XA_C_&Dz{eC{(0A7WT5PWGkBv85?&pUkr(;PK;e?oyNmfDbory-2l5Dt?m zwDh zO>h^I*@Y;`<>aK#4h87}r)%(bK2N`zQW1B(4NWB2ZYLgc1jQ|>qIeDF3M9KX8FrJ| zMWvWR7pZ5PoguXv$M13g*S>H|k;=_pGO*&q!rB7#ylV$tACh;%@mdjmJt}ff>b%Op zq)`&pP+GBW;fJVMP0E#j28q1+NQTLfQ5Ex*W~>w2K8wruJ#rR5d20CpwPyK<;qgke z?_hvbC@jcUHEs$4bD%r-$P%(ha~vwj%z6o zlV#KgfE;N+yAjCz(x)4@Qr z!Rk5ssTE$y|0n2@MFn{404{|M1In6pDbLGNfT|c4IrA2O9#fYfzt+O(>rNl>(_tffCM zYp|C`jPiVX6LK|&$plI@M^2UmIgtj2qCCn$h@PmMjh^z-BaDX+Qkv(Fj^8l%;PUTK zVNUEAH1&F}_Qy2$_%4F9-aSQRajJgTcw%|j{y4(V#&JUr{t6|TcLW-Z^13RcNiz7_ z&}z%r@^A!U)pVXMB?v>6rvTagmRcE%GhsR$B|(kgCd-*Z+)YtR?XAw0$T(`yGG~7O zNk0F56&jP}H0qr9&90+lJY^)U)dh~e)H=4!)M;9D(lzJzoy=$Ww~Ng?pGVEzg}UG< zHLzAf(AipzNw{~u?1kiOdAhN%vH*DYz{XE$^AL&IV)=3;7R+cx7~zavxJ0|$`CkZs zeTM@VWhr8JA1!i!jXgCP2vTuw5LSGZCYQo3V!tHh`~`A2o~l%6>D`dNE7rP&kZY=v zTVDnT)t>bwm1qGLVQKcXHoFZyL)p`?{mNBfF<3<4!$);}AIVCj-hdTK%$^lDyApX} zeG8aL*tOD`TO_5iVV|;!%@!W3Bk$V7f{K|Y1g48BX!IT-PL5v3AW?yR(PF(;?n+y8W zq2lO6ug{t^ExBU=i6YiTU))Xq?Ce6D-1>S#%j^J~k5`yBd4LgnR)wB-ot}hn z1b_@~IFeHJ9G%L$fA+f@R#|3RijDmQYPK2TJdPO@ndW!McZ}w1&1qHXmP@`sJs9>_ zvQK*86-J8~h9;M&ReTXGF!jy8!>!*(HPqS=f;-2D{jj|fYqS}N1)l2-H&gnm-JB!~ z8K&*Rv*=>RlFDOLE#u>qPut~v;^U*IFmsrhu_T0A|`EF>=`E1Ca5le=>%yQd7oCDFu4bk5 zUqfLo(cC1N$NG$V*2S=1>sX~a6H|idto5co-fJWB_~ZPpuqKdYN&0sH*UsBN-mZJr zi#B5=YTAC?!pHE6>sLF5qj-S>+`NE?e||ixT2U;2nC9&C=-t0LX12bG1s4anL&Vl* zO7+z+uW*aH$?f-ac()nAism}&L znDMZxv0A7bTFdNxAWA{mMT{v5V*sg$j*mhD=OD*rx5b`Jh832koNv^@7o&k?xP^{o zn4z36|JvjeiJbzn8SZ#NJZUguV;J3fe33_KEPZ+o#;dIl3QUvs8x>!q{DRLRJze9Q zTr6ib6_0F83`Lni&2Djf(<%*bfZ$;iJ{K+Y>2{)FJ&vkvl!aisZQS4I(upDVtyHbN1@+n2kT zVT63H3y$hm9}rC!PInq4f^x2A+?6g51y+EX5&ylC!)C3cA8*bX@A=2%J1=k^>RD6D zr;+ygX~L6zclr$mV`esEEm@)l8*o;#{8n1*Qa9UK?Xu5(K%rrdMz;A#W**0FkV+*> zPURPqn=2XuT5L1?@`K552fYSt2NGs_oJy{Nk5&Zyc#hL|%qokS6y96m^BGa@?#C&xzOp))}SI2%DMJfV1Huy~qIm72;fifFe9DYgMtIHCEV z`ZJ6}J~7Jvu$Af06!^CeT7yo;#K|6^9_e+vp$Gg|x)U$a17zWdT~dHh;yFGlYsdbj z68hX}-c}h%bcdUXp9DLD-6W%gwJ;0)b+1~Zu*c1>_(W5++Jg+**E59WEXwCc#uES( z$>TD$z`Nfw+k#HBe$@)h*@`~MLKv`|^#D829GG8qH0f{S7Nz}~pIT9-R7S$xS7DhRgYY08F3~I>1$PIR-D19b_=@O!_TsGze&Y@b zl8)GoNB>KkV3jLOwqia*Y$dP8GY^N#+INVz8MESJu|g#F5{gvs)8|e5zXQ9}#5vu( zG*>XGVb^Mf@z&++sYF{yuA2XA*j)@Wd5L7Cs-xlhWepWAOgn%y!BC~SgYz#_sr&zI zDrrrO%VcJE2beR%VP<)^d_+eu2$OnsZOQQ!x+Y)p)0*4Q!(v!hw3k9-RzOjj&=G6W zPt&+f=UmuTmTP$RadVMR=yZzS!6tJ=#NK&92LP81Y^BjFO4A zpuxW2J6jl>#TceWD-g3~4{jQU^WQR(f2UAle*&ot^=i<0|Dg#?Z7>xQPEk+cjD*R& z@+zbO;VPkau2x!*1$IF;a~RYl^QvJb1CIRd)b1}_z^Cr~1W?h?I?yhBEmmzEp`X@U z`YYTvp+0C}_Z9o7{a6q8XLE=#Q1C-Quq<;JK&IjT6d0Wcs@J34Zjw(5=1pXO+i{3w zYY4Y5pljMVVWK*4Z4?%;`UtB|XSOp|RmQu_{Jvvz0lUu=h@BY#8IPUDjr}72sS@3~ zsx&=9VfpQMnamn^PH*tVA%g)#8+So|58D*hz+zd@nbovSj9x|i2SoSh(!C3CFr=zv zPkK&8Lr~7#1v2jH0*d+%9B^4h&_a6K zlhAwl6iZpEC%ShrDz&ne-pGFHLzRUC~yn=%vF&laPUn8}^p zi@)OxTu+_M(9%iv0CI0d7cyi$cs4xV2KqE^ZWcGk2bveJ@`G3YiWz;)Fv%1`6m#Ld z6BobyVCg*bZyhzVtUmxe1{4{%I9@ZToNFM*G54_?m_-aD=GaO$b`JRp5@ zj=z#We1maNkFuPwTCuxL!dnnQ@J@lRz;6VoCxt#LfOCIowA)hO#k4>HTY-W@9U=AZ zIV-?n0>B=Rhct!oFr#kxj(|!a$z~T8!#jsW@wxJBE#6|Q({Y;->C|+oqA37vkqDqI z`Vqyz@zt~ag$-rmzDZRAa+7_kTt;-!l>__L*&!L6UgJxIGtaTnp#O7hbnLam5J!4j zJbKU3FDE4S0%o@+9WzQ|1&4)tBe?Zm}+;Mn<$6{OH-yfkujaSHP zc3(gJS)&!lP}h*95?NjGRot$hYw(%w-ei%=WTIj5{ucojbJd5Uk5UO}5(zmI+yW$P z0V#;teTXBH1@GD*(5Y~8yHvJN`9x9*3b+oZvun|fK6rg40kXN&!ei$9ujzdaxx)7N z5nWh%mYZzz-^5Iu$Q7^%$c`n`c)p!5@R+G+?<14%=1k~3JSvkk0_CTO>rZw%4o@-x zyk`7;W=;F%K{@%K+chtq5K#HXDId! zYY#$ul@O1#5f=bW$+sd4vQX|tzDiYlGq^$=Qsh78>sw`51Xiw7rbd`C2;CtbM8KAD zI2e7|n&*1)8isphi^vBv)DCSF<%>X6v_TWw`VvHT94@2A!*o27zKZQSr>Rr_u1`{^ z-PVD}UK-*I*F-~#$?dIWw5v2dxm~X19j#Zu+wyMHd5^Vu>E&n!mu2R zBZPHg(|J8jKEY38yQcuC&O~)ss1(}cx65~6+;3aBk%@3N1#df(x+Dc!?4KAy3KIim znw6+HT_mrs2ttLF^JOe>g6ld56x>an5G*k6?t*lS1`vVtjM-3Tg`SLH`*qor8s~6w zTD{^-+`Jn+1EyH}^<#65wYaT)hYZ|~_z{EtwBv+rk)>#MVNGyDmd0~BMI*Os8Kq76 zz6BIALeGdQVQBhd5CVPq!*?DhXwVapc+}5jim~lgF02ve?4SmpJGi_EK?|9edzCYH z5@o%Fmy*SI7NS1&wt35}&GKug>VVM%7uFX?{%kZ2VG{|DS<&xqbvQndi|n0SQZ+v= zF?6*N*K2Nqw!TKEQLirFcQOZi`!i=gLZ(S$ zyinm-iL_T^qu`()f~Y_lw`&coE^{8=!T>tyj>U{Zos*|VHDy?9t{|lB*cWL`t zx2NO&Dg*~0MhODyEg_OwWeySD-ZrEQiJtCmThZ6YwOQK31%mrnAb0m4CZROOe3G)y9Y}9reqcy{ zio&GP8Ev$hlDFiLC}_a`B%5tc?CKM&g=Wv+ava+`Magj`6F-wPJ2A!9Ys!VXEu4$3 z?iV8$zT=|BnMSIUe9KM5Qnh4Tx2+ELHRgG4v=E@sg0BRGbgWrkp87tgRcIjP0sxX2 zEKc*wBW%`0j=Fs_xP+5$om{T7KR>=u?`lofhoT0l!_VCIE?H8vHf}b@P_%9Owqm^hZFQBMfs3a$0=c z-s5B7D>EY_I4X8;x0E(p{#?I43lGA9$e?wwg+|DR<6k`e7&mgz3vuD%{(bhVM|c9g zqKth8cS`SyGyJ*9TfVs;mj0cM6llSRsRaJL|IO*#M&agyP0h4+%woPz{yE@z}8 zn|7$)N+9;tt`W?ji$3a(_XNnm8w6IsVt!0HEV^Sbs#zx0)9RGwmKRWz);pe(wV8?d zRSNx~nM(vH#5a5cb;aGz`1-2<%QQPYjy4p67(1>H<-2Et;@!#URY-E84-f>Bhw*OT z0XohuKYXWB45G^)Xk&!9iu(rgDmKF;z&T(oU*-?kjI??qS|}#n%j?yF29kKn;%Bv8 zF)64?GU5`Pep19a?JuWXh zdTq_;idE&)KHldcj$7LBfTaY<5vr&=i<}DbCXyF(+t~>~Tl+?)DA&$U+tub*hG1SY z+BTAzycW40AyEVti$Z_lF%6{_LPJe=i%*AZdD8~EK&qu)GzgB09fT7)I?VcFL#arCH5Uag8-4kL>y#TXBNbGd1ucal z8UD2TQwTjLB(o~1mx^_Z1R9^GCYSjx}llQKTdx~=#L z28FL|-CH1t{ZqEpn8A94QZpn|ui<3r*>L_L&B$!DQ^>5v2{a@wO>P!-Fl=5M^-#L} zE7CFkBiV|;(__I}`^_bfm#5`~i^Elg*T!??!~*r{>JvtP4>l=8sIkD~xznaM0;~#1 z|DyqVR6nhfdPYnIjfM%^mZF8ozk#iLCU_IMukB zrUXc6bnrc+!-}ZS!~y^d_T&N7S&EU=g%*~^B$YBTm_9K!0+ckeOy7+OE0zX=Ju14s zj_sri+<4cfeI&G?#)O9cNGAl8FRKT5n%{{MIemBR`;Hj5>~qyBlf@$apcZ&H6W7T4 zpl1$OHrY{B3I5U>)mNlkVA6b{4WBi8ZinHoH^?l_dep0J4C`OUyu3P(eNz#h>abY@Sz`RH{OX{($^b!ZdG4{!+vWNV z`0$$=kf6%@cL}N>O|YHMiHkEFtJmm;+cMrhJ{sExzsQhMBK*hu9nee}2cMF(qXwh+ z?<&U_%)gBc(v-BC*iG)xT^pAULFc+s%_)=vdwAi7abZO#T9rvyh>$T6y(`>^=>W_E z9_(>gMAVJdYm!huW>S901@2lz-63(JI;i)pI>Flcl`_Y^f+My{^>TyS8==~@u9=6N zUmqt-_=j=1<-L8@78+{2RaK33It%D%FvXz7qrmj*l|wpj`${aOlyY61&?Ze%0*!5R1UVlTwceV79pF8kQyoBnaeyF39mdT$;Zn{j6b4|q zzvV~GSR{F~i(zX&4KcS)%~(#^q-%4tGA?Wa4bFc&>Dhd#hDO&8);0xTrHf!_bo$)~ z{`rPR?^=iW5w_Kz*nnn0^jXMYx$uF67lVy{O{cu z6K3?1aeC-gEOA`Aup$Ft_?OpStU5XNPr@COXQ(-(DTW}<;ZBcfT)fr=;Y)3ZfQHVN z`uuB|ipX<&9Xwv|h%`d}^80)R%$qPhYy{zZsz(XF;UblNLiG3a6>c1GY7yCp5~r%;BL(%#Hs>q+7Ds?DpVQ{2*_KO`nGAA zH(?5xq!ytjXmz0G;fn=s_nk@=pWHerqo%06yZ4`+`lN-&+;A8aK?KM-OYzZnp*AP@ z5u=4dx*lc9Jhc%5fbY8y_nbVcvr@MW-Pd;BDPE(-RDFHDjQ}to-DCL?t}@E5f`C|{ z)V#X>r^?*X>IcwT?xcHD_Of)UZKKG;VHbm4g9GX;3K8p=Pm$zyh#&UVI*j~`Lo3m) z^Q!mhEnEop1SR|P{;o}rm%Y=KB>1(C0(0smgd&`n%MS+;*Imv0bS;;3&n3)MLS83{ zTN`|8U1^tumfh1rUI$q|0rLrkSuacQl5PeVND-5+{Tu3n&cczP&1RF%)7LNGzn<-s znk&5>8ZW(N_^>Ht$oc6gosHJKt)=2?evP?;@ZUw!9~6)Bj(Tim-}(K`+4xsk zaeps*2vH4t33yByarSx|$5?s9@C7J(|9&KFqOza;G%wh%ph>8^v)}@8*a3)P>*4}- zVT7Qe0;`=NoEQtib@-50NpUp(f_||8{yuqjG}Xcgu&3KwcfD|ARu?|tAqmd;mJf$a zj!D32ozTK%71enP0Q>+vJc}(ZWkC>n*q#saUBJANPIlWSv3V2Fe*kc%H+owku3kYM z{s`G^Wf6OK1fQ}tC;PMDt?0E`M@(!0%>){;T+lU3#imZiES^F8yUp4FuP9e7AhIA) zvG`hle?hO+yb2%(F)=tkng*4GPS)vB_7Fb+`R9I-=w8lfm?kqJHumMTG@lEc{fB&2 zFUDg?!$@MTZvgFpAgN0A%0`Tb@CGeh^{!~9l|`BMXq0!;HBe$wo<*e$~vC!trh zKYEH_M#PzFy`9cTVE*+n!N5@S>Qh?L>0)_P|)}GS5_OCz$q6 z+}=P@Rx>(zJT5@tJUGA1c=2OOvYg7M?&IfWh(OHb;DN2i90JXYaGNGy06_~){sler z88SxTp~6#o)j81r2~W9VB!!c^xLUZ67ohvWHF^+-JD0&3wj;_uV4Y;MZ(9B}RA1~n zJyP~Vdl^0K@{n-dmB3QdfBfVYPW0nRpZ{N6KY*umYmjx9H_X7oB%ZyY3OoIyMHdm| z8h4ro^e7y+=PAFyA=p^xak^~cGI^N(A~5iih^oJ&M=zG=?Q;3}y|Z&k#GON2<|Ce! zTtZc%_)pd^9od+2dD$?4yDs_f+;yN^5sPR}6K!m$m>bFgO+mfglvsmLK7(WP!gy`P z{=4`8)YSPU1N*G0BU+dx%l3r)WZaBbPfMb8_0wD$zZ!}mPr?4wTECzzX43&317;?` zb+fy4<>I1YYs-`3({jznGGUoM;VOJSS~p-ttN&)erc2g48&+%On#8$u9;|nMS!6zA`7ig{fKfOd$bzf^#XA z3!01Mg{^upzwP+jo28jguTmp^JNq(qq#npWT+Q~T07Ki5m3`ktZX{wKea5WPZ`Zr| z5|21MiBY}pJ5mik6j32MeR#@t>b#0y%KLir-LT>aA&}>f_*yF{2Bw5a0OSGjiT9$d z7GRUaw+!RUBvsl#sso4`(j;v51%wOl)IX8k8#T?kTFgj2&J+p-QS_K1s#4G0)cRa< zZEU?Qk)8y#JMDQK9%28$n)E*Dpdp^=G~ae9y!tdEC_GlbtZUHBYi5D6t@i6{eA&VBE`D37LU~`#Tvs|`HcX0|J1wd z^*0l07kG-H*!HMrmJ4Oc6Vfh?lJ>^OrhV_~C;${ntRP~KAXaPeB49RJ-KRWXP`Bz@ zw=bEgBBA{Jv(_Ey8h@e~XiQGNfX4J6`uOe>Jx;wcO3QlxLEU6ctcgx0~ zP*i9R-aEZ0@OapFn#GKUb^0`I0(CnnJf@KE$bJ_AD7BvzZFVr|U($NbbJ$~8#Pw#V|z1r@+lwJXYF zvmjAqeW5>G*?}J9c1W;3*Y0qE(3ipzD3x=}rH2zn_;hF2c-I!9nz?$E!6DBG7U6X` zO&Ih&24U6zI^@_KHe`Xku@xTUySp4<*~cGeq6E;DfpK)|p}<>Ucvy$tKI{`8YX*pC;#Fota{FRZwewZ6!-Iy0>S01{Y}7qHbDP{{BP*L&<#OH)@^UQ6Hel-wbGT)hgHr6-jy>Y5BIk9 zZK#D?mCI7}0KDk!4K`-K3;5j=0Tcx#4&ZV_2Xk%%fGF~_$Tm4^R4GP)LvIRG!26~# zw~_Z@2LL8+L{%rMw9KnC<-cB$LKGV+@))9_ySNGdrU@5=N~{J1^?Yh0{82(bFsH0+ zHGGhJISWvo`2V7rs~k!Dh?Dc;00SbRk(E;V`>QrmnR<{p6&>7H<{#Egz1d}ig*Ulr zr$|vM0GQp8t}`l7VrBlgEg3*BAaRxz&bA$DzrzR>9;`g*!Wyr$lE=c52+E!iC&LVm z$AtMQttIC(vy$Ts50u@Yh3eTyb#bxk&V6;I4J9FAyLK7T8!I>PH1dAi^Wt@Ph5?>b zhsq!-R`&4g+%RcsUgJqlFT5>HyC! zt5~3nS}c}3>^?a)Xm-?v8S{PfxeEY)CBB6p>h@)`(XHAxmqikM@F%#jQlc767q=^Sw%77uvq(JWe$9r^M&9&h@c*R2WFPr3 z!7@BZBthK-q~R<8K4vLA33|J*rVJ*&6v&@oMgl&F*xy_Lx+@&^5dnZxARAkhPWD;z zNpK+FoMEA8TaofMNj$5t;FhJb{i#i=Zf9q{7JLnV135)Dc|9`YO~O>a_c=};msN&2 zxQ_MJ8&;uK89(=J!RF!U$HVhoR;kc}5gZ2ONeFHkyGXNF1kAE`R7sE|!b81;t~PWJ zI)QBd!xYwtR6t442mR;jv1(OAr~p(m8C)x*UtIaTy?jVlRNZ9fsZXm@WS3A7h;Q|`+DvUy$`lgOJ=+Y*5*Wt%#-^t9JCs#j8(6O9LuVXjZQKqgs3==`;>cCAU8@irYN^h(*AxN&xf%Rr}(7AP~MB zJkBaVvnW^>WMbPno^)GsXkO8reHHt7`5_5y_;j*%RAR$kOP_=V*Jw*q*uY<@9TNNiF7}eYlou zn1re^zV9>K^xt79f)oI6o{RG7O(RWE!bvhYfTT{s$wIK$?lGf>qancfr&ioA83^$` z+ZJh%o%RK|qctU%jPBv+%R+2yCg16Umxjv3QAUMPnH@Gz8=IXaxvUzU%5`ehJkN=8 zVOC-rg%-KT3$za=b-BUXsS*{iJ?jGx=q70plnolY7Ie=fOKJ6oxiHczelNupSyM=f z;Yh7ieKj06e~`e^*XOAbG!(cX-S#dlh*B!G z0O=B3G)T9^qH9TaNlTY>3zE`Zi|+15Qlz^}TDto@ynFk;=j`+CbA7*mxfaj!%rVCt zbHqLF@gm-fT7-O%TErpau`wFppHVOU5nC)EmGYdiz#*`kTXhhIj;qgPvRpRu&iJ0Z zdJo7}Dc#KC5uv{RR;pV3Wz}28TSQ?xXAZ+*Zz(fau_k$anGQvzHkPO{{~c3a>!r{~i)tI=>U_sDv0vGn_`Mbol>SznBoC{QvS&)x zqV83*PaQFiy6l@Mw+NUWVKh^qC(}H(bcFY7a`hJ(@!N*N7^FkVEIL4EQ;uXi=;-w+ zD(FM5>>h=5$LX+^%b7~wne$WQHlPvh!`QTeHToa}dM*Mc$+Ouw4Yw+NT7}MSW&YJF z)v;}wAk%HKTl;Q`aGW6Su5@l<(+;5dNepY*2UU-vqlkJfYkncyJ;*n6+Lz6s#may8 z)oW?68A{v8K0qY7J2sT=>4jw8WtfqwU~MWZwm&)5=5IOwD;`cC;FaeqCnD!%(jw#drM2N zw2&MI+h9jJV}4fcks)MQcAw035`K!us#u`ja~8P%>Gz8f6bN+jUvy?I7p3nnR5$Ox zYw47au1>TB|M;@KmLjy?eDg}Y*rnWJJy~|v{*lrj^+itEi@EOb*K`vFivbX9>miSg zD=ITQ%SQA9F5j8A+;g)D?Bi!Z+M=06A^nNBKCb!o833Wor=F=jm^Mv$`~Blu&HzpQ z)hY^M6Ilzyi$V{8Ia5A1r?fr{{y-DBf0I(|K{zE|#?IkCY2D^WKnI`7cYn1>(w9P; ztKLJRFpU!?KmJ>o6sg@Edwo^yWA~h$;pMt(hQgB&_to{JU|dE$sQ=>AfZo|Nf^ojB zP>*K&s>coo(%x~hQMVi{=4J^*cLdG*USfI+=be!7h( zCr^92GO^z($H(%Wxe_SHoJ+NNYx56_+3lQ~o~3}65HaTcVgjdRk5s#zRGQv|EKvje zSEYnEBe)ctIt*bOwP;GZ2%bNUEt>*;aOuuio~6n)p5c*N?}$wwPnZex+#)$rH}R8a zbn{C1KL%^DC}Ln2rzQB{U%c`MQ$z!}`6r6i3$M9k)O~EHNgV)D-40e;|+6cS$|ACXQW+_Y~iH_nmMn$Cv(} zGbg{nNET#-BV?c{bcJ8uZoW4yRPg{IfBabH?jAbLR{NXI`mgi$>URK&Z5%X~AyY+> z!Z3Bq3egXAn#6hv0lKUYcLmmbw^3y@W)#Q}6C>w}3b%{4K&lDbWiQ~=f%fT?5xA*< z=0!2C!EFTD6_QmMc2y7K9R$JVH42f({43Dq$s+^J+kR!%5R|wr17t^ISL+5YbqTA) z*;EtdYgQWkeY0QHy&4HO5>JzDnLez>%z01hSN3^OgMZJLU8{0mO6qftU9j$s+1@H* z`%SSw$}B;p(EuH~{kCopA6eLkZB*Q79nU%1wOm=1eM50nD4U3`5fdZ|Tq$=UEBWH| zrv1C5efG26-ZfAV`CyYWanXkvOoyqsPqD8pqt2RqZ$QbO4ov>Az%hL=opAc&aMay8 z%P51%^h?%$KBQGaqU2S6?o3x zb!@Zbt_RR-7|us??78*=(*&}%iv1(TU;RavKOy`2Bb-nBzsd5M`Umuw#F@z~I)X8k zh~4L9gSq2sG+!}l)|nvRv{Z#TH4M48fp~YMt$W8WpeOtWvcjQNg#zkD+JnPa_tn~> z`O3Sdl;4C2JCD#~S5lGSI{yn6EBcz3QE1D($py}x~J&|Wjw zr49AJH6qzpF2OU_p1Ta2&Cp=fXv(_Czdw|t z8vhlz8~+q8izAaZn}-#vPcf>?gU!}fe0q?rpDb#;^jo?y8+V^GY?tw@VP^-OoMKaqIH%#<3Y(B0Idj4Lh^-=Gv90YIWBYh(K`H8Fz-N@EUI)Co#ME(qs zOxEXE{V-5@Axq6bWa-1SiP$fxI2G>bPqb6osTGTh*3K(io;_KcQ|{{k9n+wU;1o3| zwClfCbmY?tpe8duUV@@>ok%{GUct|hWesgw_-Z=22IK( zpq{!%n1$#_2EPN)Bd8^-PYQ8GSL*liw(doUwrwMY@#TP@80wV~z+gW)jBM%gg}m~u znl0oq3$ZdhwB~9f3t|o?pip;8TKtAuK z8z~#KD$&yfma4LcoK5zpG=WaMBWb_wVTUUt_00;Py?ignAd`jf8W|xlcHR$$o>)^w zn6uJJK*y;S>@a(Y9t5MS^Fkxy)5b=f>a+Qdn7{6Ki8XllLq>JDLBVO{;^kO9{v9-5 z5{<^@XZkb2cQS8;Kgmbos`yY%X4Fk%{v@vV0go7!bYVbs#1N###oHd{dVlw zc4Mq-ULQ#RMAkw(^yKQ5#qlA~Jl^E3N&m=~>{6iJ6!Ns(UK8%ZxNg3*ymMMzF=R8x zwSOsd|7p%ii5iY(vQ5dehSZ-`8^@2tpqKGqkGBihjH+mIw;xjDuH`0gLycbzDKrXoCtPw!1v-S_aN+@F_S%j)>Oe43Gnu989_ahMn{2q; zRmIb<1Ra@8m~49G^l5SVCu~yYXlIC^6^Vw^k=`rf4LTYCP9s4>U#k!FokU$XphMic zI=E_44O(J6#GDpJQ~Y{TE6|jDG9C4Dyb|Sl_mS{k=beo*?%=P_)aD&kctFk0)H=;& zqTxV5rL`oD$Cz^{(%a+4dXi$?;r5(Oe_rHjdvlLp?NHi(Gy2lSLu93i-woZ4GU2Z{ zH657})MbAZ&#oOH3c;7e>yH=*dEUFO2&k2rM-&PCdiWjxfAZZM-r2h4N-uKD3?>U? z2EV$B0x&0v{|$2j^n!vjwiap^!QeT1&F%cn6b5-qhjE(~>Cl`LfMphdr(j04mFRd@ zK6ep#(a_%-MjT_%^Pp_XRK2kfTL%vZALijJHcbw#a~I4z>K|MOhhbvPp7Ux zzlP?A`WgY^^{oZq$c-Gr|LETc)`YijBejW<%&5QG;#Jvw3*^q;ia{%h$av?>>t_TX z8SvkYCHA8ey$^IV$O(yL5p%SQ+KgS%M6h{2@5H=r4&XwC3Mh_=?$^+`Y*wS!c@yWX zTvooJNMwni*AnyEi`%aM%+O5lSfEdaoT%*=$TEwi+b(y&U0~L|-WbAlX?efyj~~8v zJA~hfvZ>j{>V&STt1iEJI^KRx@KWJ7mJcR9Cu&U^ZT(Ay{S|&+!A|)({^aY&va}LV zmQH||FA_fdDu0towS!dxgV@DYOpy^oyyO)FtbxG~SZPAg=zuuh=i#r{-ZptZWe|~; zHJ1F<&Kf~U%kS0o&1XykJz;oCCXG#FgWhFHtjt$XJup#Sl_4zuL$)nF$IW2FScJalBEz-GYy@3#WfeN4L>a5J6-!YfB=tuuYf3Q{SWm$7upx(0KnZhM!x-mz-MsBP|1?QTyO}U-q7AH$U!jsjTtKhf-TFIO0Z`g20FW6qXdTt9>3I8tvcX$G0U7)8Wvgq8Xz(B>34eF31V1*V-+G2s1q z(2+}(yGlBdfw~Q6RR=xioD9b^H|m}Qk}14nz3VHW#>vHjsMT}k-i!Hd*;TZ`-ZbVZ zb&j1}pqDu&{7(So?s|V8;7Za$;D0g?DnMf5pMjMM@vSVI%PtY8-7xicREHT;1s>U; z^+q#i)^iEQI%xdrj}o)2Ba`v@?duN|ZaPT-2w4wF|0RRO(urIuckw>n_Gr#abKK7@ z3kJ=v6B%_Dzj?B79Zx~q?eJUD*6t71z2aCe9>SKG81gp(*y$#~1a^$q)&P-uEX0lRltA*fQ<1$`*P|>r4AFed)6cP%l7|q5Ro!W z#&$TQPIhX0FM%5J>aot9*$QQbNzY{IY}iK+>}qoD&o!x?ZRrJHkLL!keZyU&L4ce3 z23@19WutdbQ4ha*0e-kS@O;;4o7Mped~HHJ+M4@gNTB_%;udz$a{*h+N0L|XUgXEf zKnxtD&fNtw8d&hl*f_U_z^Ul<|FUPf=w9J~R+Xcv`y`!9ock##x z_1IGRzM%=-!p9!I?zpvv|C(O#fVxJfqYsW6TcJ2}%f5h5h_Z zH&Jn$xY9|LbDeJd061SG{I*E1*3>PCB)^vbXvF8dz28kxVZz6{v7z8uwyGGQw$-^wnB8f3*Mk(*D((8hKWEK1_;KU?YG0 zJ}~(IMDZb=T?x1v!x=*+z8u9p-`@X*vu$bmjX?rJjl8|TAC^rJVML9Au^o+bi=HL* z;eEr^2G;CWg##+aO1$Q(7M5mEs$ZeWgqHnPhl%Z-va1&kL7YN_lOL9u= zT2-Az2<)|-+AWb+WM7tMqB-f!ehUv(V+Vj*6&~6yvTaHkd7JcZ(~78c&5r)`_$#hfy3cTMx_hM0GwECR(U~UcHAJjc`n{2v;Hc1vk>?xk zu#Ecq}!i)1Y2KZnm>-<=LE%kE7I0l{UwYPG}wIL*3 zffOiA+7`c@^Fv*!m@C1Mb&!~d&LG&68r2r2+Ls6E~!4j7RtG-{LqJS`8 zt}|!EzeIvmbw~@Vhj{KDl?X8feS_F>S-sdr8=y2b9FO1l;g}T|VPe_%wB+MDFNxQC zRh%H=n>!Gj`CP;@Jb(51ZLQ&+Z8%+qhnL<8Rl@r`if@gocs3<{VNRdMB4?}37&x5! z5aJ(oN80Q0b!`ao?>VW4E#)>zJ$KPiKOZ)Cly-KOmC-h#{rN!$B^*xBmkzy)82RxC z@v5sV13&h0bU@DiDy7-?-$fM$)$O;vO3&3MWWX=F-L`Z(a=ofGkjXx+SkdG0U8L9a3Qu0ly9`l2W&)_w&w z?)BO>eFQ}9hW`0vBh*O7-YsW2&m(nZj8bsSvghnhlYDQ8vol@S(U{Wy0$f!-463YT_ z@Iv-Ogm1>3%GN+DRku}%>XH(sNGhuNxKyVgq6aYV8y_NZ!(`6Acg^u|1`;J9sMz0< z9>1(D0AYW=S*+`a3N{;+GZsHg#Mch!Dp8|k^OC)6o2+37(+KBuj_ed%swYp5Kb?lz_;G9B3UO97?@<%ABK$e zCLKqIBWDCFcZZV{b0CqLf?kJHqf-LTxO#|o7?}5EGB>#3qFrQfvfwjo{(!N;aNSlita=V-Q!a6j(PH(B}ZDURc|O@qMxUy`Obc#{lQqGk`5(7z+(x^Jwz z*LD37zmhn&2!1D_Lp)U^IiP;nJbg~U;X^LwxIcT*)gL$Rxn-iDSD;N@ia@?ho3Rzs zqhj)4v5B)4L`5%TYA{!%kGO**_LquvV0d@&h>nCQ+{ezZjdGbOM2$An&2a21P6KC` zoEFRbw91EU9c(Or>F7TSi%x?~$5R`5K0l93bF(j- zEA@s^^d(CnX%k~mCLARY@Zo4{dk9iHzr z^-7Uchd79sKJoH3I;AA2!Ew!sMj^YV_c_Ma>DNrwiy^MA^SRmslNmEld|un+>HE_t zx+?p7X`f(MJWUI+jZI2mqgMjjZY~Z?zd7F3xo6p>P%E{YjQ zX6u}tQ3@}`naqGTshBZ_e@_dA2Cl0mE~TYGyw-Hf0haQG6BpfPbOb9N$|w(^fC zaIGo6*t9Kz9kRd4F!Fq;fAAXAscNP$et1KxH>zv$ z%4(@OQ|W$pd!;oTtQ7Q1k;zkAGLjQ&vPikl^G7NFNcGVmc+1NyuV(hM?u$%2^)1pn z8B3D9)ygBL-RJ%Hue}eYy@0_j)~5r0un%u&oO&Wu$FU;7J5`bLiu;)}73&;2AHrq# zPTyq8pWbkd@Jkjg&≀lD;ck!fQ}i8h3~-%3W7AsSL>#<5b0Ca(h9q zfnAj(VJtKvdS*7Z%+E(y^*#%Q^KCe>Xbf#E%Ya6mwBhyUy}M8KutPsi!bW|mS`oG4 zhFyem&PSU>wk{(*5JpLjfjaY}E}-WihotbPFlaVN_eD`YqF&mQl%mMVfXSUg4i@9mf<#Gg#oyHh5&G{+8r%G1ArpZk>7b zI{Pb{(9~aV&uh2iUgmw<5E_5I{LW!M8jsxNHc$|BlG$ddfcCF@J$q{;a|D3RhAIW_ zMLpa^7EtivQEX z{Vk&)gpNc*Xw4h5uFQ~|&VSz~Z7lF~ptF!UMEZ4caFA@mS4ad&$#!VQEH4(LpW$1bEqggvq@&kOj=~X>88T94 zO9l0&{37h;b6?MY3y61LYnt}xWhX!S2Jw_kcK7<+Hpgf|M6@`egyR9^Vqt_PI#x^d zQcuM~u#W)74A?le0>Y0<=Uqqj)@@_SI4ZWYol$=IhMh%zxe~(h)!lB;R|w3T^BH!# z&`3Ix4fms|AiYFRZgmbiPn!|()aDU#B3VeUJy?8ho*6+d3hT7_F#0zCL}8>z32bmo z*gi|F0$f!8w;KKB!k}{_Yr5Gdcr>~P4)XJgU1-l|0-lwBBGK2^WaN}Vseu)p{UZL6 zI9aDQqyC94c4B|I&VMP{Cg4TxB!^Qfq##2^^i)Jr_5($3&q=St3KBZq_AQF(m=<13s_aD(IJDA8H?7QIqd9j!1 zGH|`+O||LyKoTOm^0oJNWa~BS9aBWZ(#VfN^om}(-mJ<$i$QEukTf`Nf z4PGZA(t<^_SO;wXIw+=Tqb4SbiooHWQOObw_` zGT^C#X(SFGFC%o-i#4O`t0^M*?qLr;Y8#lJpwE@VCb2p&c085Q<%bG+Sfb9f~xizp(dqUgm zh<)@$_Psi2V&l2>{}%cD|2$b<*~lWpzZ{1-vm`O9;8QP7P(?fMB0eIlrIBh zEVzwUK$=GW#_o7oHVA{Sp%;fx2&(AzaR0PmsR~ZBOM*6 z`g=P8aKt}LEN@pD+ds4m2a#|vbOm9L_0QJT6+YS}8tTEG|LLi5GXZXgyJ3oD!J8GJ z!eoDnpx*Q;TdGQyXdYtyJ><#M&t}AzxVx?%Gw*@EXpCJW&t(Q;hIBm#(4?3zN-Zm` z$6D?ny5V@!W2hmjGY(^?Z^-~dVR;hz3k#0$N^KbbGE0Z;$l@6$KYnG{{|G()+oAsZXGV|zDM|_I9GJF`F#6O0BImPEST`_JplsH#&?4mW zN=@b4tCIdnHv@J*Ad@|@CjaAN(_#W~AGVnP-`D(qS?~?4O7IZ8p4zB_4x<)44ri`|}m9 zhKp6=X4eOX@!#T|NEp=6Q;}#&Z7Q1RD$?xmD2DOV6rLY{>ow_fv8;@(q^|L!d4(!=);7H9EsT&NW)XrJbY9P5uWDey6xEyMm^mX{I|;C9kb zV2Iwp^}{ZlEVGSq2fy;&f`zFhguN%7_*MP(bd=9?0XyQc_pq8|luUlK5 z-r20DQ#Qo%S?KMk8w62acclE^yY|QIUY7ma4<2-zmPHWWomn-`cI28x5FXHc3>E+N zN$8P}FNv(Gr~i8gNTtzrGfd)Ni!LGqe-k2uqgBOZ(>LgciIO)B{4Lx+Z~51Qybr}l zi_|dL!bml6*f3Wt{yZ!r{L!K>#oL7c?HG9j$sd0h$>%3^&cLraDE}Q#4$#*hxVOfO z0SZy}m>>CDV*hdCbm7~j{uL#5b}n0V!dE->FC>iiNEmykTI2q$HE?o|V#YGl{O3d? zO(D3^gPM;oQBpkZQ}>%M#jIsOd}M|pQ4yovvIHeuCxd@^%Zl*IRa7)LJ<1SDWbOYJ ziILu7Ani_ytOr&oK_z_R{(P*^+sAa)pv{{0KaMxaH!ntiSkFO9It$uR{JzZOXEka$ z*!&;8L$X3}VJwlVCDyL~W%)KZ?u#h9nnhoWP3}Ky`6J9fZ}Ew1OaK0Td+>y(eJ=2s znH(ks@=KcGDR{mWhJSV?71+eQx8rp${@Lmh zzdzP{7?Qq_I(WK&*El?3isnMVEF^MF%RJ&6sp)f#H6kVs{1<+82>)+uS8D` z!CaMEw^Pc#Yvk*%`JaAN{4r#tyyzy}+38}9YL)U*1sQivltojWuv8RLTzk%6l32+B ze?R<>X8*CMq#+n4jg1Dc=O}s_S(<-+?D?AfkHe^%_~;4p@y>Joy&}LyyHSF)Z1fDj zRfaGN*Lr+$QSNMW2NJ_x$aRqAzA@a>{RN(&E2w=Ch#ID07%`)jk;me_m9Q%YxhZ>R zhQo^yQXxMc@}`H`dswb*&Rk{dZJX<#uW3te%j_Ad@b$oI1g0LTKLgz-bwqRUqKHrU^ywT@ z!8+8b3#N=7#P4~ZoLFVXc;5AU2*5Of6~3GrNyLUHv3WAzHP~@Lf?h|&(#JzE$VJNB z(&~Nne7$O?O3DPuK3}XJj;zi8%D?c&|BB1OVAvN;CeQn?)Lgt58`5$uhMyuerh2CE zJSvqg8N8c^stHpaE&toLo?5OCKr^5n@@}~szp9;|vt|(&!#pjp4@H82ftY-axc}@Q z-3>xoro_6Aj_zx|d5sCsdsr)G_*2g=o!gj6Ir{5fnuG89Y%sX>? zu3!RgQq*X!l-SkDFIYUYz`H&o^fTqk$;(!Oq2Ywe&F$Gxf@lUAvmc3EScd(HT&f~U zbB_BN7qbFlWIje(If{MyLeuNOpmLp751H1qYm)V$q&YSAw44;qE5wCH&or1wm{1xv z<7$~@^3&X*TgtlC%f3WPto0xF)RYp*y?S_7nD;;?Ei8?fvYU94W6aDToBuzi$zNnCKdiR;O##RYj5F|o|uH|XM zphxYWT<`=W1Xaa`T$?pOiUWFK!5+$$^+$a8B?xZgT5_@M%8`c9=xpDI;vXXF%b zx$ejBD>htEO(25%!0kb*T4Jia=(#@^K(V}6-9K$NU+Br>7X6s^soR*_pTO(7n~lE^ z{o zS1+mGgAN7`7MpP|RtVEP$oI`l&WWdL=A8CN*9)h>4h7M(R+fF5^k#i-fJ)n{)+z9l zKdQ9&|4gM>nvfs|0-weGB~>spSu8I}3!q&!#6e%A4t6$*=kkOvTCQs}y)SKV58D-M z6p`@^Ym3I}5~yHy_j;cft0WXFRP`EdQ$O)~9Q$?4rpop!Um?<@G6}ljv!`>!&?>!? z$0sLc*jlt=+M9JHm3Q%fmu=FS-ttO76p?0GsI$^|h+1W2RB(g0+^SL7dl#s}`voos z#F%dZA(Z`oXFKWc3FLXzjq~0Y7p1V-yPHXRv!&|r?Mt-Z3!yDVIx3~#=dj&C8cp_; zF9~=?stO#76BS(d1P}&|+Q-&ze(G%ITg0W>?_Gz!pKvt0p|7?)lKCdI^!^!<$fKS@ z9!-+uQ7(RIkN_EGj4~ubMV5_eU(_GzK!8DnP_M#A$5LZ3#Vkq$$C+|@ZCla(`Y-~Z8p#9l4O zjL0T@AdcrPPz9N*Vtk$EM%f>1oH5iNmrZRDkhFm+6Tyf0g7V>Il1Lodr<<>sl+x&l z4J3J`t)G@8mK?UR!HabIXBQ`6l`y%1$j*A5;>9@fmqTY~=2J`qh!Gay_rfCh2;BrK z4CVa+$jT0_W+go-{7nHck*_eT6BH~YYWQ0?{w#6VNm=n`tMBhV-|V}0@~Q4or{Zl$ zgfgu!UN=TPuhamk8pvm!7vwajl;`&-6rG2RkU zSw^mzi6T9Ik~FkQLVaRf^DxwlAmE}kfAlTby1iZ7|8@uc$l?F0^@8!4iVFqqn_{>x zb{M(uY-U*%H!4^4@8b3v?Y-xV`qoZAI~-(fy$@w6VT@-^c&v(sIGPg(wdYuHkGA** zh}4rmJHeu}eqYq+vLM=A!Y1%DH#yB{thOB98_q8rh~cr1CiqLm0bE56Y9i@zu1?L@ zIyr$pp?d*3YcMM)VgAx?eb#|Sh2A9N*TId`uoy|#u=$s447VrhEk;D`1-bZy$m|om zizVM9HP(!Zkz*S_GMVEFO}|qz-z8}z9hQlF6H&JK<{4cJD40QOTMkG>VrcoSYa>B` z}~v zU;b1B1rmBB9tD%1D9FPPcW{~&^`L#GblUY;MS5{TS%rRhK1+FVGVdRJ3W>rIdJ)K} zS}B{#N}a;}a#zC`!p@snq*ETRFA~lWeDzTcrti?vTo_7qe=u57J;ps@E}D^_4cvKm4TL+*jZ zR@L9z87Tru>g54v*Vj6=AZMyDLLnuA(q%8{t*@#4#&9yp?7>VUrbDqWGqgJc*UWxh zdWEl)J*P`Uv{@_|YA^_RnI(-kn)GV2YUadr)ILdfdgiDY=mZ%lB~VeA9nU}I77Iy| zMvX-X%uoXtWUj=ZQ$3p6*LA1^{--zWR1^BP^ze(+w6WCmosyqZzv(ShK>U^{es;h} zl;dS%lerxc0CYijk$B$MwG)c*7uZhYPvPC%l7vr0!0LQj*fhyi=v`m&H3CJTEJfWw zJ0#=4?GjCNw!U`7Mn8+E@X#0SeABe_KV8oS-o)5(BSBbs=C+ovqzR&0N+}d4M>4h&jwn1 z{_XI>^<%Y3Q2|b*fV2zZ3U`yxz_k!MO1tk;T|~pPqD@9^`F=+&zq}`tx$MRF?Xu#? za7L4ET_Rd#`+mnpWa{I2j_W^<5wL4la_Psbhu%k6m^^5Yr_0JT_jXCCl5sY z$Nfwx$<>2kJCMpas5RIP@te)G6!r>O+=A2U9~2=k(VujN67-bF*?tE*_GuM`FhoW; z{~DDpqaJgs)~wKHdr8bSSi)WDX#7)49P8F7$juI5J?SAXX>OhPEJWvvrdJkeI4{=t zLu=ZLP03mitXxMr5YH-Fiq&&aOVluuddF^FXdJdzi?#mQ&h3JjRWtA#+3IxJsw+^> zi`aT9(vM#AQ(O0@{Ph~@Q9*6HM!Ax_z6|wqh=9^=`n2O4Qb?kilA?uhC&Fch;Fbl$8gh5zxXVnNbTU_YRNZ8ds-qmcYj5n`2 zRm981egMxlTuqHvyA$L(6ikIgAv*0`P=H+SZ|my>=(KAj$445?#mvr?y!2cU z73pXGovG%^GX6vwh;7j6k_fgz!f@5VrkDvn{eEF1!sR9V+l?@JR+|u!apoSUXwn9Q z{+olv*39jPB$?cUhkOoBQcn`ebLasDP8LOaWv{3PX`D{t2VXc;T8p zR>-p+GTq&5F)y@wreT`vSE>RS-ofQJ&y}5t`CLT$qTZfd^?XzUBiDvnFXcV2^Dds) zBEYD&Uwpw+YvOcpCk*LV!Z0<8<(+V8(mI%QLN8uAtt_i5cia}*dtEtz5_eWW?!zK> zG2_meKXYiV7h0rWKPrSo+uv(g7`EU?Da{g*|C1sPo%Pd1k?O`kjDo5v+qv+DuhOvN zf=lo~YZwXAxK6@QU9?XxkWkD>RH8M7?_Dy9-Y|OAE?s6y$5^XJZTLNh{#2gF(oCiB zcjPw=hCNB863PNEPRt%6AGO9&B{~EmbjQ4v-}R`9XTja%W|v<4ilvSYY%_aj6g{4~ zUt~1C+8XUkUOYI)w^&YSXA#g#I=i^7xeb)o*F%^p6|YyOlP~ zR%4 zvy%F?&ah(SmJeT>+@FW1E17cy9uJmqp${jweon9s6_23Hw_bZWHCd|DieZ>38mjNq zEOgIdwHU;imGDgETqd^B?jjYvAbW(aRpO{x+OBH6UgT>LYWqm39WKL2)LS{Qc2ixn zELKbV52g;lCqwqJ)J!8fQ>&po(VxS$>@aM$MJ~S%O{(2GPic$>3&QX5r;f|2f=@D9 zw@`h`Ng_*`wa@t~Iv|q)+2woDiFs|R0f|dv4pyaFCb*MGdV82~lh4hS?=*`FJ(nl( z_lwDX2E1Q_da0g-ox81u1$L+agBOrD6*3>_?06hiZlCb3d-cLoP%5_0xs9YP~dnB4dg%F0IZ!-Hc)eQ$uIiPywq zR?Uo};|{1}|2vCJC-;Og0k{-jV$Itz-s*ADYu9|hT_Af#GOJfzpk2J<%}?{49&bKs zMcDcF^O4E#j{@A8$UYz2#Eu2s8&IJkAty%ES_y(#*7{55@0C{8oCZ6xMQ(cq-SaJF z<^o=cBwy_kDivPDh@ZqLL7)kJB&Mdn3!m!@dug+yrkk+?{&(KylO$beHNRi@Wx@#v zLoMKZSK{T)tlu}Y8ETfzQN=xh&IrU>#5ym96WzOVD)Ap0P07SBgGqr5z;NvZwrK(j z5X~V-NtQehG?dQ;5&YC>8V9f)zwqpOttNR#KFN2We1y-9-D?~!X+{KlF3u~SS7NdP z#52%EFv#D8TEiQYd>|rSjJPMPTMFcOgoaRr$mVo_)UNhC;13so602STGz%7#5Q<~K z$Jes5@fzO1FKv>J%^_lTImya@T@fja9Bal2NG29;rw!V3Dz*MC!Ha=d+#$ZS`Kege6#Jm-}-@eyqPyeG&lP zlX}6#YF$m*39l2P)uMZ0v9Bg;4i>$6N2hnTNe-P4M6(7oP0=?S;vmG8`F8{4Z%Qgf zjq0cXBAfXPrt{N;);v*PDwtJSRWzl+b04V{9bkN(ldp@Tr5t@r4f1&Q78;)8Lz8x( z-rl>1+6r>KBz z++_T(qng?&23B4d7|DQEm53@9Uz1(12bv;}zXblm%}X4p##AZFo7m|ZyYP()m)Hds ztgt@I#IuoGXWM+Gue=jG?xwh#CQot31Q>Oc<&;bDM1x`Pu;^sNQ+Q=Q;lC|io@H|! zW!2M?-Uyg*F>+Lw5v%9WJ_U>Y-n@R6f0ujSm5-wRFeUrP6YCQJ)Di}hvV|TGdc9-wyFqZ{Z zd$oBH;*9FwCf2QoT&{mJIp9FMYo?wg%LlJj`)z;gN`pSwK|0ol)`2&z_sJIvb=K^m zpt)2#L*Ce9F1oD6x8pVC`(NcjQ%^Ke4}WWt%2^&S)k%bq4GJ236M`Oo&m!{E5-1%* zXzUZ0O>Qfv>524*iTX4VeL%Q;>LwoH*i59;Y}Girx{}$G54B6mwq@D<5nmUR8^4G5 z{j!P7Q|>*_ZX9FICpDJF(X1(F*?Svx*Dom)9=P(f-z$ZCYUt0571;*H9QXxzDSOt1 zp2G3B42bm+Wq{4VQ5B#GX`PfwO;ss?b2(FGR@Dwmhc00c@3rN6>)e7w7LXYakL)ay zS#7>QeICkbRymnWrEIp7P+Q2r?Oz6h9}BTzk&n|PI(6wuiqB?FTYH1tCkAO`}a(D*YlZl zs%lvydLz?8T?m@6HMlUHVLF4I>F@S_o@I7WHqUs7_h%S6XFVCGlPQ+kP*~&D(y6=` z+hMbgA6tC{09oO4SSKQWE!d(32g5i6=FDS#R`^GuZPoT0S>@hEmy*oc6d2egDd_5C zRbzfpL~~VD=I}xtq5~ScKCc@^zJGy&U4Rn!z>X!47L!4*W$pG?c}4Zt%KkbPACMGV zcV{&!!`$RWpQ*2MbD1A=+T5{I6$l-6pY04c$Rx?&NfYt-(8MrO1g&X%xx)J#wNR2j z+?)WY;8o4;96UR=Ql4Fv(uMS$mo4x1a*Gfz3exW4c6+{ZQwulOYK|AJD;Fv0fCyOZ zy{JS>=qB}6@;_$d>uV8Jx<1U~Dz{A-znsZwuz%yFa#Gi@zgLaACk{=b=wA{%dp7kk zBsWvH%CZ>6jwmMLNHqA%4%_z;mhV8I%{H?03EGulaN{6VC#cm3%tkLKq!4{E)3iOR zlwlIv1d-{F1FOex$fbQu{34FTZA0>Kv{~#ztn@8Fe2t66W9LO8*U&lPcJB|~&Zc4> z2V92&1DLv(pDxxECSGjuaW33<3zE;F7oUH%s{+8S5m`TmetqQfVE8iKZS$6dy*pqi|j(#J>tC3HPyjxCYXs=BY((oK%8|t{H7h=pzk*LVT|;W zi0M<+y>xC)pF`!Yrg*DdZwr9=7lLlXr7KlZMN`bZZ7}qxJdp+(8ADKa3+fnsT~qLt z&X6sE=1(%hI3zky48`~UZ-3s36Vr(3DT9RyzG#J9@c zu9CH{ERd%J@Ur?{q>sI~9uCW~65sloM~hd|1bsyobY}T>R#&O$xg^N7cK6aIZ2w5y zj^prZg@JjHBoPTnn(?de1DyEgWRiF+&&~#>6y)~nY6+S>E)uD*38bJD5Nv?V7?}n?ilX zta<Lm+ABWxq`L3{G8u~G)IJX%m0Kc z^c3xPuaI@KZf9N*|44J9x4j)ei}dzO2>#p7{IVRSmQ!Q1YR6r4oR~swl@Nz;*(GSd zRSPCegSzUS2a^Il0M?%A3(B^}_1V;!ER7!F*AnWjusLBI&wN0KmL~M8%Y`4TC!T%3 zpLGsOSNHYR7_Uk6I=$_ZB7f;g`owADx!Ta{&Y)U-T4N!o(pLTbx8}TR(RQ4UW?sM4 zZq^w?W9M;JRYC_4P}^f`$nj^J0vcJ6R&Mv*5lxo^nH#)}*M1yS?;2ByX<;5c+M0~K zDwhBsbU~-RVNunj<{~we6mGjz>)=pU7IXJS6iBv`;dnS&w@m9NFr6XLCh+)zmg&tHs}W{D?loAM_L}0 zF?g;w1liNXXVWWSAa$^pQ}BnuF!#_p>y+4bI{+vRS)JaO>`9l|&fuy<9#=oHa1ww%RqZs_-i$KAzf409YH0wr4GX22HGb zhhiR3kj+aS`w3{8&@0DSSGl%IZxI&NRZ?Z^?0kxFCVb!bl;_knqADwZms3>N5Zh9c zjL^TjrK|tbq}~8kKzhjA_BnIh*=TZPUJm>Fk{FGJ>8f>=o$<;v@Ka_RRk?`O%(Y3(ATc2 zVeW^AI!A7Z-YoD`z)YM?x;lVD@~U!^Ay9(3qD0St3Msf#5E&9zs+OyPXDOeXvxTzB_U0|o#yi0 z^@qJ9#&T`}Lf=u7DKHW%v(b8gG)x2;tM`Ag_7y;JZQHg$AXo_2K!SVl1b3%_;BJ8c z!QI_0Kocy%-QC??f&_xQySv-pUUYvnqA$cZ?m9e+I&Uxfynuq2l=IGR?b_Zz1J% zMZp2CsJJECW}b2Een^`GWFa$JOG2w2LRQzUSU^S}m!wi)OD~W6Wku>O-(=}poVXl- zqdQ8Ar&Fo9=W4MZ4}N{{SN<$@-hKiV$?mTLM91pRUOW$vzsYysCiL$p}n` z3Ib|Pk(REJR;Lsd(uzpp5U)QJ)PwJ`xW+Fe398*)&o}g9x;$2kEf(*Z9M)^JEXX+c zHTxWi1==3hGKXigkps$9tA83%>O^F)Gnb=_Xo&YR`aLY}TVb~TylhhM;L<(l`Q?uQ z3-kKzF|CcM@Bzy}ye&ps z1zhF+yw-r-OCfCL+QEY5g=s5gkXnh-$I~%QQ8CCH`6E(T4eMbBK&lR?8)MQdHGKbx zyz*+O_xfaY$Do{){^-j>tdRVKDd37@_dq#aKk<@TEyB-CN3-?nv4Sxo+Z+H#VpK>n z{5}k*%XOERb@+$xm~sF#Z{KU|bi;{Z#3?;(e_)^$OER*-%5}8@d0Ag;XL~QXLKBh9 z)~2^G?`rn?gjvy-RpiSql6 zH96M)`f74Uv1caPst&aii)S=cYT_dknr{J&&ph}mPfIr7?_yWT09MI zh10`^7Tm#hefwHMNMIYSc>tbYAZ6!h!-S#a#d@zGSDCZ$**-WR!&cw+ppUnN5i!OU zsFoP37B|U|onE(C_@vAnFg4b-Zv}>=aeT@n2a4b~Wj8`pNYGn9JA|oa#-}qPk)J+i zowUkg&t)Q^V%ivD3z(TO><{G9(2gGQwTit!Ma{OX=a#?aAPT8_sC_;9y>;KKHA&$M z3^+{3?J?#0PKoR4$R%n6xyI?Z{ywZ#1Ba@nfRaGs0qNh_KX$5*QB~^+j)i?*DNSe!JUhWy9Mcy~) zv0uFTAQGf;Y~$8T`6RF^dM^BR`QAE!t>$R9@Dsdxt2-mWEKz5n2a8XC!2F=|^fJ84 zBg%9!D{{IQpvxj4t7@_8V)BiW!5UOc>D#V_(^RO0w8Kc|9<`vX4-Jp4eZqot0J;yY z>Oye=Y$T(Ed}Xy|hsct_z!niIB8~vobvPXJr4aG6R&CKgwEwjBwG}`(0GEX_9ZqTP z-efq{fQ*6l>(oB^jBTjG`y1^+3U@_@9QaY~;L1sqK>P9p4UV)qvZ*M3A zeIyR_DyxgudA6JqmM&*SMwW&j3&d=MU72b(h~V_?3pyfCmHeC_Hq5HRru$e1G|R9F zF5;m8ar!(c60Pw(`TYt(x^OglQxq|K8r_NGT`$r*_jpxK8IV`f`z>NAU48ACadAcgn*;a#C_O0CTRv< zEQoLAD}_Az+R&JGTO3-lo>6Cuh?|pre={5yI_1@ATaYHYdqT8Bc9JWBoqcg9b6YuP zE|qM_zW+m%-~xPRw9bVqlziQYK?x1r{LPpKW6SOZGN#X{m$}Tcu(p0W_&h24eSY zf)kV;D(FF|xPUug=99T5{rQE*1)uJIELX~DgTY{?CHwW}Cob1jau4}JuFyBrV&or1 z(ZYqMOI)b{u!g!WcEcdKPIYmrYq0D~2vGL<_%)V9`Z;T0vALQ%L$qJcpjVWSrTFHY~>@5k22#7=L4r&ByO+*u^RI{u#gN9l{YB$x%;~^C7Dr5n(SqUTw_?V1tvZAEs`Q zm9j1MBD)7|qbe&(a@qq9e~+wz9hs2{!~v;h9m-<4$r2SX=9E1qsk9ndfSDq!HX;~o z@cJ>2vu+5gH#WIuQhszJUEv=9>NT!mkzg zXot&R(OUiC_5#lrtGjqstQPBW5A1*zDaethp>ckGtix8E(X{JGc<7YqVSxGD*_9_f321sTIe2X_L^x+<^cK^GNgQWZbmcoc z@Lf0sq%ZoPb`>C=Xt_w>i9Pap5h0NND}}Tm=gjFLys5L@K%2TA{|!{VI>)uIXj){8 zgQvMPAcFZ^c-8{dIkkXJ3x~n+@a?+Gk5lJmqwws#KsxQ$UZ$U4Z)z zl@NO}%f`a}aW(trOZKc$-fB~a6JYmODp&D{gg<%Wb0sgD7K-?~hgXCvDLH=H@~WMD z-hJSM+2a>n_HN3wo|Dn-5H47GhZY`Ak1sbLYcd%;NI=n~5_O?gbE|mGx6qxvzblj< z0W#H%$u9*)^iHo%N?$BVf1uT44zW-FvnKno`PzQ{$FSOy&s2MIvAe9op|N`$IXWha zSU>okuOpCR3dk$kHh3uU-@Kswq2KpONd(@(!w!6GQbaUY64l8}drFcgWQe}fL1Y4l z(F+*epj`>ND-^jaGrkU^yI#F{(+k}J^wQ)DE@+VV5;0hNskbu8?VY-Y=so z&AGx=3_?X$iVPhj1AKi;ikV6^Gx&lq4BA+$og+IsHas4A>bsb$r0i;JWu^`c9g5Uwb za1eVc5UD}kY}ff$Ts*NWvrP`Y3@cv=UDT+Mkns6np&y~1Nb(w|46TvDCynCGrJr_N zU#z5%c{$0u74X3qV(N1JsdQFJLn3dU01o15EZuuH0%?Q@mj(5LR_HW*N=%%|N1Tbr zt?P44?!w8#@ja^dsYGEvt=-j#pYsDMS6Wc9*$ac zPtCR!pMGT$=MGg6)*rp)RRLCmX{zcttmq5rfKLTwQZ@YU0z|-6XA8l%;lA1*qknzy zbRot)@V4UH`&bS(TWo6jf>#pPpd_M_mtk*&0qZ=TN|OnUUlmCfF+5x~I(@dj6Wp*t zt7xP&B_-t#>pP0O%*L>SN*OQfesR0+*P-FmS}pi;89(_k=dD6zUN8ed2vFxmKn|@~ zLTegKVo^be)K3Dbb6}MHbT46O#`?sXtngb`k=JZEttj6d8|T}Negbny8q@IY(&lfj zgH~K@dk%88U!#Mk`8J0oM~hAo30_klL3ZRdwzV?K=h+a%(2JjY>T+uj1|c=)bCG(E zmL2l3Kro=bW~}^1eYYbH$jkjzNzvzSGDGeT!BfQ^iEXCOVu&~@ zQ_*zm2`Xj2)AN0CsEuIF8;*L6P=JPyZA2SI9bnw}`?*Q$;V9A3#t@Gd=U2I1X(&%w z9gAy+(gISsI_Fy;;K(!Vc?q?5S3dY}40{TTLRz*4AM@khK;sN{-d>F^MB>s{3rV4- zQxy^5z39rBpixfKn4rBI!~o3#q^ba}^&8!)2-nMbxZArN3w#}PO^u4hs$2N}B*qug z34Dn;zf!_!d|wT9d7r8|0K)et7h;TGf@;XX5Gp#U!jg7_-0?oG` zb)?rUg-g-41!gnMvk%(I?z$?ujIXgrvl^{hZOHNg@`B^AdO_TXnhIo9SK486y?`lGasEosAu(G7*y+R8TqM{M52>(9neecng z6Tj!8tnYd@LyzmKPku2pm#ok$LD3Jp;p#bFZexGZ$2z0=KOg-gKTM_$gqQvf5Zl^W z4Dsqp0ordPn7aDJcfQOujv?ta{%Y*}i;k$91ofGz6R-^;x?E~`mwafIBaKW!o z>eJbklZkr5R9YG{>Y8vLcaXQZd~2QE!0a$y!$>I9SCMUQ**d|ZHpJ`pxsvWSg-UC7 zJRy%91FKL@Sxq{g!xlmLp~*L4VQa5It;_kFtE+qGf&Ca80a$y*)ylVqXq2~V9@?ZB zZ3o$CR-~Hg*Ny^&xAm`V)}NUAGa39LPrL5N;X=S^XN2UkUR4hHED+1 zU&Uy31NP0%8d_gj*@1ja8+F|CBTtpwlu0D>>8`m!{c=8}m&lnvpyA@dh zD`sp#hp8HMK+vqZH$XIs98*lsGv7LFcAM?;UhD8UzSMH_&%-i7yLg|>{)6xKCnagj z%|tdWpq2JcC;qMOQ)!~q5?ChnMp6?m!ss9D;Bo+JT2p_|f&gwcS@5|esFLPFPiDXI z+rxhI^P}W00Jv222V0!pLeUP=fmnU|KNg#`;dvzGHREKhiH0foE2QKSL`$LQ znS=<7bJ6qRuSRNA2`EFlEn~dND#M{qd!6bvD|NNLHA(3$L5$t=VAhWQZ>BNhb=gJaxw5 zl!YZqoq{;+HkZJhz8z%q!(kw<_wrF<*B@Rzyeai9SSL)RvLcCA(kdXM@scnN`+zGX zhpYM_Mgl}z)M#=z)y(X%Filx!pZ&gMy&mYkp#caQKOw=dJlDh!uQE($`j|J-U`-K3 z)2R-@b?*c}G#bpkCaHTeSU{5aLCLy7D=%YywLc%GLyfIMt((l0=Y7XIzwlnWQU*s) z(7xJe;AL({f7)*J&f@1rxo}f?ISu6Ki-By{#{oTctnj<{S^}IE9;B6x)low7JY>s! zt8{r&uK@faPnIu)qe7$LFm=~+uIPO`HAs1wQ*2UpWU6ttJZud?2uDw@lo~)Ucej>V z4&3wPYN8k$TRea|F%1BBP7lRB>XERqBEen^&O)lrHJ>T$q!9_5{SA$PySmiPr%LmX z2sQ_r#$aWDS%)3tuDgNV9$Eb*GVj3#OjV$fk<4y^5j|d_-BYH4>3>D2UpeaqfRrG1 zOZ-UiqFoUK$m9B`RcW~rk}+I%n8c-w)TrftevR1P&)tzgaYk+AI2Y&+JdkL!sU083 zSAD^V0CpqXhes3y<>mb(u)JW*R<~H|w+pkVyJyxK+x8+vem`G^&?nkdZGrtIbw#g! zFrYSs`(t6T=i<%qw@5NE>?@9Hn5+vzjwH{8`cEQwsoE1whec;ME3fH?@Miy1Jih<{ z&p;L(*nxR`l$J#UV*;}Z3js{>1{`;_CB)@=Rj1aQnhpmqC-h4V(-)MG@p(M_czc3u z*WvdiH+xNG&#(}IZB=&xS`e<*ObF~dFQCW?75JZuob%hm-=uL&dU7N!qpbPO5^0DO z6KQr97!V{g;4O))HA=+)r9JVPYF3ERCTXaK4v{EKL)$Wc8sU!s3nEZ>-MbXNf&74X zl>7EHAKn5~dHCqngt`*zN0qywh%~4Q8a7!mVG0=PNK|e(0LeD(YiDT2SA3Ll>Pkvl z0v!)z{<4c-&8Dmn)InW#jU@nBPP4*1(f$thwv;KHRVh?ss8^O~?V#Vhb;p)$+J6RYuYkbU9LF@rQ+Qaq}V ztgcn|-CdD8*Cx5mW}7ZAO|>TRbb*Nu0-I`A?O^9M8?psqp>uod zyG;QD<*Rnl^zG@sF?-e3f^Lp#3^5`3i+e_-d;=HdaRZR(d$o#h#Mt0#hqYY+qA>I$ zaiAwn>K7eMhPj*|R&o8FE1|>Mtgqb#z)lkySJ|w@XxRRVBjl*})UD=Sam18K$$WD*y2dA=nOCsVxGwm*Cs^Qq@q=O0j7v<52xK7TpTIzS=rCtH}foj z_szo<`oTC|p~_U;n=$2ALHvS*;o3-I@@I(2tKoLW-TGVN|g2=gsMm@j5QWx{2MB_Lb#!fvplP!W_ zAy?01##cRxUzVY0HsGM~65=M9Fiw52TE0>ucYdY#l-Zy?lVbF1=&06eNnz5x#*Qzq z?^OwKgby?9WuGm)?T!_a3)$;1d@{J@`-+{O=gPOD5$KkMYu$uJuL{PO++F8pPS4YL zy$56q7%K;;fl=x2dQsC-5&DGoOAj_oEzVOL#vS-6e+He?! zz3L-!HeV@q!p_JJcZZe4;@A2R&)<}!(pVGti`5jrtq95(Zj~kH^l_Ezj-(siJ)MQa z2Q-qQh?X|V)=T87?E8neLta&1^w((4N$kCU$g{#z<=QY8i(fOq7@11Z%#G~rfm}o} zD$1q0^V;vFDTv^{*U-e3HxByzD{c)FVd)6HVe>H01*+QPi5((-0VAXGKZX&_eOd7! z5d&2o^bpI&^3X$`R@%Z3T9m<&as4@TW(hr!|D;kBNdYufT_84lqJ51HTzTQDnDc5U z;QDn&Iwx`~j<7BWmPElbtsC{udPWP-VROw^-_5?0lk650Ua3qQ{Z0*}>_-FROI+a^4e8Lr<HGCLa#y^L3{&5xUHq;N3JMqLB(u2OU2onJCo>@HOu0$QNl=H;@i# z?Rf)Ki2^A67-pPbrvGEJ0+LbdCLwWsd;U@geCR{Zqxe*>p^&ti++%~X z+X#CmSe_L{$fGWe?K5TyubYgYSZL=ei0T}7nIfZqFKHV4R{5ZI9c zF2?K&BQ^18YzD@#JgZBXxyJTU7v`?YR`a97X0Ix}oq+i)heS5yz4oB#8kSK-G53e*Mw`xMwsR<)XDUr8~W#Mt_KBvxn2h7eK?F#%bl;1_ev89XL z&H{%~t+s8{3o)P36Mx`oVT*qcUuO9H_3Aw3kQdc?G3rF^@o|{?w6!jbsppq~mMvTp zytbFCA7PWbxcZtw4i&mZ>s+(z9fa#(uLOrkDeXN)u&!I6>)9bnvWs)fs%WTWzFzj| znR(MarbSBwc*)TqARq%e>e?MaM>m_55QjGOVl=VkV ztf{!@A2y<9NhA-tI1k>_ud$PK0P7l!Gx=H)DxXAY*5yp=W=eX0aoL{CBD%mjOM+R2 zLPKc&{XX|YhIgje>^Z~g%LT{3-z-S49GS(OPNm5;fGS!s z^xVYj$;-tJI_-B?lZbUub6Wq7XM(0ydk8ufE;)GvCRCpHvv}LY+0tshsDi_zcaPB( zZsjyD0QQ_g$`S92?;G)`IvYT0ol{4tcx=(l92_KJSABx zO#yI{Z> zsN`XM($LMj7EFMI8Co5r_L{c!6~XlzNo zWishUOc>QpMW{s2yNVyjVH;!}j%e0h_8Adpo9PW;e{-~GRfaaHOCWUQ$=eXrhaj8E zoBbnKW~_?y?85D5PxO-FXu1&HuGKC$elb!HZ8F;zCfQa+fuV!z9JQWfXztR7%OZP|3bx*-Ph#y3i>1#!C^bcS!)V&bv7}?8^-?w< zgUSjdh6`tj?w6vOIBE6HxwXMmEb? zZsnF{Ux{#`5oTW%5G=6E`sT_zI5Tioy<53-#qgrQX1D%91@FnyP7)nydVev4`6;jR2xZ5mdOqURY3C1%w49og%tc*+ z>qD2Mj*}>siqZJXoY-$GS}YV&2Df&;52MQV+0_3Qcy2b@fdZ#fEs?LIjzP-Aeq?&hKP0SCIs@{QOTTL!cY}*bCPVFWM_@zBK5- zudp}LOKM?21QPj=5h&mh|8WnRHC4Y-e_hBiRo_OHs$u`$Hg?t`uG~lR#yxqbJ0x~C zu&8!b46;4aoJz2}_h{qsoagy06GPEDm*GZHclHX2pyONk$8w!~e;WgspR>EC;j`*O z(3JXZy28)t6IgPr64`8wrO}9_1H)2ut~$B8kQTUVvMsnTBc6JsGa4#;FZW{n)&sSI zyj`6Rs1nCwN8uQEZwwwJco*le)VO@R36(+KTqos#T@CEXT09#xN!vVF(w@D63G;TU z(G31iSI4O-VmU*XTnVf)Rr+RN-3yi8aa4lq>k**q!?$}p4MqfKbb-bn8c)UjNa>Y} zdL=fDSv>#47yjUUK=p1;9dv;G@ACI(9MWK%%v(TT44 zYSm1Fas{g+(FXB3-fU~^7@NV|pTbc+z`4{`I?1KMj$V~zmH8EN3%J$Dmj$S0FsK4z z{Cl+NRJ*qTlU%6F-$4vI#ziMx45h3jzEtG*Rs)?P0FuDc4lt#;$1c8r3C=X&iYenm zp|vx_4o^l5AV&K!iScVlJ!rVqa$)iCHoK;<1n8edTWcd|DAN9Arpb;3jx5nIXW8tn zMuX0v0D`rD&H*d(*ywCodDHyYGVCinz2g8mkV6O3bshB>_@a!9)1rf_oDkn@zFs>X z5t-|9yKsqJX<(ubeuG|KMl+;s!5pS-huKR$^rfKeP}`%Q-+NyGJg!Ea7E4+xD=U=Q z6d+Vn4R8>tG~+D_6XN))r;N3)3nLWi3zt{T_Lkgop2JkpXR`Ki8vMYTUO>|(ob%Gb z6tdS$2Nlv2_swTH7)+lOSZ4TIQio}|J{#zDgB_R^Ef3=MmE{>Tf3gY9n;f&PkfmxB zsI+eosw6C6>TV{qwDfar>5Nkbezpl2n&~9|aVx;bkvz+g-BPg0b zn(UfZ5b)cgW!pJBafLG0l~x@47B}>GjMBapLM!3A_^zN zW_{lK2FJ)qZ?vL7s-cmiJS;3WoL}I4F-+!`j1(4Xamt2yj0F^hk7&QQtA@Wjnu|+P ztd}7>De~RB7=9eM_(&P%iUi<$>G8}tIG?5XO66iSZ+M}mrut@^kqBAz+w={jS~`x9 zT3%ltn5|aDuksa5h8ofEE1~*so$BSd0UwpjbDa|f9TMiD-$xYV( z5L$q)ekcsjI4^)~?0RvFMIjNwDGBQle>07HXB$>CfsfQ~HL_Kx`RD{H zaPnyVniHD8SH!UhjCX!P#bu-u2eH93{3il9Y>Yc>F=29{B0+OfgxO zflTTb^*AbLp4$#VpR5)ez|`O0VXCCfAE45OwLz8-plffAYPQdMXmvMac)*C0NJxU>5GDc>&vL*s# zcO8hK5k{L)79qu&SdffVKvQTA&7E|dYFvR%SDD4Ezv-5(D-!_?(!U%g4l;1327x_{ zhP8edsmq{{H~AEb1jT)ep_YGXNqPoCrV|xOQ2(HTAwq~RjNGCvLHocy9h`d{`6eUB zF#+qD;})m4wFFjPsbK(43^|GI?sQIe84chTv9aKG<=@>6;3xf5 zC-S(M*nqH-h&9DG9l+7=H8zZxY=VT@x{qbw)P|9PqkfF{w3#vFduNEoP+L7-Sgy8-vW28sHp$KNboiVGnkhX}O|; zicTUIBd4*ZXw*yt3SIT6lr!S2$x;AOC%x~za{#W5&-$u%wd^;NS^GzfcaAq2sH!Ja z@Kv@`q>HCvuI^Ju0sPx!t% zaXY0XYGOg(R-DzTq^FiG7dBX38Q_^}aZHgY1iT@-@^-daE9h&lVCW^4E>Joj5o7et zMk$E`^7timAZuvRGpSBEc1LDEHK}qER`p~)xom!Wm4N59M0%fsM&^31)9d4OxaYOT z{_Sejg^J^l)7=yH?t|?MqKIes=NKqTCrmAWHt*O*q&64?J(qM{^Xk)3X+%bgAcn!Q z!JnHv(xdBTtieYn&ov;<|5yV`=U>sHa@EGnD4HlTD4yh#YX6mki(&d@ga&Is-mihR zdr+BGS__~cBQ(}nA>G@2{57!m2j@X+>#Y+O3y*yIn%Wh}#7twtg3M0edZU0DM#&=i z8U$~%6`trdLRYyd5T5{bxF&RO?LzU-$jb&3=VV-Sj;2 zl?My}H3C?SyaXkGOht5L+JM%6ZlEc>jS5@Y&4BWi^4J1aa7IySKt=`sDcM2cl$Eb^ z7wsGq1IcuKhP3#{XwrH%^tSokit<-AB!ps|?n*uDJWkz{R9=T26cC*EuPI~`#*0s{ zr$Z1?Wm9-2M6^GGTa^dQfyr8rs)K@#JwMb5(?}**G-y@hAB2kOg7%&Aqma#77u&$* z7)Q`k!K4Mflla_0z#k8FO1cNJPR3L-~Fs1SpthAgY0QAMdD7B5_U7LN2%G z!$`#-{?dWaLa=JZ9laK?P3>z3y(9%=K?sg?+`B>J7w z#zRQndA;inpAYf)2A!{$w`rgC8A$ylByY!{%NsKcZx;3;JcPA3zzq-t1;q4#=6l?= zWtI27!hjA+fA4sWglj^}4(YFXeXDHD6XMfEq( zu=uKYtSGc!u291O7wAQtACIL2O~@Z30nHSaXx5Vb6fG5faF6o zVwo$FWM<dX{zOvAR-h<%;npG*pS5ryFdx0JcdT`;smyInFEb@jr}>N zV>FMc>e$D%hbqL(JfP9rRUHry8h;IM1w8NN7cgaXv-Pq0UEZDl)B=!>vjjPE6%wuv ziARzq815`u1zFo^1DXQo;9^r(!nzre4|Z#}UYA3#p96PM*ZB39uJntku+%Ga=+M~gco`xzA5BL1@4nOZeWy!*;@LVFXm*c=^M2L|hM&=Du&a_( z4V%ljoVJ(7MYq3#G)?RzLYr6zsY-qT#$au%AJeXyC{OQ#JyLis_bNdV==6)1`g7A% zky%ur17_no^Ti5fX^-MN=feTTdp?HI6HUMzO+*%onOmtuT~_(IdbXqgOXo~{?Q2PE zU&a!i8Q_ccua~$v>`PDH!P`$ykzJGfWpjzN77TBlRhP;J%7GjB>+)ttkfYiS^+YJd zI-v$RKtvpb56v4zOA9t8upz4y)2mL4$`(H2Rf!vuICSn$YqF+C{8hFFp!K6Nmw?(i)tE5dmDW<) zwps2D!J*Lm`Uu_+%OLB_u#f0Gic6gsww&ZSBnk2$T?k{)gjkkPh;ras!-9ty4R7g&v z^;QhurM0~>PpeICvZAOw1GT==9zM@G$ZRWbjdD%u^kGA0hB`zdA3yz~*$nO*`LjhF zxrk10x&@PYIeYH)!JK^!Xh@LJWbLZQQi;|25J6nsnlWu#U;IWO}uf57aY_(ff4l1~gG|jS!1> ze@#mtvjnJsjNr06KSc0R1BDq~WbPcvS27InO(8XC;r_sBbbn`SLYKv(%tzoFB%yXU z^U|e6Pc^z)x-d5jP-t*07Z4iZ4OZPa}t zGO3RPw)gkK9~Rv!FWlgATQ=5}t{(3)URGN^hyvJse1Xw+NHe+Er8&t2=h}oz|63Nb zm_ep5X;0@wGU-$z8CL3~FZPjF;(HU-gZYMuL6BY!|fN4y@CEEU$lk;Z5t4bqKsie#+8_{2y;1r-1=M zC<_ixS=l1wK&0{rT)D;b6wE5O^9u8TWi{Z+QV{fJtDg52~taw zfy5#;vbGzrTtJX7kgXUC?wK&}%$KcHp?KrfXLbS4zNu0$fN)97nAd}WX#NEr;2Rc* z$BITrhVmx7N7h6A^`oPBebD96jIu(u#9JeWJJd(YwHzr`m`Pg$i9TjomJnr8WH8=D zAsMye=XW7XF0vagKXH$Q2tMg4yM~I&QMraX@}MRHE1em(X_-#qo&0dpYjcGEFc@D2 z6zs6Gf8-g-(6jkJ-yCpd0H57>9HG=54loL3C&^W$!_5~5iEXQRm62(eb#58s(4med zV0p5X&@tJ}(w>gemKM058A<;*HIVF87d4_%uWv}=Jgc48$SNyRe4UicklJ|9udap#>+VuNU{bM4fbdkFT zmBu(OX6@5f%C`%dgOrfySoC&8IV#*FRK<_LM_iUbo3=4dG@ox#@LX(F4@=>q0_*@K zelO&RrwG{^_S4pGyr+$ZOh$LOWH_PA{(f0$`)?x8bNuls6w;Z>=RMt6DP51nZ0#?% z>s>!>jV+bnCY>=k)$gMaOTf1^iy>9ubK0}Zkda~Ssc1P!7_|Jy3f^mJ;_3nV`Yc_d|yGyqAHjqAgjMiSL{kb|%YRjd zgr@pyf*bQroPHGhRq>@dED1QYV3|~2SFnpb}F^Znhb`P;m{V{I7-cXA%6h6#nP07$m?(jj5XphY4A= z7D9IbwiT3W8B7CrByj6|6PVCyLPeP#3a;ZI_{ua~I#^ZZZudch)F{jzgUxu=0N z7!PaLKx8!HET>lX~}#0u_FPF?t*M*%#wP0;Cd_vSF) z>)p8A#E}|FS@ny)TvNNpA`^ucbCYE9968X~%#y;jVgA$cn(gM`63uXd6OLp$%+0~Q zCdu>asY6KO_WDfRto3KjnLYdJRa2X0umI$ zx}~Av=r&j?5X#_J>c7ML|K`OaDX<09-jZca`UBWH*z(JW`19gKnw$m}=NEo0*Q?ko zzH7AujG;7Z1Qcw?qnUTrxV%Lbz{-(f^SUk9bXst5M5hP+O1*k{qrahm^)!-DJ=$Vs zRqbgO*->$Qq5hps8uzb#vcv+0sOVP2liyvWKbo3?eMwDRda5LNpW9k4hC!Qp&TAn( zBgJFahFbAdruuc{Guso+<*;du&E#%>jOKB*JLL4Vuymj%)l+3IoYg~aqL5AVu`hu& zBug?;CG5#Xs7K26W3WhMvErOjv|qj?I+nx3MLh-BHdQh&Q4SPu*utjWGIQJ9zw}sd zlr?<-p5S^ylo9}Xa}N#vHM##^yq3ijkCB4K4RmMMzq03k!OAeRF%at~!Sa0t;fETK zenUFhx-%jnBFPv2zRWEF8E%&cu?Z*%vyFtKrMWz_>w<1`nm64Trq!lXU{8Kq5pXzA zCnhX<@{aFz1hEEW{QTg&&f(&*@+JCeBoMbR0>|wpdhI1}w5gWVnSr3LcTSjDK$(nY zsT}qMhT~VSl_}&JI^=8T#*jbBCb_JxQ}3|q+zcEd zt6KaZ6+@?uuIk9`v7Y968FlUh*y|1_{{TcR`pfylXravk0zCcI7@Z@5X0Wuk(8#pZ z8{z+#fVeCTEGgGYZQmLi{B$ZBUp4!lyGFPTQk0x!mME^(PgD?(p@h4y6a@)ijtCXW zRf`qWrSVW>o3-37e}?lvkt%*pvDnIYlr?a18CA1E`nrG*mfya=K|cMxHjL1fgRu4$ zb(Lih0{aB4FK@E#*zy=W3BXkc0= zzO(T(!CWqT^WTm*|7kDy>-!O~h}OF|BGdURNZ_?Kv}R&Zw@p*MaXyd=a%Bmd0@3-^ z;heBSj?`OPFXD76CawiZes?3?-#ck~%0mdxX9?-$(d+@+%_HW?C!>vy0Ay3H>u+zF zuBE|8uu#1+2#i)VY63v&v>~9`q4{dLAo&z6ShHK!0dFyF8(2u1s{rEtwBI+ZXlYd z~6E#OZ*@B~8a`P<5t(12F}~4c&D0 zDcY`Y%X3=Q-);=WD^?f{Q%+@zr&n74b7Mvn0_G)bd%whUs`J0TFuZ|d5+W39dSMeT zpiPiFfv{J$I9o5y@Z`p69KYW8eSnOeAD;yk^B=#pEd;o;i!Y^R(m*Vo!u25ttm*4H zpxxMdNZi=Y_p{wO&4vX>kh&oC#Z#Bg$FvqH(P*e5ZBeJB-RW)or|=v6qpd{IZGE6q zyYKxw&uG1^u_bL4++Wdb1JUP56OC+N65 zHW=btY_G6Pgc2LrC4hec)upWPQ$Hgs#r$IWqSei6t<4ypM%`jf_mMzWHW z#S19_>-miKC&8TpvY_1yLZs0aS`zF~5poFS5ofb%3&%Y;VlqT&P)i=kfbPwI8e1eE zn*r{AR5x~)RqGI}B4RB(nM;vR)4*Ez>l6I9uRev6I=eMHr(>yerIutEI!Coe^fU({ zwI96`)G7WsVr|jD%Gi$1N*1{5P&!A%Is{I}UCLg7bIuImvS3}_#Rqj7x4xh~L&1Oi zmAV9Ah?^76>#cwxGmH1eNfJrE-=W(j@38py_fdC=K+gJ3-UxM6ef*>U+&`Xp#5Dl? zBwXLp$ydJtPPVdtooo+=fRpWfQvQcz5lrRx73F`uSq4~!T*21BNyZx%Bc&}&cus$M zH3qRY6XEiA?T$HhQm!*Bh5A1aE&u)T5SL?4JD7%lTi_xoClXCMI8v#ooR7+vOS*~k z`RB4|OMITghOK4Fe@{q4O0*@Rk><%jEN*-v6;KUd5mj7yS|D|q$@5#R4G^72q?It! z3iBx2{~pZ$`;@8a2K&7sG4D{m0b+{r44ysD0D;x#NVK}oUX$?8KfX+Z5hRa8BOje`APYbxjbI%|HN}WaYo8^gH1bAsDEu z|K{J%5$~1n4PIC&XMHbh;Kpps2zWoh&8tOeM)u)9*GFJ&zkmB3*O2ITMqJR$V`jj1 zygG|w$6jibUSK8W&eQGu|Mnwph`a#462#-qY7b^UN|*4(Px|li{C>^+>FM0)Imhwu zYnkvum@@aYxCwi1<36{Jd2j6mw}kjwzXSfXZ#mk%^G>REtCt3_b%v5w@jXrv{g>d6 zAgm9#%iy&)H9qwbje+9G*`Tn-7-JIj_h7{FD4o!ZXVL#Xm6y;{x!`qiKcv5yNFS#A zR=l^v!e4{hW4S)C+U@bQEpsOcD!4LA@W#*jvwJ4OH-^CmMZg7W{`y@|!S)hK>+63< zj~^ju-3jte9Z`W4q|Q~H(Lu4%Nl#a@eGnO&jEnJUrUpnn1z^kfD;K4%mtkBYS+WK+ z0lybZXm>r?(n}Y7t&u0)S+pzi37-a@^f-c1SNXn;tI<;g@0>rw>~0{ZE_iPyJvY4|0D{?B4pBybnF% zh2D{G&7E!jJa3G3I9Yz>KhxrPO?LYboMF7`>;IEeNwlFt|7(GAYjKWr(igJ^alC8; zkFCAWw<}z2by~Zws)t_Ptl_OVGeFbV)nJrPlRq1@*AHcD=M5&xFutT=wP6uZTLBRV zA&zhB4dc<*{FnrN2YP+f6mp_97eq;eqPl{T*h`J3pnY*n6q9mkd<-UqQ!nbndoI37 z^mB)!NMAb$W_;~30j8cpU|q!`6P~g3#rav4wOX`5wNZi%r*I^7i6zS_7Q6cOPA3=F z-)&$2wtnuD7F%=*OsSIBDqV~j@+ePm23(&0HI+hTKv}U|fbX#WLfvM9HnsnyZC562 zW+F~|P_01ut8NcAhPOcEd*J z9e1|?bSGY@T(DIE!TA8&46P;~0{no}zBmFHJEMf3Qou8VF$`MmrqAqF%lAL3h&5K5 zm+USz8BXVoO1xilMMs{0@xGn#6x|bB7`8aptcz6hiSHpOGs7D3s4Jpv#N&CsW^N^M z+}5nS_xoGMRtV0I-8#=}faxEhD(E}+IQ@oGrPn;qWc3PQuKq{I(Es@V99u6D?*BBa z24wX;@=$CSO{=yryUYogtIyV@hcph_9H17>i1!_PA6d5`o^96~_~(dD({T;h-U0$g z?9B+%M8)U3+)xL(ZH%b7Q+ByWXhK91iwpt1?&~7ED=Q5Xv&R(&y=hOwT#AiReCiy} zwy)>=yL#P{WhyO&FUaTALP?CMM2XI>S50$;b1m%SR~pxUeMeM715voR8;#>}I_}us zIv+wf4#T5g%-N>(4*xAgJi1=Gz4&5viTp%Ur>T`~jV7pxVjWPs#?j_xXX%P|fnK0u zlj9d*xvtnZNt3b*o@-}ttG<5ME0;zwY1*=r458Gj^HOYdISr+8)_y-|)}xwtOrKDe&ssWQj=14{2F=bHLbT+D$QZ`n-)fbIh#wOK5v^@z&UHgSDG(;NFJ5wl*{lZ zGJ(M3S54k|9{rW8WsgCzqFD^El$CnR1Qe;%`wmAk5{5JH>{W9t)P}PUQ~+JAxsw|F z4iaU>i#=zQa=%Q9sV#lUV7S_DUffx4_{WzP&>wXH>_>0)2M*UI zUZs$V$>SuD;YdzKB=FF<`~P`ptciU9#F6~2Vo2$YU7XV~G|Pfz>1ENXXPxHb%`Z8V zwr#x7)AO7Pm*%jW6Y^$I&)|Z-!N{eAgKN)uM`d?X5N$(-&4u654$^i0hU?O|hNSc# zbqOt|33}(fMTln^#Ecs6u+hkYy$E?(hqDcO7_WwyxEa1~-I13m*t;&d6w!MdMd5iS zno#Pj0w{AytxY1er){xbbs|^Fa`*0Vh!|S=dPAz-BY9o2nZs`{_m;V2JEdfGu?f3+ z^$C<)+R`iEu06QOZHFPw%7z%=zV*&8&y=kG-gx^${qBJqpkR{KWmtMXSKvK{n@t|j?oYHj|K9qsnf*#D@EvH{P)6xR z*mDbDOCXuKCdi^OEcr|w$8`12Nv?ia9WXp9j+Qfo20opMe6kFX5LFs3>m8D$(}_XJ z%bJI5SN}%QLvOLhDcM%H(c*~TB;lu9Wu-4X@s`WHQ zbDbGj`M4=G35ldri)VI)4;iiZ(vdIya7cqJ9o($Z9(|iCSS2uuAe*_D-@zog`P}&k zUZ#7URJ{+Pw9Av95_KFdJ4Ny8Ohb%$U=t26om&0WcuDrQ?Rbe8)Oq!IB)@;-*P3HCI!x%J?H=x3guN)E*qzk^##n4!E{gt5}$%rN9ABlzg zkcQ0r*2I5tmvleAGTpkes?)gOpi(mb;{)q7Pl9#5;5nfv%=en_B_<904$zmAwR*b4%XNtA7VuxAbRV zV?~;STbs%^Aq8(NSv`c&1u3)>xm*H{j04RHGOSlcP8AygR#-Eujr~3#7FVBuVKary z`aID9Ax~1uS|&QQ;BPkiN$X>b(-E_PiZ3DDZN03kblG$J0hL@K#qOkIP=h&f|`pfdy3Q}=_FqTP`sik1zlMkOnG?@3i6YX`? z+53V85MMG?GncZNb-X^eKe(+o`^?LS4or3XwZK>jf_~-s$*m?U@r$dbl<#XitPxX< z1_p;XgUP8=c|BEu?R6h628WOiyksymA2b@=@|L7F2ySqwQ_az@7FM zQfN5;g z9EFy#CDC;@%vlZ6bRS6I;YB*2gRe?6=S58RYz2~eA4QMi?%%fcUfu5Bj9y{iB^*)C<_%igrhH6zXnBv{nnK?sdsLAfZqlT) z0P-9mh+9B^EU|jLAWUi=emof(;jvi+h4sp>Lvg!0r7ZsvGC`j&0tjP`^$A;)h|Q7x zi!Da++oOTXY$I2ET|^Rour|PvQxH$&MW<1SzaZh3OXH$)r#J1rA>d6Elwdc_A_p%p z;_zL?S}dnj<=x3pMG;QN9bYu;*K@i*=gcYp)d(e}8B_z)*e$s24$l@l4qdC%m!cgT z0J*ujhvDb^>*)j;0%K?t#mqd9g6y|jlcUq17}=NtW+rVufcaDg#$YARVy?x^3nL6E zX_HXgC^Jk!g@C?fKI4|HQielzFfC=DoT|NzpG@4^IZmp?s?KdpYWYYCP-J!LsOr#P zn)M`J7V@3`)(n30%O%Wtv5dCW&361SK3nBwn*~(4EHlLP9^?6ZNWlI;w5n8II$XJg zoL=WQ^5_m@HIQO#8c(*FqBSd>J~h~ukCV?LtzsAtE0KPgr%|RmD=3qfKMC^ULdl_d zL$A{m`A#qYPHg4o#nW*8x4L^{mtnU)#fF}SnAsSu2xbPBqpCyZn{D_Oc#4jI_*;KcU8wspe48(p)<~3A{cXlT5sD=Zxz$j|;2CMt6lMs4N@jK)m3?%kNODm>$DqPNiP?uz)yJS?d$;(-?^CiefLdD ztm8rs+jEUgf#06;zv22^(A8*?m{iWnqC45&Uf+0nS?*=Wq?I(ur{5cgDAN@B=*1;J?lSLl7SsPSyb=g zXE$=H@cH+8ux2{!N9np$sXF*N|KYDRBK<(YaiUMnWQOW)=8^D?+!cMTCtNQI;QBHs z+Ty>G!kRncO^gIk2AA?FjRLZhUZ)?!&?tlf5wco7mvF!7cwPY!_Rha$K8FKH7wB$` zQyNQ@P!f?73#zmeA(_i-!t2rJUih82-OIAB#qNby#MQjkQYEPJir-LQ&m17z(@gIk z!ErDg{><9-WOLaIGt;oVI0%DgLBSjnr!pfjbn7SEA;UKa4&4;IrD!w!r+$EWx5q#5 zQM{jUO5`z$m#%mSR=1m^Cg0mrm)Z?qtJ@i=M$Yar+7=3M*?Do6!GbhDMYQj(FLMe0l?ko>=Z`CxM0 zxvTJ11+pGII5Hk3Jb?}&Z4vWY;0TR?99_w=QM;~{HLui}JL({QFJ7CVaN{hSNJ#Ly#5r>u?Ma+gZ!%q80bB%FMEpV0sOZ;SY_4XV& z@6U>$rJYjVR=(ZVZnQ0HN3K&GhsHsl8@etSkT8sV79RM`Z_F^KYxnWR21^2MR~q{yc7 zf_bj&jCA6tzH@vi8%iom=l}cXQI#xTMJO$soq%pnI?Rpx>D1v+%%p*Mx}@XeGmkk& zu8_yC-K-zTO$C40sUjHYY`Aa8)9S{HeD3(bb{K>Y4d-o~Q`k`lY(gTvYCFx0Mju*o z1~~XVd~vbKqt?_ZmW0~t{iF38+r}7kqJId!3IpKg5$qtv)}#_jVi=`j_HpSoxlc|g zJi`C1+F{t^;2xWW4d_-(FPgS4F12(_{hZd3z?4c|N7#ZgfAqT#G4=YF=$$UvV(1LU zRrD@>gnj+Dmt)s)g9*QY*eEIqw-bL{b5$bVW$XC?&!CJ$&FV#?qlLp%r2S2#h?Mcn z61%n!A&d3Y+ZiHm(+5P>oy=xtdT+-lP#c`hw0f0|uTqed|KUEI6bIO~!+Ug4j$yi( zP_o%^i=(zUj<0v#)M`VoE&#_aP<~)+;&VhH$r}aBtY}wHMG%A(a97(9+g%~F4ZXAy zeg|UJF}GjsNsL^(S_g~?J)C})cAX&|ie<74P>MImdHPkJCwwZXfms+xj}>VDjOfo} z?%9MbOSe`(`H}J>->V$5C|)C7aI&c<)lWb)+7v!Wr%_z1w1_ckUUPVXBEEZ`0u~38 z<~T?nt=D&Mqm4v$pROmCsrbwe0&Du-(55+EG=OQHQInxCTrCa|9>S7Q+jvM%hhhsT zN*=_jJgTMgdU;A9{;!u9AKbb{$K25}`DS2NO?fd5D#4F`mBa(+3FQ~7{aWOoRD=gNuVy{KrKcdt$da}ctcRjFY z+qZZt_|Ke=_rIR=Em~gGBF86!7rj1XQsjbPMn-w%*b5OawAJZl%$P3?Ie0D}U004X z`PcaJUzUMSj(!Luj8u+TAJqmBq6`uYL8XFd(6bQH)Ly<7^+S_Hom9b-l?5OVm0fsK zhXY?=BK4TlVWXE9BLzukxLw{SdD-uOxFHd* zVFV{|a!FT1w8}i&+WddWc1aP1^baI3FyLZ-#}byX1Q0%S)&Mx4iG}WOwRf!2vzNSZ0IUWG zDDMjekROFV)?&Or7gq8M{p!4Mg|wPayT6=VnkKY-ZibMrm8_94V%jUx*lK)>0Vw2V zV^0fwe&!|jaY!H!ScTPX;Dv3xKGx?%@j08`5tyc(HL6P})s!X{e-T)L??)SO6>oPQ z$TkW)LK5uk)2yvUF$9N3Vdcq#WZmWXR#)V@w`dG)xytiRV85K>Eru)c$;1!bnF4Dy??7gTw!RP!+s3pg)kfuGj<_jhP3ja-L}Ij8M$I z=J1LLb1<^m!7?TF%X%Kox4s~&gLAAx&ZuM7mdegQ@TqS~Ctm9qjsxq>9~XjY85*xn z4cNIg=D7%|q|KY+N_C(tdCiR7u_T-@xhsV&dHo`Ob>;zp_!avc!Epdk#bTwjPE6l0 zEFbHAdw!9P(QS#4IO2attvw{eE)7TU9lHf_W5pHJF49W<-6Xdt)=l?irxQWRC{vE{DT{w z?0lH(oOfK9YyiLe(-rw9-}wS5y_9qzKf3&~^`XuvZ_0WDKRRVLR+b;I$5mU+YIq0a zYz|S41iF_=t00OolO5jRqV8g!FDVsd36vkasM1TOxmLdNw(?`)Kr-^#fp@vLt|ysK z>}7(nZS|2vZ7Ak=F%jXwin#evKb!64UNLynvo_YZh7(!FrngiVdU4$0%g2O~_UN0@ zw_m?s5TRZkL%KV`D4Pb9c$xXP6}Ws~EMdY@RKE|FT5GDUp|N^J(!e*j8Z&_&KLn!t znqM*9d{JU~vr&Efv^WeP@jKgn=>MU=^1i-r!y12Gc8`Tbj^B|)(s4hgA|iZ)lTL9; z|I(seto?>a9rYL1Mye6V2I6v241vuW^d;lx9XV-aH*nLnYQ3PswWjbnr0pv#e&3wB z?bMz9cK4kBOT{@6kl2X}^Kri8nfKay!#(=L0V!6A<{ca9gW?YS95TfyFZCL9J{;?O z&`G;rvoFH^_&?Uqsajgm8s_c_!A!FkZ*_4#(>GW5g3lCf%NYRGPnQz-?`J&%j{a4Y zPI&;1H%ERdIldPU{U9OGtpE<}usaCkhj4X;YaM~1fU`bV_>B86cv?_FSU?_`osMG* zZXIg9cABjR;noXTd==1eE*RY!k2&#ryET|_gKKSjACvbE*7DW`LraEGPG>~B*89qQ z8$@^vO87>aS)79Sv7X!jX!3YF=CzjDH}ygLz8!=x$#_l7!80=mcP6L*)f_*@D&Icn z(L7aP+#rK>xGFUPkvU9$Rq7+V%a`_&N!v~q887L;OI;MGkj%F_{Zk>Cx{xbmS)g&G zTcz3N+^pSJ_7#76mY1vMmuZHFV5kj6s|ecrYWK^6-Pjb$DASEU6k+I)IwVT(znDAC z^nkbibWtzoO$^|k$uirFhZY&hBwg=@;wzR~SWmxKG7Ac6xx@M64NXC|vVnS@)an*P z!?)Q8%LPc#0aWLQE+Uh;dtT-hrP0WVHCUrKIViNZFO5kRtw9!*?JMX7{NA4FiuK#x zvqAG)Myk|DtF8~kpS-FW6x{(xIdh}&UjCPIGwlk-hsLkplvvR7R!T`1X)2b<2ESSj zM9iO`Q6DO&Y4T*TJ={@iX6C!7h&tQ#dBV=VNftM6H=Qu-wrWTwmR#?G!a85t>{yl+ z8KX_FmufFLxNIldJe2eKCRl%3u<2-=MrLvJk>O+u@I(oI85 zairx*>CF7XZWwCkiARm)0JOn@mI6ODhOCyac?>%Z_j_D{qLN8p4G#M{OM%ki#??gg zY9lAcB5{|t`8OHzR`)?wl|s|qtBGO>BWM=sGqB_KO-#c2gGgWKxu8P7oAn+kK&Vb5h zVRsxhPf49Y2tEg2YkNZ>Y5Uv4)+R&uL9B}`=!=WcBM3Iahi>x@!F)hSPD@C)n!O;jT)DoR6V2ni zdsdpZKnzcT78%MUMR^9gw2&;-1v?D&RX5swJ(_50YmELqQnx#Lg>RFk1C+rnhS)>< zccR4+EUo+n@H=mlr;8+`{?0oQEIQ-81mgcH`R(K~%F>L@ff1KSMNR&=Y@yAHsI@2L75LVcf&+Ft910owJlJ6*q# zh!?qXdXtlGqt#xf%gqEYzV)m;1KBi#`%W!&uGPqdh2w0&@)wswVfVs4d_~3tTejqk zs7HDwpHuHkf9d|>N5~3uM`_tC1nh9oX|AJ_Dh2RXxMv(TH*ZHU+{ew{U42i&whATtF`6<*GG(gR(=wpf4?|8@T1%Q{fOV}eK&)f#Nt{E zb?nDfC4Id8&~;GQMs5#ikXC|Q0U!xQeC1J(1!ObxC%4g^60M1>-+)nK)~7Q7~VJNNy4uSYv;u3)SZlB`Z4yrGjNy71?o7= zdU�RK#`Oup~&UV7NvJT0oy3^hP0`@;?Lgk7ND51C-wS}+rC*TFLdByACj zXX6OFJlY6KxsnCh?{r0h@k@l}wf&|bjax2>2sAP9L(+!rvaoc*4dC6&AC}jC2aE}V zsY-VpVk#|mBdK@i%5Ahep9yN}QkkJ*&tzkqSOgW6Kp_S1^E7uYFr>zEkOEW_({-Ba z0hd5X#DLmGXr?{3Pq~w?@$gR(LKP_`A`lQEapZ#1#nJttA3Vbqq$h2Eu^|u=@(Jwo zaOPQ&TA3!Oz){kP!bD8Q;)kq6!u=nqvQL0;9tOujJYzuYHHhdtdnrwAxTN(#{hbH1 zcBO7D|J1!XtIbAYoy|?RESX_w&rVB&xC|<<$h@N5dNYTF z_akm9e_(y7ie49a) z!2`<7m`=QPbtFmrnk{VccjdHKzPM8$^< zl)3swwtxJQR~Bh~23MX2`_oR|tz3J`>8f8E!HzoN#}qT#kK;|?e!Djy za=bqs3Z?35Ao=TbJ3AV&12^qKC6_Wi%tk|o7aN1UxPdM#^V4=Xc=*Xs z3q>G)*S1{#VTQR$ZwHs%%{u@sY#xv52@Nh2kOPrz4l!k-cS(vS%G~qr4ha!=Ha{20 zGz{{?937u|k0p1uertVA2j81F`m%ONF;QYn-9S4TNoTWpl4AVuNRaOgAKjwc+-@{( z-Q7c9m5I@lJ06p;XQTy1e(gS_2ntM?nPbvDz^Vl@GVPX6#w^X~a^8Q9S?Sc@$&&zH zeOYF~7wb6E&VK4ErpP+-OrBN*GemYaD?s2KZW_~6E`g2;y_#xoG*Pj3>}7SL9gF92 z5<)){-{=9`TBwXIxq8Fxz{(dapV zTl|oCd$_t&Ch0q-Tanr%p2WD%>=hvzdijS>QjRLPTC)Lb1DN?r0*QdE%4m+*W5+=c zi!i^X8e>h`+R}lnS>_&f2H2*_zuo!C9+LlUk5F=Mj43+xsB7?j`P6PW^YRhOFJ?K8 z#h6clL|GPTqLKorD`mrpS;!T*`3!D%q{J+S#mmTf0@zVmcJJZlcT5vij;P!DfkU_} z&>9H(lwUicr%N2ca28=VaJ)1U0A?7*drH^X3(gW0$I&9db}#9Lw$6my-r)z#N$(rK zx?kj;r|$pyd(lz62L`mDkfNU22qJ_xY(eA_LZ<|tS`OWn{kW<$~Oo$D!_3cESFUfo_< zh*bWW;tA=u+)r`LxjCx4RY9_66wa^@EL5TE!wc&g2T?c|PJs;#brR+?^h)7lE>tt{ z-zb?k963|VtoMAM#x|%p5Cz|&+T#n$a_yO-O`SdbL~&W>B9)D~d%$l>pw;NC@#eD4 zA2jP@Y{~e@0Ad|w;0bp&Tb>v#z!R+WDSrG#Ek*X@7hiO$A-A{m&IF0&7(bVpZ{12S zD#6W|AnJt?cHSVxxxRLDo(qz5h9jTS0oUah3ZRBi&z5!@zo1j0)v;+8YI8)DPDs#p zk)9)$pc>S?hyUm8%h5=px|gZPojV+epBrvJ zj(os2&JL{+U8JUc(g}x^KYqLo`uRBlgObJ(w(KAfR;kn8cbseL>yss9)Rtc~pUkP) z%+^?kzQp2}v90X+Kar-1qn}N%TQ= z?q4Is&~#^^`M@1TJ-o)nf;1<`O{F$dQ1qd`HI+`YU)sLl(?!Qm(JB^kgosmoz+wdg zUP58BLN73xN-Ff4r`|jngul-|84GL33_SmJ=z)ABEP~c9X-VVD&&z^R=%vTC$e@YbJ zG3SvxJATJdWt(D=&g3?p;)sJcaV7;4FhkXEj5lG<4E8eYR1*Pj%)Ky0 zpbyLOm<+xffc?JUJ$oKql{B#QjpCc18*<7082l(r) z2EID2pZff7*u6`Zaz3l3)<9N8Z(u35N3@ADsNFhE*8>2B0~r;%?^nu;4QJ@34>4Zv z&hJz9)+1xR5$SMR=4!q_;PD)AN@W64FXC?t8I=x3-0Z;nJ$5eI*x9M>eUIIrT4w!TiIPr@8!UcAZKp2)Ns46z18R6 z#zq5W70Q#u1if0SZtm6nXjONOpsLT_cpFwf%4U$4oxSjhoFl6L))!TQ*WO- zyE}0@^}7wpa8aN~b+`>d{|!05TKPknFPQRoLd| zte0I`xsB3cSC!7(ThiMZObBkflESI|3NSOI|7&JOdF$_d)x^dvw%@+Bb35j?cKk;q zh)=*GPAAYW(D@SY9R=xI!wP?h^w^9UzQzv^Q zsMawRmkel*3j(fKlL&%24?KW3yJaN4a0TRNl2MO=)&Qr{uZ zU|TBfVDaPdr@T!yi%EuIh74lD<3>)>PraZBhVdZ40_wrj<$iH?E`s2C=T=mEzP-Z$ zo(!OL1b_qs$kDNP3Tu3Wz$!&>Tmc_4P~32#!j^ZJ!k8j2I4<84-$-g#VFNg#S_E~v@P~j8)*7r9TOb0@!TOCsuxLNNKHxM{RI*0p-*H~QF>V!u2)EC2dMlMr6 zydi!oK*9iO{HOuh)Sr_4`HDpAemugQW} zrBO!Ia=!qj=y>iIO@%ppp=PV&InE8IY3~5hH{mCWHVr&uhrhGWlSvQYr7XsJ`_34v z^N6GhKC*V`OoPthZ>5IALq=_Yj9lEGfT#rjdMDzrEp9H0WkY7#KQOJbsB3mnjQ2Cy z+@s~Oe7sWsOc8wxvETyu0H>Ukql9k|gX^eEcE1G_7>WIXU#s9>+zx@54>rdK8*H1Y zg!-iAQ~14GR`C3=HZ9ngSi`B96p`bHjOw7sUVFC_V_3B^w>AhJkJvkkqn$Qihu9bYm|tp!Iv zyF^8WG%)~*(VKr1qx)%2tPPkoQLze)Y@O`^^&_FhYd-m&;KEEE?f}iakvyM_1AFwd zOs=p4E>*w)(kqu_0PG3s+Z4j~dUl@({VMm{lpu|LimEJHUgEQ!;rsTB#g^HumtiZm z=)!L_1ryc{ds0CbHZjnIzNcZq%ZSa5d5$zX%&zrdbO=O+M z{%nH^`cuA*hK0M`NzQ>Qb3ftg4?hqhr@H);Na3%;Gf}X+xv1a-^v!?qp0O;{!7Xty zfAlJ*WvUU<{cRq8W zj*Mh|wexfPW6tdN%tEiVU#LPzr1XCqkBfMT1c|t#@qH$vFuUfKwvQ|*wO=+GSikX@FL5!1X9udz1^pnA{c+1s zw_!Ddd3C6$OGkRJ{*uHYh6^jtNU>2zy4(dd;^EA&P5JoT~aWVvXLK}kzOO& zzQ-DghTsZTR(M{9EeP$~@OLiVl+QiWIx|Cr2mk0Qqtm!y2i{!`4uB=U$Z@+WGDWya z;+;33cOGOTrp;;}95R9`f;ndb97o3l&j^N-F-9=!e)EsCGmjS+@O9*9wE|CHGCl|8 zSKsY3|^l2oC2dvAVTieHp zJ3!opA&(EA16$^(wbx%>-ne#D~pdL{U!EuIF>tAB&FYf=Ar1(}4Zg?SIkW6N6fBvPbnB|o!M6^o_n%=5s zK|e)lme?F9J=`6u2itOM#mW10wS$K$*jxELm>07Nfe$>fwD>j-^^6flx zybt+WF+mynNv~9Z(g%W$d@|{!AC$3*cX$Oe4tykko#rkyAM|l1 zV%{+hiCXuW$w1e04__sA;xGgiflrnty)1XSV6Kbc*bj2m z%Hy^}>5SV0u@2wRExGxU4oFk75bLv@EbdZe6{YHr1YhU^v0|v;5Yza=*shGB9Y|!c zW^Qty#3GD0?VVyQX8cP2ebvMmjGW@fA7v`d$36Jrk$5~r=xNtau1R>`yMo@b2-=k| zdDPc~#@3f!_JG6PHa9HF_`sdv3S$ey0_?Wtm06N!hvQOe-tqdi8HUJuJcn7g`t-3l zB%K`SbU2D=*uI!H1fTwQWY~21I zzo_4!_`;5AFNxaQg%mCuWBR-ez>R|u@C^;9pg9&H(t4W+2f!ee%bnZ2mf~*#Fs;%y zU(Irrqo=PDJtQ{RQb!x%+EUuJ&946ow37UGoEo=}`{dSsdOJQ{Jus^c{?N4j0G3Ug z94Y9hh%%eb3{U>R^Ftq-{?eInuaV6?$w-C+_>!ojzZYfAGwn+ZsrW1}E}pq(GMIZd z^GITk)R3_Oo2xM`gT3uPY8VHV2%Q#|EhiKo=Bq{)`eIA7v)n>UDj1|z=WK5ukO+6>GvJlF^$_%nR&(^u6CE`+NhL}@%W zwj`(y+Kw9!kvHp!f6REcf9jwoMH|^wW47fuZ076C>}d{-e4_Tr!i8xxd2Ln99UO;- z-pNucILhIM34RLubhkUZm6E->&@VIqP55i>Wpk!!7UrSA-&uf}mop0?oaTCutCDS3$A)Y(QHrXN0 z435NJW#Rm$Xjs4x0hl|sACOQ{lseW?Z~~qIr8**COwS1o8mDtf3*K(2e|c2lzvj49 z0U{R#1(au%L`(_(D9vb(y$-%~E}rAxl}wZ2i#0-T%mJrd8=achX@%4AvR+RQE2{}G z{x)v`OQe}-O*n6~^0<1gzms%K*>)g&Gy z93Xta&jfA~F9>j20Vg+o{d0I1OecsWFy{|x@% zYmvo6b9{U6kD2JgSA|ch9SWfF1o=sjGZ#vxX7_$XUuNR=kar^DME#PmLi7si3?&wB z$`Uxi)(Weal(9d!n6H-ufv{D-17r)djI;u1_b&On(em=E!M;M5|62DpGQiDAm-{=8 z{2~D^>sarTS@IBE0BmkaeDFDKwYmAaJ>=* z-5@#xV*Vbf0%S++K~OuvYM}3hp@!T`S*J)}557X@clWxJ{ZOq3?>u;tt*#lehKWdt z7MW@Q7#I$W5WBhcst?bJTt`xGwa~e0{-}oESL0$UacmL`p`!g!h3_hBKKkD2+)47! z{+9mjC^1WT@a4%ywkydUc2J;)6v|UWgnNYf9-AE{SZk)N_9Oy=A)z>|m z3bnK@an_Sb`4Fk6dt~Qj)PZ;opdhgMTs!kTZ_S&z<6j||)3=13a+kr_zE{3Zj@nM1 zvO;9_*pKcT0m}4h1S#OJ8E@)kpCk^ZVQZw(7b1faPC(j!w5~EegQZL4NwiE^O z8Ej`}Mg&vpzX&_Qjg)r+oNC25F_8QZ4RCO9(;oh4tk6#_fX;q{hTQSuc(`HRvKROGDTAjh822viL z?<+xqkFX0xax@f8|#JaUB!>!*^>i&nCV^GWjieE86xgiDrFDbWQ zz{T>~4>flThMq8p*tAN7p1ggXe7kU1$iJk^VsXvUEZiHr41~_82@oq=sKob1^On?7ygvNK87|oTYWnl?dHIe|plJa&m-sP6PFue6@4VJsY>+PL)1JN*9nfVEEc+cMB*y zj_JiR$#*^u!k4yBOrhycMQm1u7JkXM#pySY*^NrDB`?#+gLwBmq+xmfeA!1>`?c^vC-Cf+pNP1>fZ zCM30LB!wcIdd{%wCYkLM06b_noXEmgW(;NWifACYz}f@iXa`N21CalL+ZH;IY9f~z zljX_ZgeEab1U3!asMNVWA~ckN@n4~$8iY{#qbN1MlBTg}{n6{rd%ax%-h9!E8dA>p zAeX-j(zZCmTG(Kl*&}Qccf}An!+VWAjE4JiIFVz)cB#Ey{V|66?_C%zh!^lL;q{n} zQy_mG+255p`(3rnLB<<+_GBwou=H?aZXe(8-{sDy0mygA*N9-+Nhs>8Mr`R09x9LMOj?`Wtv*xpg%EM|vdeJy zhSip&tBw->3E6!f@pzN}Hqo(&wz603GwumQJVww?x2pp5j)!!p;sen9BJ5N1hTnq! zaVYtVuB4XHSet53hIi|@OIEkzK~@7Z9ND*iSEn^1we^!-H<3o0{jWy$XtFN?Vp4_5 zv~h2h#DoW?oVae_XpW@LTicg%9Fr*#`kmVos((0SsnBQ z{UYfe8W?T@^tpqp@)F6D_Eup#Hz7EZpR%!g9g%r5u83Kr*Xkp_<48>A$d=4x-v-Z$ zv0SRp9R6cIlLufOAY8nZCM-i*x{XeQ3)#XL+U|@}=$C7xF-%)E8e>C}4A$F|{Lgo9 z@fBGH8GZusHIaR*(XHfL&+_vzZ45Hrg zRSpJJKH1Qy{x48hdl2*T&0~O-&1v|GqB_BFib-4Iv^#+Eqa3xkmN}r9(E{({18~DS z-SL!=y9)3TWaZIz*pR74X#bpUTpJ9o<1_6#3ux$I+XF_LxZRA<+phEx!ehlImq0~q zCYDdRrNl#o%pt*J1RHduW1`ip>YoA)|FBz}hFf^(*L_JeynH}~=dlEtDYr=rCJ8X* z55uHQW#M>z(m2&NVf$m$3o(rHU{f!^fwATK1;rKZ_2uUcH#PcXrrYzCwc?c(aG|r< z;xzM*qLdL5EG4DOl0&2fzzHcHS;!YGNova|gFw2G<{gq?2G|KSxDM3sEZK;y0QIE%~L{~e%*n& z-vqt9R{fpgQr?eO`MdVJjo+xR3bOsbHMGMwHlk^dtBtbju3bo zR6(p1R0=fHg*rfq;9UtBx1njyyz7kFPhPWXd1YHvt>kN=iv={*=jI=nBT#WMElkaG zHc5CL{wC^?qd4jYz6D)-@b3J^zTh+9iUE9xB55fM)Q%j#4_dqUa4*@8O>xUsEh5FZ z5|ug*>jk8C9hGvV75KZq+kKruu;x#OjQ zX{9=>QHazIU^BZIP2^Qu6C{yrztILP_;Jvm+mNM_(Py4JNWxsvqt?lu-WfpdF$^|* zm%2jE_w&n%oIaPq6s|-J4`-z?N&8D96PirZUF?a2{vEo*oPFkL-k106J}~=s^9*u} zhyO#`SpdbgZRWOL4vzAZXpDBcefBia1ZY8?!h6rySr;6Z?Pr&%DK1B ztye{LbwRUwOk*%DlX=A$!TS^zFJ?m!rcoGCHR|9W}c(ZP_;A?Yut1XWREqV4AxG^4Vr;TUvJ=S6ck>hz7TlA(|We)+28C z`^Rs|w9oE>qX`EnV4w3D-Dn8YccNHSK^%r;bdf(t5?R4UUBQ}bOIvQiXrc-%cD7k zf+pfo0LR2NIVJjn?zB(I2{@O+ z@^fWcbk!o->7gQ#oB)w0&#XJB(EOU+yfFZ<14c~N8+ze1#HzB^GUbo}?AjQt)u$jf z8!wKm8h3Y`?GVr?k|%682lYP`Uh1tC0(n#gCP9&-hl$+-CsdkFCj_kqhbyh{!1M%p z1PIzH_feFQPl1@vnlD0(H3O+&6_B43@Tml@VEAU(pMyr@z)e}q>Qe{_2?fyL!^~JZ6kEm0QozjV)cwH zSk7rao#r?WDG1j|z)4ZHwxrDUsCaT6aAE>NSXC0Ax&nOo6NUJJpmI*f+v##%o*@sBXNgNa-&FJU|lWP$~GYD_4ce>%Y)Rt2G~E>-eh*}&dY z`hLdKU*E$jp9Aj?YqNUxzhoIv+JGsXVn~brB!k}*Cb)PX3~>pEg!*yS2@6uo_|!)e z5DXYie8YjlW;=G9uQiVro)UX8xp$Yt=K&=4KI0h;W7xY3PgfK1&EUR>M?*iyl^Pj< zjpOJeAgUMSJ^5w0$H|;Z$FJ4!t7W;7h~-fyL!hMN0sDHP_bn1MjL|4%m3D@ znZfVFmrFZL_9s<6ex=s}KW`D3hUC4@+iH++ZjirDJM)K@w(XO*h*uCZp|9K?F3}-S zV0PP|#&hTdVb^lRRm76#(>(Gz?KU+v+vS_zdqfR?VzLrX6XV9VqQg@%s>;n3TYHi{ z_@?HW$l#@WKR-;chX|YiW&PVHKnSAj_FQ6zm0HxV6YVh|cHM_5bO;UbJB!p=rBe6p zc%t~KU%`|3XRkqheB z#`1*Bb~`S~1HBgyS)s)2zCi8kC$I#B=1i(<9KXor6)3Kx--1VE*qlt56L05&OJiUk~*8I7KT2 z+;>irC>-g(F{Ncm#c_P6?V$CuK^>8NKF40X0?9EQN?$k4 z9GFx{EnRT-wzOUiAebTE)d?XEs9a3Zi*77r+o>i%`R4DCzXIfq-`4*pqw>wQZ$P{2q|VxEvjQF{|wams)>c{s{s!gOz^fT+%7s+2369fj_W zusXE#0QYA3l}iUY%DNFp|N9-4URzycwVi-7AO(&Az2 zO>1}UcYtUWX*<3UxipV1fSMvlS9(w1xQsqb4s1c`WYu(=k3YwvLQI&AY1R9}+4hCy zJPH~CA7>8E1|sVp5k#!MZ79gr5`NaTJe?8f3IoX9HC*6ftYF-A9so7b?c@g1U88uR zfJjL4n$ZDck7|kBZ~&l9mZ$)mJg?#_-UuE{$R>WF^e*0znCB39YU3D?3Z$x)00Ok= zT<8C`7CrTt^10sH457b1+DI~LH<`aHHTtHUUxL)=0O;i|k$n+9I1o2~5g{!Ypp2GR zo*psUfChqhA6kM6HEnkr>9UQVUKgMl2EB?7bTHFhgrz8N2Kp=o3n6bZJbW^*i{y$g zzw4NCyL}xzkZXt~Z8z`-`!pn>?Kns-uQeQ~FA5eC*m+qzO7N_P{UA_=^;-=a5-bSh$1MNF=iG^;l8eu(2}YpB_#?TZA?`zs&fL%idKKZ zs(;_mn{UwYRl3XXhFdSGd^$0kO5-(*gcP|jiJ|_=1kj2C3eim2m;(137mNDpFT&pk zAeSD$il%;SD;nR$40@kTSu?ulQ_TqoD86F`WO%^7 ziW}0bDWEBGAQ|y+300=`id)+F4%8MD^jAVY${4dLC5FCKhC+MO>n7f@y7bMqxIw65 zLyX@#z(3!tg|)Sn2B~}P3!v*xy40isekpyxCf&8h!yNbTBnCli0Nnw*-KqSW+<_h} z`ixCDJU`Ln7QXs}cIRUj-quu2Zgg0aoyvP)+D#x8X4=d<%fUfw zf+(7T9DwoRWvr`%X?Y{iy?Mn~4(jb}PuE2I04)QYW)J0maW3eB`x`LYC8m;Ek|~+m zKUM^9EO>5DRc`ZF1EBf?@`?8=%prfPC%mB-o{4~%4qk5Nh2{d~ix!-UZ>1DyVluPL z@X4PUt}7bkW$V8<@M>m~lrFC-%fv-*Of`A+|^D|=DA4ExZF};Pe zuVz4b*ClMh_pZibS(LPB}(Z zI>vqv4Yd@Ym}<>PGcW$`K0aLl=wY;L%Fvt%K!YlhufP~9aEDMd`||Gut>FmPRwaTRlF;JWCP&+R)~=aGHixq0)a12s1#=3J?KQpW}PCd<`hGsB{h1#Q<$Y6%sN#Bl4<&5e`okEDT(xy z=l@11>(#VZs$EL`b_&n2+w$QO&-K#wjkEFA!8sqB@uwq~;bTC&bn|TF5C<3WPZuP8 z53~(sa4_0Gzxtc``M>;z7of8$M7)JA{D>_kY2fy`hCDe*^%e%)sPmg#YCR{>7h2B@nWts360I(;?NUOzKBz>9wV$r3FJi za3{Ye`ls?mB7sh>;NMsDFD~&vmmEC?_^*)AxP)hKsy}|RK0pHI9n4<+$tF?w^Zwf+ z|7vRa&tv1C9<(CsEj7|;C-GJnUTWvB8zC*m5YNvUbZAtdE|9R6`afOH;kglQkQAsB zyV}$V|F}bMs%MmQ-zWX-|5HH~pPeF<^fS+*fBzeL+zWBzaPz6TtGYI)KMA+{2pT8lYq|Lw+Km} z1{AXx{lu3-fyzw-+W~!*V+Ju>GVt⋘#2 zbzOa-R$OyDoM{K`?_&EuKRB%OSYG{o5y3=CREzW-A2zs;%ex-7_i4*m(+g@^3=|b{ z-!f)Hb4-SLU7lNv831A@=9Q2X1F-9b-xL4u>ps5`oFo4>R~)j3ovi|#b8G(9&Oi?X zx^2SYPmSMW{|&hhpmJ*EYLU81o?Cb2$hM1(MXa}Se3eP{d|O%UkRDr$0R8fAHYzuT z$ruf9>Qg?|{!hu@jq;zq_65QlMjxLvh9@_DJrzVpG?xQ-J)hi9`SK`4wK=YUc2sTQvZvZ2zOs>{GU2?3- zw9$F@ns_PyUe%qITnAJ}j5lWdErAH?db@qA+xf2+{cqD1O_*R0gEqyMfpmX?J#Mv3 z8e_9`0UO7cXz71Q)G$DkyQX7-;Qk&LKA57U8bYI&LDQO*Um{?5uXz(nBVl0(pucnq zK7U3W37R-fp1o+?T=h`G#Pk8>XK__m#wy~6ZTlrOX|yl@!^+~#w|;p0nFWfNl*p&? z1VyK&C&9qqb>aN%otA1ztorruB@lr9&!E8cuzOmAHpVjyJo4+-bVh^P|6`hdjdpW> zAb^g6L9SlXB*gkroJ3JW1X+a|U!1gI``31XI|$FgZWaCm;P^)_A%HG^3r%*|sK^hI z3h`HK)M0RWY%$T1rhFWUo#lh{kRSzc*bk9`1Ol&;xl66CKjg?yq)3@wZ$7LHVSj3L zuG9w60Y$e$1s=Zyhiw|a?>me1xeXZ?YN_)oEmbm%zyXnxy%$QencA~9c}2Y`KX0d_f34feady2h%^4yeIZ$C5;t=-2f85BErBXA|Ad z0ULvn!jduc#3O0Me|Cx`Qt#IAHY{4}YEIfNjc?vT@F$Na@`h!!3RG?T^F%ZO8An=* zjZDXIRyEA?-ARWX8bB|1_5+$@=`-Ba?-eO23|gBQmy>299y?BS8*&Glq`mVF<(Vu?9k{o2_8)F-Ur%kYY;hZDm#_fiH8kx*Stdc9;l zNOCMq7&=UL(G1k!k_8r}vPmIXr5AwRc~K~td)L|3-rFh?|2ncU)li*no-k&q@O=X1_!R+%l?oj^Carv%={maS zz?1v5n(f&HOm>vXq zg257^-cTnYa`?wcHyrn;Z6kXr5F@qd)7k`z?eWr%D=Ye!PT`4@1^&?-@x9Km>x-*k z4}sp1AY>`e{o@aLh5<=dk|$OW?Hg%|>nD%m`3ya-aKhfxwLBDvqKox_9n})blDU3O z80UOIHL#F5fqh=hk0KYr{GOH($-E;5tH?0q|# z7F~Dm-37p)V?pWg(2o%K(=>sD@YbiT`wcn~t(Uuo|5{qlLZNB+-E5} zX*MOtyj4<6a)(tX^aCEPeLpO&Z?@8_@4B&uDqi<3*^hDYtN!$x2 zF)tf`S?RpATvYBs7@mTJ!`NF#Q`%ppUfMl?Y%r9+u5(H^^YZ$Rn9U?nI^`Xwj!RAt zn;b9gB2RZHwakfDs0*9d@)i>i8oZV@tA*O{H!G#PFf#leizVa8XPs4pxv!yfx z#SI>$U#A}+12Pg3Yu}*q`iO%WE8oEL-Mu8FcYCZIxljc=tG52CECiU|oI0Q^V&@jY zuE-^H=MGvc(prPd#yyV?UBV_#zUfsO69+H5`unqA#lk%2qRp0OXWof#GdfAX`yr`N zYdlOfM&DqsMLWeYP0Uj4Url|u?t3rwR;dqtfIbmiV5a?xKW2|Z`B=z_-JBHT1F}tc z+;?8LOOiJO%Q~3__osJG6J2r9%3j9W)1Gw-sfSbZyN9k#_K);5x0v~G^>Y`lTSm0H;yLAYuhfGpY_fRpHr?IosgiN9XUUos;=F+S^dRlp0~8#J#4&^) zOcZ@f2~%w*5T;g7*xpn z(BD!F7^!c71+MZ##6OhnTTXpZ&l0a8v%M(IJOc|*X{|%=zso+l(aX%ab8aGOn(Z>j zv8q8b69v$(ubv;~nM5F@e;(!{FP_ucbAG^97Bt*7JB(FdhZT&WE-boASyZ=Pb;_8Y z5W|i4L{vPetYniga5Fz7gY9y@#?7%8ylWQb4mA4FGw&2xJnxie&t9M!YsS4< z&D=x7HtskA2>BE6;ST5dC>Oc;4R8Ew3G!!Xantj#%@PgdCsdI{Qy$^RGvvn$@^&L0 z@YltcIwDa6fZxzTQ_3rE{NAlEiW3?RnT&XFu;zwkIxs0Xpqkf#cO~z>JB9`_B zY{~Ad8n`T(3@1G(Wpapj3MAQZ5mWZr3%cESB_fc$VYhY*uk}4CAscpHkGt5 zmY+D6?K54G_nly+nG=AlMKc(^$$GI?AN~;w5qpf(#!skO+xY^I-&~!R&06Q*HdLl- zxEPjJb0ZcJcLKUB$IUhG*jPV$#%|H|hsd?WFIdPvKtFc^0mr9Fn2llu+r^Z#Y(`3C z3L7sAPjeq1gmXODgpnUzdUMOZ?6UPM8O=#1XmNt}xw4h?gT1y|*;se?O>B2YI{8m+ zw zG#a+dvCEI@wW+Oi>@$NAOGnU~X--y`gM?wpoBSd1LD5s3=sv9AB2v3$4l-H;VVvnc)P(0T0JtWJSV~WmBYMxZQz!c}Dkg!{bb65_kDqGuoOi*h<@OBz5$D*9 z3YUB1&0$p@Z-#}OlxfY3&`abok1Yf=G1P$t3gM}ndetzD#n+l30v`8of+FkosLDbh zgzMQY2Zibv$MkeG5vP`ZeGF<^o-T^mNpFmbwXM`~4~fn6FFGd&qM2#qeObzpVh^j& zr`SqZw$cp%@Pj-qov79$Y=}RI+`Y zX9>u#QFa#SDnA(`p6`|_Zf^j(?w=WpW@uCYDPs|U^?ttpbhmzi_s(X`U&~I$vM-TB z>K-1#T`y+)Vt4$zfLBW%3T2Xz1pPcb9ez$HYuPpbMf{no;gm83^u%h<*C$4Ht41-R z2KBRv(~RC+h)`+l9jWC-B<3^QD6nlmL)bN$k49Z!)zb zJ6myxfoI9EkGw5cmJdlJP$qqMm3X}w?XdXP%Dr}DAgKq9{P8t(T$wW@+yG_W(aJ)9 zz-Cp!<&p9#u6q)T%@?gGu&F~bt^mLWk5$_qRJ)wJISO^YhJb|%`a+l+y7bUT$;117 zpCDmzsVbmC#0(J?ef|EMah3s{QrE7k7{i2pD7Q>|u99G=J7j>FS!OVf`E4+Pj1#a= zn6(P&etNjptv{N}_|9N9^{s+aR5u+_G=fNg5zdo83z}J0s%BX7M=A>oPH_uOvzFtm z(XgJw{c-D4{-IHv`hc!(h2jo28q|VY@uo|q@xUj97R3BI4_$myre?gn5g+eQ%P0Z} zcfpWT=u4oV1b%zl!zpT_M*Y#FxvfI?=i5xw0{->&dc!ig;KLak3S~M2b10AJ!}r|=X?kFTGoy&i9KHwF`gL)AMthc1DY8bXnLrq`94v3AMVu=UUM z7$xVEn!%GOB)2MGA04G_xBHFwdd~0QksNp@a2$N>ri9NO?)DpWKUt67>hIGx>iOKC zo^h-PHIkSt2iWR|qfRld>RFVjXEsi>-1-?6PiqWluDb*x;64&|CAO*`Qw0>Azp^Ju z*v+KC6iuy5BX0PZz_Vhzr^*X@+vxydV@?g^Mt`O@inn2exD*d$f=X>szaEJ>{*1)+#QhXU_zqmS(Zn019zyI9S$~eRPw&^FTKXet{-7g-femM6ta(tSK~RCF^ds znI?s3M3Z-a!Zul<)c|%{R!KV$6yO0g06wb^s68E0Zss^l)v){jSOIB~|$V0DNRaYy~^nMepQ5#d*a;y3(S~mtTOCS`GxB~f- z9x{vbmmQx=VrD*&&F*D)zE+&6zU*{X*FOR0>|I7bmH9kuJbns4llRe;}bTpvL^>o5)N1K`@g^6r<;&}^wZg)U^tGz5~7We z62QnAiVm6bdimDk=|r2Y*ZAoRg?Ir7%rSpFH2n$WJ8FAXUZ2Tehs~%guO~qRf-8S{ zHeukWe!c`RMa}KG_cGzFM=UMJYke3ppYf=ahQ6E#{@8vjt613DiAXd z&il=D(Hz;=CZuTj7-7SmyCg>}v6;kY{h(N6+|FLu(r5k8Uj82W(>QnX_(6h=S(psTF(yfL1P&_jSY{}T74sWE*+o0jN zwl}aYw8?v9Vk4Z~b25>NfE~%+X^+1=1J1mmJAcn5clvJ0F$&MD!2$prj$@Y55>f4zX%K{`3o%I+AdaG%7V46K7okwp@1KR%dkRX)kNRt5Pkx@SWL2oJJRy=S=WbeZ}cJ&tB8YXjfHLHR(rnG|$&tzg;o$@@% zXN=Qj3HGMkN9eYg^QrP0*2-X`sNoOsIX2 z&MU^7L4B#?Kf}LVb0(LzJWja=rKCSH{vgx2g8;IXQ>&I0hRUq3UA+9IzV0eQLg*|X z6=MR7s&@+-WvOo)OG4=9pJL7LjKWe(%*+yQG;R%+eaegOE0fZc^q~ryNL^TUGp|rm z_~?ZNyhIOi`ZPeUDhHNfvajg_+Nwmpu8kGDCx7$0C^@Zox0?r zep73~&Aj(}03_32G5_t21eTF@-sHL*_~nklFMPj&Ilh^u{Fg_|Vk8B{HHrT3UpD_JpOuWFUWqaN$IfVX9&{wXaDdLQ_qBB{Jk?Y3#5OcH7fagy^KXM5-+ld+T#r5 zT92}y6-QToZ5mn-17|c{ypOS()4Q4V0oL$PJHrr8!QTs(@y!xms&eZAAryFvEhY_G zzYksN$0t;Gg7~0-LMOF_@7L>q^uz6_PR4k2pNmO;2{7bL|D2S|O&f_MB3AZznO}Xs?30EfX*p0p z?T?P2t|row&gG%Ydpkouc3yAn@!j(2!p>!@e%m6w&1{@Xa>!IgIa$2K3ch(@x~TLl zfek?Zx@^Yu-)REQa@op#=$_ri{4q$Yq>AM+0+Cb&sNydRIuAOePx~!oVN96P>j2qzT_C zADQEtMdFP>@?xwck1$lOOye*``3Q^AGI4HwT9Ci;;&%omR=Iaor*f0<7A|SF^b#in zdi(g1SQ2`(dZz{O56P?kACIxPx0cl?NOBIx<^@+n96XO;1S0?!KK;umao#Dm`87qD zuCZ%C^Ye1dw>obqZS&ZlHpo%L?aod%Oh1QtS{MKDxa#xgE4;@gJjzz?dGz9+OGs{x zmX!>vloL+xPlC(<7rwy;=V^;Fq0#>k2Szswm}h{5PC?x?P}e$?eouU#d_A}m0_?tv zX0FA(RJUGlb)Vx8n`78jz}=z3lU8fieXPGALFZ}P=b%Bbn5_}UAwg@94P)ryJU5nh ztbQ4az#b3svn$lB3~Xw&Y)()<97*Jr-J1$cc?*fM;8s>;6}psS4tuft8b!dlRZb^@ zZ(O~`a(Q(<7iD3o(jFJO^#LxTERJ#NacinLZTwh9;*w8)3Jwf}4K5L1$kkeqZ}uK_+j#L2~$-1)Wpl#N=<>{(OzV>3b+$-OG^shn+0X_nKg3r-pDD74^{>vNkvnKY} zUAwU*APNuIpP_?82n1;!r`ao3Z>{6wqq^@}z(A0D&x(^%OIOijy4|3XUHpiNCvSd-f;Hk!#PbFsv=>;*9@X7fyC68^^H0Q!6zZ6L9K&k9x1_YZpw z7YD}bavG&Y$3t!o-&2U_r5txBN5pp4Fl!Q3c@O=6$_7!9sKu@cY2%OglI3YD=}lfm zs`?srRQm~@AAyM#gUZ(6a;!m)^~Y`Lry>xbsiq$k_LtktD=(33*b7yv=c;RUS>TEu z-!WY8^0KV>nsuc0D))490Qe+-3?>wk?5_N>oXN6BhEFy8U{vhIsSVG`DO7!-FD8h^ z3(zm;3`qQI%jowpDcXfzi~JhZ$WUdPpPsBRm`YzXEOt?Meu3;JpjfU#nx02{w91U{Wj??Y) z&j-8(H@rl?*#cI1bg`Emcy`-`%y@!i16chLlqvMi&K~J17~pYl0>tx-3?2l(%fu4N9@>)#XGWdmqv$0(`x8kNz7F_I<93O}v0=;c>-OY^j>sJ1&s9zh=|D#qRZ)d^Jj8V7&7SW8@95%TrjedKSa( zYvd9%kb3h^^pnhp!0Hwkq&U)E2isso_;sqW79>#vA-E&WCQf?~4%Id^bCs#4Cm-JF zeHbhv0|Q3cOT^j+K=kTx1XS1-3VJ8}G{KqLssbTARevm~o(xxids`b3Z z{+LJbaNUaFIUaU(iIOT;DvNtKp0-!^*-HNqV?>k-bY(7ID%&LrK+K1s3O!ej@#BB^ zv>vvt^0m6pvYK`fEg2_cNM3?bmy{^OiF1~ePIwpUjFNa4vxEA{HKybu@s3dfq6PA! zpHD*q!(-*E93KJ!F2F zW0xhSdk9t@Qc}P5a9iU^xVU^vq`k?Oe+1%bU7FYZHvW`S-ia~yyrld0C(>}NY4?V6 zq?>nI9yK9*l`c7qAW6-k z!xU-0&x3*pQlds2Eub0e6zl|!^^C%*v6NpG0fKHS+`^Zr2JI9l?h3B!1vgYas0^HsMfToo9St zx7zhbecK+c7AX*s0oafORqph|zKkN&WweN^!H#uX`dG|LIbY`J4lJ?^3ibRm^wk)H z{UwYPl&{tEzSBHTsdU+fT=NmqRoH4YjoS%oA!+>uW5!He*fu?E@CN*E!EaqTkL`D3$(x(bf3c1zWl z!aUC3DAtm$e;QPOxfql%jPa`Fhl>9367I7=@W_fi$su9UG}OJUS4{66OI+)t`S@HO z=<#dSvCyLAl9slLf}E;6-23}BbTeQRTWCyo6rR6sz#zAmRYz5&aw_=XvxOZZk12$B zfdN>5mBIWnWLP!GY_wFH^qI5-9S7Ql!mq+1rS3$mEOe-}WvA%{WPHLufQv#FQUl4s z@kqnEICM~_fnTZmmSggEq(~1*u%h}VLQ0L(HYUMHdptVp3JJg%FUg^5*ScNkZg&*i>2vIw|wD?^O=%M|*>EyQcuGeTvc9&gvdf@0az3X^;Bz6x`E6{t=Uq ziG&e?u(-mIS0~q0m;tERYXymqHNTD78-b2!rXqDmZ5-d<*s=ec;w9l19_I$p)uNqVsw$t^u$ zej#XfNiW)3{qa#c&1u8>d>UZ-oW*(?`HEo#3)xA4B^p+Ot_p6QB5WZF|Gg~e9A zVdna{Tvs;w_-Q8B4}C$A8b2ubT9^=t>9Ab8X#&6K9|$nEzQ=F%B>(|_K7XZLke-7~ zvZJx!D?^gf^Kk1@|2gr_)J*?Tgp^ySOp~FZK%u&#qHAIZpZV7SZD+=;($ram#>5&S zW{+a}Im7-(RMVF`i`u{;g)$b>sND88n3m4!r0x4v*^4+_S*CXpO(_GN9V5Wlkbloq zj?B`5DP?_mo~|3+P1_X_D{tSPBn6{7Tvo+Y6xH50+W<*aVBsRtf(TkwtUtO%N98>V^{OBW@oqzc6mjRs2C{nZj!LmEwNJOdaOnBLZ?k{{8Ew z{p&G#P1GBM(xb7QNhn(S?`go{l*xN)#6mkx)$r;Xzs-J}!Q{2jCY!LJm>X1VdMeFp zXHuLZ`3XW$DzK6C;EQ)jB71F2QqnD2<_zmoIG*5FDSJA3!h#XKDVJq~A>6JjKu~6d zC_3cUB({z0OW~1%yvDxB^g)T*G_*{W$z@SvxU#PD^Q4@q**94m1~TA`)azi)$ke6n zY?Z-@L+QQqkKoLhNDUx%!N?OrQN^}ZJe3|u-hXcjgT7_ZSV_L~N;-gdug zAgUt86beGDCb*GizOlY!HF`jZg)T3mrT>h4K+qV?c{Y8F+Pj`&gyi9m0UxB&nZ^{d zNVll9RP7mz6B-6gF6tW8p)J^|^3_S;JF?4#i5^#^fdZJ~%^W8$aLQY+9h=R=CP#+_ z9VQLz7PaD2w3R*P=2vReh{JOx={5YGS({K}%dVVbvI0HH9)8F@jTm=~T%dxk>dg@t z@*8_80%`6_lJn{5RU+famlh-5<$#V&JlL*gt^3yj_~8A?78WK zR%W!F1~bEDHU}YTOd&!qY(<%Y60O6ZXVuiQuE9AC5H?v2zg&S5b)5Se%7Av>6@A3BNvqquaZY6aT^0+H(F zm_Z5O$5gseE`s2D62R`DJ&U5Qnr^A;=_|U)BM{tWIC)zf)B{WBrW5{eCA5Y^*&s%Tcm2*~;VG>Fphzxy#(0HEw`3dykQwW{SV7654Ix@vV6I1dIrG_iw_9_>rEugrDNE}LS#BBQ)Ztd%dgbHrRm`{R9)P;8x0T ze98bsY}9ed(j@t}bJLu#H~1Vbf*~qaK$x_G8)MJ~Iuzqi9mo9H+1A*pj;`yHmLu`N zagE0tRY8nkGa>zU07zENvr#*ZZ!Md~-)uJJieRz*!tM>Q6N6DiGFU*I${_IvoJ=ay zw5pwbDjxTxOJPD!oI($!!(`GK`64#Go|QvboPc!8t&d~VW_NpKwX>#MfO8-%NB-ik zQ1#FT#Ptvdo9O=5*hNk^1sfX!;oFCWE6&zh#k1{!ee93wx!mOQHC_cp5}jl#%TM=( zYaVyEI9F#AIg{Nap1h>bQJ_$$Cjr?sRaNuX;(p>+4=5be1G#111!)7Q(gq1uhtI;# zOv*0AJey|Ti#89)*CN@7oTA-lQH(tcALg81GcEQQ&fXv&5?5Ao!VuNuR-X@7a88JP z*|aJ}1C{#=>zX6>Mdx1nc|wiU3m(ffG^dORr3BTpgI|v89Y{YWCpu*;YUY;@rLah&_GxD%*gnAwH5(L;Cf-4;xkW4wnWs zexB8&&E*s(dOM2H03b6eq&TM2j8grk#w;5~il!E3pS(Mm9aUSR$>35FqRl<~1#Um# zy83H%hK1}KadB!O=!H-zJA)!hZ7Lhh9GAcumzgGDSYc2!Fe;=#=$Cd|xw#3+^?>0FVyQ{MaeKl1Gko6Sbyp3nk;@|FMiszY-;Z*VDBJz zXc8c!=)KUP1oX7c4rExN9E~;Q3p!km-?=0~6<+n`Tul;Ksz-YjV~;sOM z4VqJg#z%%icd^}8_0kK9A+6iM4o#Fw&)`SpYO4r*hg%FoBfAd@Ch65z*G(3HMnnA| zGTyF{TO%}mQv&!4e1jdsP zP|!6>_;y0W!Vrp#dlxF0=l#B#T?!i%yJ=wDmuX;!O^*(0_Vc4gmPJ|z?8}stbI3FV zTv3s+N10z>=Z}+-rJxk;ycf5--Ass%qmfPdtljFw@dYdC&DLcx+?o(t{LWpY#h)rg z(fVQM=0v%eu>e|$AKB{;$uVhz->{~<#)o#Bgozpg>buz~QrwT7hupnXX@?i;l!W?`@S@c#JwvQHjMHiI_FXd)tmoA*v~#&h zOL58XY|!C}-JOkQNLkQ+<%~c`47fDxO6sB`4g(>!ihBe! z=si!RS%S$fc=~qUo9-pW2F0RkiQH^e(CYyCi^+HAL=++DNgOTbj`g*Diwc#{0YZQ( z?ORZbKr*)CwP&lY=R5Ryj?QgcQ zB&>g(-vc)pCm4J%c4Y|dY3#f>CC}cnxTdzrpZ6yR9W~{<@)=`$Ml3GX0`T~Z7oZ9P zK%Z9eX^$Qi1NT=%{blv11z<%0*fgpcsH<#kYigG=jQ2O1I4BEn-fK(gpog~9yJ!C> z^)qwPWg{tPSn^w)T<-xEveg@R*KgHU=V&>*E}vB;o|vJuFYhH_AqlCvsx8WFdFO`hOUPNN9c$ICW_xdn0>qC z58`J^lx@XH*e*`n-}1+^Qw+ANfE2khq?E0sV&A>fhlEeH;F@4AfB5xa0n&u~yq6BiGvOXB2s4t7pvnv{zC5SZQ$` z>PY$Y=z!nA&9K7Rc^aI94T2?LJ|x@)e*HBd?rMfn$Mn_IKjuSWW&D3i^?_Hwd?;dY z0)Wf5J>H(<(66pc?zLjHm_YQHAjoLG7fOWiaHUQct0_`Hq_4sytq;ifOQ2BTn$8Hw z9EnEA;%a6#tY!_sS%f@u8u{_ z;UNJzwvH%mjV+=e))y%OR9~S31Wp4NHwwgN%q)=%?m=DR$F3irS|na$cH6EzAA}Vg z9nXz#V;yjS((_tihu*8!vZ5%TL8Z)ymOjmm)lo~~@*B*ErWoefS zv=lO$H42a$0hPIZheHMo5qEB%-oLHx(n$0i7n_e3wcaQug1y_8P1-TlR_#GBA^?tY zDyjsTf3aI$ozHQX+hK6KSCNowIqUp(Q*Z8EBEz;h@X?cf|bhh4EHR!*+RSUR7E|hNQ(=?L5Lw~@gHhW5v^|3c|xqiCXmI#X)8f&2|Lc5X)g9~ zB3KOGT6Znn$||G7^N0zv^lC?#7&i0^Fk?b9%M3J6J0%wmXnNHihtxHjlpwE2oa-1g z0rkFZA9hG6hddc^`EU6>lA|tesujX569#S^AeJ55_I@0`Oe5$wdBdM%5KO!F4X!`T zdBh}1r%lUvl4wHZL5m^x+{8J)im0v-g;hAzNpMnx58+5_wSmwmbjX8o#4DT~ z$mmx}EbK{_9n8#|ouDQWnde^{F5;nzBK|O=1ZmDxyQCM86Co;FiYgC zXTtrBZ;M!I4A`YctqyD+OMvLthkPGxhBbm+%?nC&ozrc_1=wuN(e5eYr$+tSFR&tPo|l!?2eT>|SK7h(0AX?ent7Okdqsu7 z8lScvK99bmn*&I=7LKjjU|^u(0O4tRHSFoHD2#w2h+Mv_Rf(!7kvmZT8hrIOF0ce} z7vo4oV5M?7>wuyP9WGc+grO?X0SMUOhNPG&hgS&1~29zFrE**&Dg z{pK|bM)Yil@AdQs^ISb{-#X-IC%<*PjIIToeiz7QT1b1-43rXi^xHib6mM0j;R}|; z73X3p!{_M5NXC`Y{i_mvyD9%Delx;W$MvkHFElnkM-$97 zWe|E$redg+&oAHCqpJ0(^(tZBk|Y`jbI1$G5U4YOd#XObsa4w%XN0N%%0s0D58`p( z3$s%7*P495W|xtw{;P~d^=ZpdicSC^V^yl&^DR`X+HdxkW$l_p&ID%VKmHObTC@)? zVkzOmqE~L;L6^(8ReCO1I@hYzuQk!(a3)#-XymJ_#2gknLZ1vF0GSVPgpF#Mwu?z1k04l`2za@y}|^Kt!V9*2`IbpGWuVn7!1=g#3f zn=%itL%5o#3;~th=(i-^^*}-(VR^ymX(VD}TrECkWQ$W@4MsRkYOdJl z1s|Y?>-aZ4T$VCnh%lveTA}^HVk>@6mcshLhu`}g^7KoxCV(oZq3Y%!EYqcLC_As| zev`Sme=}Ve^t8W$5OX_zp8W)Nk+mt&6uWJr%e4x78KXsINk3d1=u@V=6Qe}(yRaSUlw zIrKy+y!8)Q2s(J?lqQQ)j`1L;rF7PDmmb%e z&c?qELU9FV0b=6XL{v7q-sI$8Xkj*sRVwL+lR6?-lnHDiIwKNDfCqyfBC^J-Uh{6b zo#_D#G>iUHm?FZTBh#OpRbvMV%d&mWfB3m$9NMqX3O)wx$IAZ-8YcXq zl;&Pw&O#B13CcWj%%+r8iG^7`!84!P8#_tmxlb(m-l|*8E)TbxD(DHCXg%(VD5~#u zSy`J`y=!^%1u&Fp{E@u?vtNGlZ%19-mxuy#D9IS%RA;}>Nkv*}mKJMRX}aT#_Zywl zx(?(`-i6yuu!+HkY!i)|(4KCbyo+f+Ay6!0c!qE4oLK+~fNI*gUKDnlAHcb;xzajp z;z&zu`+;U-v5Fk&+KMVB<>Q(nq91Aoz|bceQ_k{tS6M0PP_Rs!3U*)n^9o(Bh_Pv z0-bfj0O&1Ci9$dL^(^hDyLwLbq@|w}w;mbfdh~S8c(j6}*!{UIn#g1w25z zqzJ=#ADyN?00NKah-Zea0e)HC-4bHo@Y@yAF5P`IZ>0nFv3XGv^fUkqJ}sORT11m! z^NDYHg;QVW@(ZOA6O`Eq}TFJx5 z8u#sl69+b@xC4g-R*92_fXPeQA3Xg+k?|P8 zs(}vVBJ~@ILmdc|wkU-IVRGakr>}rqxd4U&c}3veJELQdDUhrHGWXRBI>?vmRZWt) zu;&>jX%66Cy7SJ}HOm(SX9SjG+PeF1>l_nhcM>Sq4+PH4HQI#J^L$`bOD?P8D+jqQpXCJ*;aPbsBK+9q7WSj~ibQ(6zVa0gQLWdCYj0O{h+kjqu*3#6Bhe~hrv|H| zOB17hq$e(7c`iH$ia97eshZlrvS0Zw>jANENw5hW=mJ9xx*OS*;aOq?>uxsp_9Z2< z0e`D%muT&2M}|3U@}9G>4piGut$odeEqx7i)g?yP+@7-HM9?WtvmyqQS0_f;*XcQe z56jALv}SCmM$m&BG?-a?Dk@0W4L0Sc2>1xOOF+Yh$*!sQL9By1iH*}vOo^*3uU~L# z+X69D+d>1F*Nj9^zN_p9ngQzQerlkNl2Qu;3jq+5d81wViPPKn8Z+Ju@hTJU$8oh$ z++=KVG}KS(GsEB1dgl#U)FWB|S?TxwifbT9kxU}%jqwwJo~tN;c#zieCkSuNftUw; z5g3Ist_p<@HD9Eo-{|r455*Qq@{B`$g+rhojxfonwnbz7O#=vc?-gr5EYR2Q=;FNNcbCeO#<32cKZR#Yvk1ioQ|$-* zK=n@LCCvt{ah6PUJ`12G3p6#3xV(q1h1J`3GGhBQ>l{VHT|Oj4wDX(rLwXD@4J$td zxkMVgx-WExnEuK5au?wMjEDw>T>I$^!igvObr21Dpxt*%Fqg6$a%-nxQLSC5v#?kB zNGSMy`^x$0arsi^Mw`~mINzPTYKfbgelng7xX7fI&lwhD$TmD==n?M3p{3DD(T^;o z7zkU|gNHuK>i;~+d@Q>+_m*3Ih{C^L;*FBgs-r$*;np83m-l6t%DlbUsw~AhaH-~x z<$HsOPhHNSyKQs}9G`DlUASeRGbaoD6`PR~!F+_AWWN>=(#PgYbXrX9?AZ{h+d|fQ)is^PXO0 z(Hy1cZX@}4=icc-IispP+(y^}WK!;I1T^lnRy=lkh0#k2{LS$3mgVkS-wEp%5+b5W zq+wpD@Q3gLxmw8HUFxvsTJ|+>HLyQU$|>d0}7wKVkjLxc)Rd!15G4q)a;E1 zhy%Z4R&A8r?cuxK?A#n}=sN>csO*0W#0XdN{-DP6EOKy}t8lZDH`_2}qAm#d{2LAQ zzt+ZZ5t9Nw<*F1)pH;&i>E(LN>6XB^F^^G71G2_>_<5_-&$-ofDz$ct_L3VhQ zq&?{|vU86@Jvs6>cU%1mg zE;x+ng(6&2mbEe|%=8J539XnVyC{&TeDNYPJc~;C)q~7P65xS~(G=9J{hgmP86U1u zxJYH#>Bn285@7~?8Q^hk!cW(ttPo{qaPE=)c*mJX6d6GXF1ynUoNe`OmFz1bc1Oc$ zydA+<=i?*QZ{Yd9YcJYX)R*bh1L`=JFru`pZimAum~0PFtglpI7^~CS%ew7*x%xf% z7m!~n@FHC_j#8bR4)PtfKM>QDYS(2RVU)aHdFBm#a_OU|3w3U{-}en*NvX3*9O1dY z(;I(>h4!Zu~i zRZW-MHfZ$wEPP)pM<`sMjcVRnIbDJgA2HU*rmR^y;QV|^^rGMQIBSWx0fDVwKLO#@ z{w}0m*@20(&ZYB5=tR7UT*$wSKWg;M-RxX~1WUK#db7<_9=mNboU4c%D)daHpr`ETr*Pd@Z2DGMu%$V;qOae(Ag-j4<0t^dH$e04%Tfi0R`Qr?FC zPsg7jOuPW{Ts>1P5wXgv3sa-jG9s+eW#|2ZeKf&rAkY=-hMtqwy*QCblox0mUkfH( z^35ex|H&xwvLDTV2^nLnktW{?1sP(&>2+?XrdT*0(rleaFs2k$n!4cA7mkz@* zabB2m#bfqKo#u$oH9+%RHP}}sMU^h+g5~HTOro=;l^CR5Yac<5nPCZ6Cr>|5sM<)x z{Ue&#zf4ki0q`J!n1+IY(t|~q$TQf2WrM^UTJl-rTiZ{o{)K8?REjFBS+%WBHZ-Z? zWHbVoSzZI0xywN3yJA|viBsD4w3a1Y3CJq=a_R1}u5{1b+X3!iqJnwH^o%`P9vXtl znr`eUJ@D7Vm>K8orJiZSHV`g?WkO64nz>E+n05~c?>c3|BSwDJW33Wt+M|UDn$Q2J zVgv(K|7jAQkzkGOh#-0N*B!9G3Sg9!lPfqm+=lFGGO+nFxyu&=Uh90i{+{tRZ_AR~ zpJuv224=l|$r|ECi6yIb^64ggDj&OWm&m+JvQs<9`eV?~j?^Jv_KLDFuR7_ygJCjD z!i07rysjEc*lQy6a)p{OZX=mDKfaKGu-B63RoJ)9p&D5!FfAik&J^UO zzslRvVJZJnKB7AFwe9}LXRBkQy>%wEe3)fl>0pm^w{-=84RYa1a#)L>uB56z{Oj?W zX%1#4U=NedQ_6Hy54)VMLNF#p5aS=9i)aNzX-3znQigxvV6 zpKnX8W1CLIPrdq@&h)JULvChlPu*G?K z0+o+fZp$eKBc40=K`h)!8!!pEmg>dtOWz$x&}?)0-PS>v5r(ySMx=2M@3_A;*+_#u zp&t9>Eu7xW$L~vDgZeBZsR{)+=k{mn?{%Br=W0rs43Yqx^M{?zwkpRb`?>1_XZ+!1 z%>EcX&cp+vIcAgZiTPryPqIg`YHexc-f2&Rk#7%yEceHpe>+ix3*_uWL}W5|ryA^k z98zyQq-y|}h&!E_Zd;N!|DX~0nNi!tOfAvEEK}7UDg>* z+qZF$dABx?=*!`E*`vJS9@mHnA=hKckt0+FM<4Inw*AfWh4ZPP@mR5O+p zZd@A%6-TEGZABMS=K90Qm{RwG@>#FVM(pa0)S&~Av2K*9cCdipGv~K-9h1Lbs~lcbq)6`%M*eIAb2P2KztKQY`Jf)@$s@Q zhb*BY=(Q{;vlzcy8qiDW++7_Ofg}VsCv(BE14RXq*>!!9gld>r&my{OMgQ@nis-W{ zc)#3$wNyccUmb$0As^A`)-EjF`SBjr4d0d!bq4_z^l>v-_6p2GmrC;nh-g*{e&7t_11CiA9&h#+& zlDr+=f$bhY!c;8%LNQB;@$c#pn-1k2{^JAdit7Qe@?j?a<1d4p{grdx={3 zDrpm-0&`VCDkqLWLvY2x5H*nA2oC!7#~jbZHowXec2ISvrd_&K*%=pgUoycB&iGah z=-71d>l6;&DfZ1xIZ&t#2=Sv!G`>^8<*1MFFyS3bKr=e%rP1c>=owCuXL1wAJoOmj z4!A2-khBL3Ad=&GV(i1fwQipuWp1KKYA+tRGPH9cr@!QI*n}o`Q~&6sg-)$3Ue?U) zpzg+q0#Ntv9H579_G!x!{4`+uN4*K+l%`QHVH)5Q zRK^rJqz3q~9xKQ3P(dPuWzPv8yniXai4nh&u&gYgMjuY>)5LWuJsB@}ltuG5uF!q~ z1t;@M=-nG%=c7kWw z$ec7xAZ{T31Ehi!diF5@l-?RH%TZJxYzqdZ4RE#9}*GzHeBWwbs53T8qYl8Ydzum=>~ z8n?FYffl>i^#{&-;RV5mncc_f0UCA?LAho#(bxbp%Nr|omY`_(X%L)NEW@{*jatz_hojYQG3l&FV)!8~)T&zaEKJyj%9iPh* z8o86T_DS0BNu6paM|%^23DhIFqbdX*b8&MP(7TDH{Y$t^qWg|4SN)xK<}OfWW4wN; z5hfTlf_x#bO0xX`Zoe zlk5d;MTP0(z%L0u6YDiqkcSNTh=${!r|S9ph#H_DK3&G$Er>63bHoZ>iHbmOR8vGL{@HZ?JIhwyZAj|ex z4+JnyAQIvMI;&fSYq-xx?7uMZ7QWBG$`X??h5*kZAPEy+m5}Pv7|&%IR?EB(54X)O zbO+D;eWR~K*d*1MDEez)7FXLMoi&#u3h1R?y}W?iQ>jP{lhHbeJRM%9k3^zf3DTy_ zskm{*F}JbWTal9&9KgGo@H@BqcZL;UHtyEvTKRb&$RW5g>M|9|rV8Xu+R1YNCRvJ0 zJ(EABNk(;!f?Z-?s4DE8F#Y$0_IuEX6ZC$x`f0o_0xwzaXas8v+K!*1< zhY^_})MWs;3?Th4KrJ#U0_=Ne?BHjhCs{PWm``?Td-$|(CYNs6nkr(fo|2nh@|Kp| zato$}|0S0Bo*M>n;KQY-MS(}HL!#!LrrK@I9$Kzx4b5FNz%uovLj47hL9W;+joqBe ziZ>g~G7_Lt*lIv~x#5P?|H(W5Gd8)X*Z?u&z!uz=JGl>~bHbf`(cex3_KO@1`R9iD zA(lx1+I8JL=?}};Swn?<`N@?~R$Ke1&#t#3T(f`xNBnZQp?rRDkaS(hI^&C6=}V>~ zKt8Pl;3dltD?jj@|FpS^d9A7r<4HAPHX5sdmN(lssGC8@wxr(6yZxU7?HMNe$_%l; zHrto(=hTpvP?#w#u5=CdUpN~@R$sTbL4!d{gFJ4LSA(pH@2}k50m!WKK2SwK_cjv$ zy6Royf%AJd;A9{{{dJ$=z4>r^@r-B@1_f&TA-eu;#^eY?z_satv?4#qgsLDFjyRpq z#Hf-tKxm5p#7_Qa@o)z)Isa_1L&n5^x?`fCOL2|a7>S%!~ z3P*Vn?jpF8#l=WlYtHzav7^pK8y;@w{o6NcMY-+QfaVOB=jVLn%*k!px%vUrkMcLSS*KI}Fa(`E$O^mv`*zy#b1c zI6TI^uCD6rSGugN`GCJ}eZ9#6&}GiQs$Nf@pPLN!cU!QS_+9BWMa{I4Hk6O#A~pOo zsJ`D|gte$}9Xme%b(WD4{eyA7feft@DVDm)L*rJ!QvHKM{dIf}7B7x&hEA8c%f|H{2t_A*5CLUh zJohtt_71~ZNAKi#uPeA$wlpk$?(%ZD{=(W?Ii1!r9!NrQ#``naRL?BoK+KKjA>_Y= zaqXz0q6-ym(@7@%&9(fCasJQT00Zv`0HB}$Pu?YM%+)_EZr^9JbZ@2jl)D5q>g)bZ z^suZ4EGUFTpkz{CO@GXBd$W>va6~SHQPQSVODpi=H-1VGfaIGObYlbbX&=Zexo1dp zmGvm@?eVIa{o$oS1F{40T_84xsd$D!*$-WL8!BxL%Y;@j$xQ~c0QpEex_SMRa}UF$%cNpXVRG?pX0}mmUY`MZ3Y9T@)ZzC2^q;K? zteyn)=N$zp3-94Os!U7P`0Bnn_mS*|S4 zn);-r*nmiZHvu5yeD!;*pZWWls748XB5>))z#xq#%4yI7Ke`*t^eP^Z$mxM+ZGa)PrzS^8brN z|L6Gqw-3~*z;IAEztr&jeQ&-wl-~lgUSH%7CBK)D`%L~nACCVrVPse@>3K4=H#O*g zPbh!b^Ck_m=2T7n*A4fNefwWqa2yYq;|cB9i-13yi{$w_IgrWe{|}dWMy3LTqMW1g z+X#r}FM2+~i!3D5p?}}vzdXx-FT|Wrz(UWvqu7S|GaSOt?E5i_frsb2Cvt?ik33AU zcAxHdf#Qob%10UuOoGcaLlq2z-(%@#or4=d2&9!79={O}eb^EdA1?T}39$%lN6Pn( zk&8TzZpm*=+<3xEObTbB-kzMumttrr@2AVPPly9zzXMKl;kikT-?RQ)$QNh|fSZIQ z^k>Axi3osE+#t?`dVW$e>fiQFY_+tR!9NxbSBsnUf7%xOxz_WC=pY!-gIDDTjw;qE zMpG^vR{x4aA`j-PE=U2W*3O{Ja zr3Wxe>6cPuL*Bj3`_~=}uOTUp(rH%G7h_>Zx^K`2{(gU*9Q+{tvpmto0B%3}jByF$ z@A>1me?E7C_NZHc6_%p{p<6+=Z!9;MB}>BnKc8m4)nY_78mLaSM0DYtp{GgzJdfh@ za4G4gRQCQEhab>5fRizaKa_fxUSw8XAP$co@keiN(|I?S^e>*0{ zwf`}Sa8v37U5Rc8*j%3985jIA>aYJij@|RQi^!Vyr;ti~0y2vZ9SH0D9CEeDMLu0L zt$)1_E6x?ZMpb;LHTG^enG(1eeh7+}44Pti0e48nCRT-|tZJJ7Y6Lir5`WI1W`4jdXQ+la_|wB6ItyA@imLJP^pjP>S*6cTI^_lH_&0t3|G1p( z8)!v<*5w~zX-9p00^s;}?52)z`BD3Q{B!C5?SmqYFJeklP8G|!H>c8moD1bJ3ofCUF z$J`|LjR7Xd0HT?1+-@V^S7`@`4ELjlH9ANfwLU|hJO9s+=VvD?@E-HE({!n1H9QT_ zYZ*9SeG*~tcu~UT~+~={St}vX*&l)uz83O z0H3YU-;Zr{ePXn&ftwX67d|ei4(>oLasrd5c zGGXC26gOC}XXUn-P-X#F;^gt*eMbu2kn@>oQ-vz9*_Md_2bFE!x90bNp^6Ita!VLb z$&QCF2thfJnY*_aJ0=@q3(5y^Et%B-LzMD$jq*bg!4o*(@Nrw~*5>3UW*PPElKlRs zhQdPxdzF#YGg7_tx!Wxpj*sU#D|V2|An#amuZs+^_HKG#zDGy?YmYX$>!T-yD$`+- z84OwqK;D)J(kOEb#oux2sG9yY?BZ@by6kCxdTKzeno|+i+L{AkVm-4$il%KBNw7-2 zAGJ9L8>L$sYvL*f_3(aWaJk5~E`lSJ%Um74nJXYHTusf`KXk+VaMciP$aO}TX?|k& z6y;sI4YW$S9!lnMS3UsWhsK`ws5Pl9blsUM6eG|kFi-;8jwzA5r631S((inu={3jU zCzCaRyhULkftn7eMH8qp8Q!lev4bG_pL!A8d0&@7EQhT}c;&nkXA2<;adgSgfu{LJ zwM4zNv?T75NF<(^<3knpD_=@5M_~RbwPB>S;r@Er<)EXrkL|&gi>t-V+05)Dm4h%O zOCCeyp+aSN%cPJob=N|u(Nx7td{2<&aT$Cc*JQ4dr~=Ah^S3u1TxVV$L0P&-$lEGz zi|K|o+4S;`E@Zwppz&t|p zGcu{@)@%rysX)J#TXi_WAc-X%7`xgt8UD(hHlE6%wYk-pw({2JG{CD zLm`=W*Z-(?y)DvrL+kcVd2@X%Y9fgahZ*d%;BqXVpAI&kLAv+vNu*WrdvkLn@NuIX z5p&0?JzMNa{#uY+XvpisiE|>P8c5Usu*z;u^3$(Vlr&CfqV98uFE6fCOB5EU22@)3 z4*A5dQtDX8HQcH^qmxzXQ%x|oRIo9px9K!RUx|IL9GWSz5VE9u^k4n3<#(9fIrjSb$RxRl^iB(mAACe`P z!JA$9eOq!%bxMP%ulS>HXcjC6FEd0s>FUXBu4R$#y_7)zlfUImkpS4;QME&tu<4S3 zzql1FyS>n6{fb-~dF6nad)Nnoib1bA`XoJCJl$&AHtqsh&19oxyi5eGNay>TmaBxD zqVa8e0dzX0nuNscQi~Y)(CsE?mz8}cz12+r>cb1=9@k9Q?2mlTFAc{ zFGkN}Ix(jRFlWiuQ!N-q={vCUUIL9J;So=l&B z*z9zg9RnrRZfB`BevX`^y&vcCIv1{mx^Sw0%|fB{$ldVy^3crzW%ae|{S~;?pKsu! zatqoOrfRwNmru@?avwK($NVLR6;dIVQj^*;D%Y~CGJG9RPsj8dV6plsy~1~8f5cKC zU}7!5`gIF^!t-FNM+mG(@Ck#$JB`md=uCpbjpwIw2e8%hIZ^~HI6a^7Vr7?j=sNp1S6W9((T zx5+`FfAx6pFQN&WZglvb|2doF^+l5usv%y89}zhXD`A0{z!Zw{5{A_@&aHqXB!_|v z17zr{?mh=B`his%j6tROcZIv3iG*!tn`MGLPrXDnYwT*JvNCnkDIehy>6MacScRnT zE?V)?Nktt=@h533)mx0WaQ%w%kB8u7KWTq^AZnSk{wZCQR=}(?RUC_Le zQpo7&GC7k!E>*9sRvw#gG)f#R_iS{^8RbKWY$(5BgZ@b**yY=<)T%6T+r`|^J5Z{@ zooIIg*?B8fdmcbl)c=(e2i;mtSiymP9ms*HVN7+c-Q?Ni)WuHx&;rIxY1B@u6ZZM! z+~>rA>C(&E-Q4?bF_dEwb6I0HQHM@0iLN5j9wqr>Ce|g5cbeY=O={nw>hwe1X7It#ivPze5lt}PU$pW|k~fkVJ7b<(KJm0IRK9b-&aT6iW2Yd6s>uMi?d~f_+raZ zy+ppvTA!fOc%)iB?R&xX>|Xz9aM~yT1ypm$Uyrq-lUP~iQ`PYW{4o#cl$IYPP(^-J zEIaP}(D{0|;MjP%TBT&7Kq8t+k^EME`_~B^mn@1g-uR05rwocm&Uku0yN8idvw>tr zt|_+@76F5w_0eGe(7X&~#n|eiaq5QTIKvEgjYdz^U9s+%Bxp zbOl`({QHpBhx`x)2(y!^EbncYaiJ$7wu-!IU^3OKli2M;GL2ueghyyOMGs)@O|%HD zl&bFv=Rm$>QL+ivs5v8jqw!T;NW>QABB?BnAR;JW_13wI;;zx1Fc}sOtbVF?eAob| z{Fp7bMLp?W!CuUjmTI6|ztmvHz-j}ok><6ClQ*T&5ggtBPPk3U2d=6dLdpu$h!@7d zstR(}t6pUpT&$yx16Hib1xG%`cFo=uhR>rtFo zns6AlM3UH5RL(0Wid6`x9t_YT^`hO=dy9!L*M|-TrRm&_qoLXxqhJJx&PSnO@;URp z#l4_8#U!eStdCL>K*f`|^33tkm|m5NxUr1L8<8eQC;8MSl4ufHV4)xU>?(!M>o4X~ z2_`UwYUAatCkdI&Oe3xlK$(t?lo<^U!0dxUed*mtKb63bBBDU>-ik~jH6#l-f@ye_ zBljDgkKIAvv|e|31b-OqX1N_YUHXN&ql4PX)o>z{6MoiZwJfTAZSXO>uWxAQ`( z@XO&%nr3nqYfrqnDlmErg`yU?W=;{do?>wqpdcDko92$4GKy^exXg%JwG$!agSC1z zvGwaH>qCv)<_WqZC*bX{(#s1{0YP#g>`4vS_t=ztDKn zLL5dBmL5HCYAtb=-B64CGXCd}Hcuf+8?cS?ESH>%Bra*_$1-=_hkL)?2k!KdWiDGt zv(Sv>uVxm8(UK7%Pu!HYPXZfJTu&n(WR09ggvW@Kf4M<-cFOV|V{u)*sSA9zLV}*H zkZICIg8x_{6+95X`i-;9Pi;EaJ4&_cs1&jS&}mJFR$&$c_$x1#TioM78sk2(1ddrb z@yui8l(OSuPOUMeT4b2gj!Fya1@y|jnR!OJn|s?a&5`@F*$k!NWB0=4`cGqcAEP*& z1B?B>5xnW4t&bJE=1j&^*^E6mk(4AU8OV;5S#ZudYVwMvAQ>i8iWkMtJZ}&wP~RR% zm!T>7x{x`(2Pe23U5id!C0iQRL*nvUz=vC0NGvL`r;+4C5$6?YoJ1Sg25kxDMka!W zkdvBrZ_n{5p08Xn6p1fJK;B4Eva)O+pYcN+Sxpkw;1%<$HNJ<5QROBtC5_3jTNY~f zX{6M!z}t3)l-dLXt(j6r=rriltH)Na4F(#;vM|tuw6y5AGP_2LD@Dm0S={9548F&h zQb*K$6)tpz3F-Ywm<&@0>Vc0~<&&acMkemQypKkt;W2~McnFn`6yocS#274I2NQ=q zI$coc)Vn4t=1LPwSRB)ca_O}`sC||}$;B;G(L~Nz<$qys){9H_$QNL#kUCpQEwdlT zTuM?x+}6Yd6}|}=vXq}ufR}rw@j9QhGN1c3o(6fP7U4|vbBVeAkdw&W_2#_s+WKfj zn+ZuJJ{(_ z>2f5EG({fszSrcfK0O;ym>9?Cdmy4zJoJbxQaS)f4L`bP!c-SR$r$mL(pmgROJs28 zLSsbAW>BPOr*XZT()c$NBa4wv@~XuRD3^vbA)!oyn-{$zp757>3N9zhq(e6w-J#^= zb2_?LI??P3B!!kc^wvb{-^#-7DRQx)>`q)aDhzh!Bi_bQ89>}FpOG>2zVo1@k`_{$ z!#X;Prz&b?m}Fh^Z1n_7I$7ck3o8iYEw_j)&)oF5Q>lGn7S(i3qS}Y-d+XT=cY3|| z=&-}kk5Fa)B_5S^yO#qlF#+M)xvTec1DyG6QfPwZ_Pz@&RT9D6_o<}8ERtqQ2RJ|K z-Z@i*ww!V;w!|x_{n4~0mo0Y~BfeHT#+i0DZ{^A_SQmCKCtTG>MM+r1gzs09Rw{kX zN%;tU`M(TS&_Z~4Yu$Wi6CQ*AIHA;ZSPBoZlf4tQyWeGneo|T=N2Cdn?f3R+@mnh& zV$4opEJjWvjvw@`H*d2f+v9CG|Cwx3V}69XfU`Q&e9@ z>M-Uhzq=u~a1WBO$Q0%@3fUCu;trsHbCLgt{UY7f$$BR!Kk6Co27CFvb&(#!8OY>C z36AcJCG*%%6-iF3eWX=%@d2FS8pN`cEGbyqo-J+O+~;Uh7Q5;NuMA#*3%ERq zQ7juV201Y?uHG%*fyuQRNG%(c(55!D<1@wcOi2p4Pz!JGRB*QK^hTpHex|rX)#>^)SWK~Fwb-n8W3b)V zH=hdT&902W@@OMTk2<*A_IMpb<;RWHwlWc|CA9uw3FR~}3hZ-Wu%<-N)C5gi*&`X& z$?Ls7d;ztsi%n=j%w@VkHSf0|H-wKF)#i#Tp_65Ll#@*>XfrUul{hqR?bZv8@qYRT z*x|_O-^DE?K)W+7EK|2RK?+F6xwfVZjL`O?0jD17W!24MD-s8M4Lb1$fS))3Y-?DD z(e3+}CRuW&+pI;rc)lAqT6KdF6nENiZkgK4IbJRLISMWVE1%}B_B{k!I9(Y1E-QOW zsESZMS=@Oeu-PQizp}OXKnF*V)~g~*t}-6$qeJAAp z<|`mt2WoEYWK6%?X2+I;ODqMQ*s2+kp8H>FS1BUgY9DM20X{wS3}l`25AK1~J)S)^ z?@4u^d#^>izV*tmE|e>y^gt%WQ4ro;tKFl=?9gD25~w-=mK*|I(xamfywLAV$}r2Uhn zDXfkbp8RqL;VW2K1!a=qH}t(9*oz|^I2F)upwl~;gzl8K!nQU=-y_TVA}n9nZQmBa zZ}QoaJqJ}XZ2DYmvQ>{v{I!RX;Nps?`gTP1ykvFe>&^?#h}IJe)OEHecCu+4MjwUD z_lj!H-N(a1bc@dW6t}96DG3M9RJJa**fl(|KPR)t>tC%mxb_)Lkl`(Ncs4m@jgiPk zC=oVie94Q%M>%9m)$`&Z?(Nz;cX`=@uq7G)t(Fe=t%EYph#DUsVJk`BZ70NEhi43% zutJP;D$b`>M}+&J@&$lI^Cpr+lHpJ&j%@Wl;n}=;&%*u&4T_> z@QII;m5K_9+Inwul#rza7-a}=boQfLA{34bj5c63Lzl@x`IFs8Fyb`a9&-1_b)C zhVO8azodqNJ0&XX^!*Hp8fV`qAxFj0LB=+@9s{?f6z!&+tfhAQ$_?@(G~Al0A#^{h z`l+vfsCa=M4U}L1134}9K+-@1i7gR9k)1lEqRnB2uX17YcfaVcE)w{D4%gD-$zEzKqgX1sSHIAE9n*VXNBc2I&n`2Zn<3m#-h?;xNM% zc6!#?y}k`6@wQ~zQ^CP+@o|cpc2QO9>KYMq@hsy-QTR*OFRPR}d4|-U25Jrpfe47r_Y@hfM#+-c zIzeWhD6{$+M*N1Sp9X3@5>rOSB5ERejv_&wvoM|L+Oz_x9~PP`mGFsBr!8iOh(b6- zzRC^>D^P8D&Q-^wh5m@^VZRCl9;x05B9R8UyC6Z&1#Q0{N?E>wv{!r2)Z>*{WPwwXe-;-M3|77ygwJ46Cv{}RTTiBB6)nFaf1dg`@G@%~m|uPIcckGd;y znQdAlur-V4gq}3t5eR>3MStOo^P=L$D3+JGyW)MN0ZX%br!6#9NXS;AEsV1)lMi)! z_-t5V+)JW^i!|QOyRSym^zQBMgL6^$QfQF#p!I18PUH%b4lI*!?9t`NY@)Vh(C^eY zEX$boQZ(KW3DZx~igB6A;>i%B`0$X2-T4>Jf6J_syV-Ed z;Ij4;7$9IZfR#zxOY&}1%wMT>Kw`C;k-%graB;cI5mninVLRmyL`bQKyI)4I%-30p(&2h; zP12-M!J;0;#9Kk<6iQ?VEBa#|ZE}_Q_Xpqd;h~9;!#{`-wZokn?7aWkhXU3?8^_RB zLPqahyF@6a$>3#Jx&q^7YNsiSNc70EW^|eA4>^H9CJE`&uN8Jt=zn;lD*NOKWw6bJ zXHd306>>3scCkihn92(xZojE>vUQU}ub~g55*gZ@Bz3_eZ9GE4-~b{&gC zaY-b?CMOQY$8>gzus50Aqe94-&gUQ7W((Qs=>X$PpA9mJ%Ce4N?fQ=`_Sxs?xz{tA zh(rwJlp!%DE^nEx2K}!tcv4K8_`CSIxLT61tZV@)KU@s-a{`zu1az-S!$voO#hJI+ z);k1(uPsuPSGxS_?bW%h7jlCqAS#n*i;7)~Jnkw*HtrOuN3_rqKjEbRa`MBNjMAr( zSRbSaomEU5-17LE@mUiHt%iYCL6TEA?ygP8-gF~KD=pm(TS`Ld*mQTN2+|@g z-Q6V(zZ>Uy=9%}MnfIId{_@~(6Zg8;y4JPMTBf#nSDPkkB)tvpIxOvjbcI ztP1N%4^}Tz+c6sAl9<|=kJeF|8WRD^`x91)ausCK!+^FX7PV12x10Kaah(~en$M6a zkheT`*Hok0$bWgvELLw5H1j%riwzf?fz0js-Gdk%&NmuYiRxJEezxDk`gl3ao^KP& z@RGAp8P8D)FOZLF^lZULPRf^9+R7~OVlX3>VEUR(5;mS^#7VvJzzD<*{??FZjy zYP*TRRrUP+gZ{cXs*<9p{#51mFpqg%tXL5qKb@K_ovopHQK39&b@YsjkFDqPyU#cL zVa^}f0wXx;q|z%;9fl|)+Fx!pbz(Sb77je`UjA?l6feh1S-fVCRi#5kXV5$N%Xlh{ zv*f}v!r|u>stk)i2r0|x?Mb^MAnF0^gN()t-rjg~zAS>6%5zfHtxiVW?XsduG<>%&5s66jYDAYs@BSO>RskizvqK7#q2Qa>P3Wo7=Zlt zSYDoOyu?2?R3~J}BWpPQw2vKIZ}df;Zi$u+1kbai{x-(E?IoMv`SY>gT6UjC-n)F9 zSQb%_xDH5)!~?E)54AJ)e4+4tKi{uXef2y`Wkc!jL*WOqPvF99^}Q*)&Z$$5oAgSv z&6OwU%r0iHt;5jYt~2Yytv#O*zZq>$Pyre2B^S87K_Gr~AnyRE4O=fp)(DDzJfUjo&QF@P5{xl@$5*`q94(FM z3yqY`CzVaJUZ}M(EN6z{A)Q|P>YD^BKKU251 zqo2YE2hDwkOnuvb_S4*V-f4klaF9v*_NQ&I4dro=a&||!%|&Qtkn|~}X~Jo5(k#qf z{Y{oe_$bctafa`gIosghoY^xF-29_)V4mXRuAts7=2S>xL4FcxYo(&MN7uhk1f$JbYD9 zhZPC*V16P0O%KM`%_&TNBXf;)C(1Gg(R;VGm5<|j@DH&_K{C!AdSq~SH(Y9=#V}nhoFmL0>>VBkYlo~iw z&AC-X?J`0~{b`@cl(|H1cfm1ZM?`kU;*^R)xY`6&_9z|IU#Drl%%P|Hz~FJ5nEjj~ zIln5EG(%A{(;C6;=p=v0yZcG@&qJ}mKKYr`)7$Z$E`=@c=L45pyZpcUN)eaHlMBJ3 zg3WYZ-aYE6SYSbm;8F|yIC$QcN|g$occIf)-KDNH?x@_ z=P3y~++!D7ZIo5{YLwT9I~K8YW=>--kAgu3F^>#o?corX4>ZUMy}ss1$2+o}3Un|( zAM$cq9mZR$!6+VX!A8kOHH zH=Jfq@swzBhYN{Bbpq@p?SSZDJdfns_K)I78lfe`nn)9-yz@mwHaopl-h5xVs=j~wiL62Ps5ZeT?`SzM#B^^s z@8nW5lM&|U<9le*op<=yPCKDWQeQ8>zeqXs9AL3zmME_4Y*=g@Rs~+b5|7Mk!kx71O`&1Km^ z#oZS@DxHfV3Qy2=__~E4!kkH36QS^I7-5D?W>9Z^jDFB$sq`7;Td^BmX9&rF4!kLu zS_~h*!&L*r;b(6(sce2p2poio=!MmB*z$;&Lpe)Y@+0MoH@NsA3Ty5f-V{EF30#g0 z)D!|Gc-Ppua}I0!NFAH|2!&Tf7T0!jINwJaPMi4PZ_eTN zz>&~lI>(B?hnM*Pp$Bb+x#_GDAN0JE1*-bIOA07ABxet}fD6wtNx2k^j(lXHR7ZS<-=P&2)!8ejcPo~17jrn~lVLB^v)i$OlPv6{8=rG)vl z@n*F>fZ=l16s`2nR&s2u+Z}nB`}(r=%RW4zHf(Qs*E`I1Tk37CoJR2k(nY!p(o1$W z{@L>OiTRg10=d>p_LdEE80i<*Nb=)jL_Wu}Dj4cvHvq4P{8#XL_iPs4&wey)7zp)6 z*&dmHEUQ{5EOr5g2p@KJQ_U*$yEyu>@%$zm7R~kn1zbtno>fByz}8-8WY-_p&>Y#~ z`*%l9-zw88iC$WanB)B%LAux_A=66zApSxLY=a3fWZ_&XIo5`ENo{|^> z@OYL{(R4mIp2(OV&J>&=^2ABd^HRQ`cvtv@dh9aq*;xMRM;aN*>!iu!EKBlX|4}ZJ zBLA|?^|P_kn4(j*^sUJflbF}EOE>kc_=`xVB4qe5UCP|W7Mr1r52Ba5qctyl<+n9yRPBSQ3ILSw<0IHJNvA#MjT+6A3}1?U z3d^yz0ekj^$`|2m-niO!o#EYCJ+ad`^`{Cja*+N`l^tIG_yXS*1?EH9{Y8RaTCq2u z7qRzenSD951{SQm0v5&a?@OU>G`UjMR*Jlr%A{&2;EnCS>hIL%e!G#Sib6HXekg1d z5W-}qeD*QnU2cht@YWmjODSIPf%>{>oTVpwu+}P;D+?1rAw&(QbHG7XEr&0N7Jy#1 z-FeAq)IhzpHj}DqZ%J8Obz9uXI>WF5&etC6Emo*2^*1Y?%7!wb2p{BZXpnGBB?q${?J$6qc<*C+fNUtMYB=Qvx;Ycm|fnO0A@d{0o06r`;Im|eLT zcatSIPqQW#*Y36_CimoM{xcr<-MC$D$36-auQ!DVZGq*rjpN&~m`oqrFHvkax%n0D3 zjpO*ai*oRKVo>7d2xA*HwRqQlZ5?rr74AY%!Bjvib2bSSmw@Q=rX%q_w8um&=^1lS13_PUbYmpOO;O1`r;ln zPua&Zn?fD>P+7e9T=SS`UF|=!b$O?0o7hF&rrllnP3>$hj3P%#h!O<4AM8ALoSRR1 zjOuW5n8{o8;9YZ*zj}(^a;%yB;^K*VR;@9SbQWcd+ZKSZ2jKlngnff?5BpTvt#i!Y z@ehnW%%>PjIzhmCJ{nyHCoX86cZ1sO0c#x7>!?;Khb8$HZGelJ4lcy z0gXx!(HBok!Y_J{6R0gPJdGc1FsmV*%a|J&%bewc1$|v{Ia#@mh~N2Y+Ie_b?X3w{ zRCgImDdVdGr*nJnW%64IkX*i*I+HkVaqvyio1&8RkJadCPmaXZo1Cy2uKsN zpzM|cm0>Rgp5pc^hV~hBonT*);H0f!-BHb-wG|-(CKl!z18vkx&yY>AljAoIle@kn)$K$5KIfpN8^hagm z>9%LiS+RAZzJ~5Fno4i7TYQ}N+1XoqtzjBC;3&54}T=INMPVBmM~Bj=5C{xevEkH+HlMIOYrNtMNh zy!_&YV@PlHZ^qox(W;Ix!|!S3QG?2{7(2bDQf7atf8EoV`4U}opa#BR!_x2l^m4C& z_|qb~c2x|lpl)6i8A%H#E3VyyvCkF8ziN<84nrqf4#JFP*rfc~zB^lyibH45MNz~U zzcg845Bcn0*+7909i5GT$AlX&t`yjtpBU^%6mW((Dto-%vnlb7b$x75@HuR08et!u zr*K<}N0mj?)^CKHGC%_FUd*uQ<wulIj>D9{M@VU zYN+W@QE+4}90h12NEXWMkY(q37q1@9L*o(JSb+}Wt5o$k_PF;lN~vJz{%g(9wx40F zmd){ux$+-pGW!G%ma#A4<>IcRmX$FKD*#UvI)D|S5J==uMoic$mrU4-8U9STGalEg z)+mGHwB+c*{v;R#yF39d1Be*tKW)%s!VFcnFp(8>O&EXjVrF>h+26UPr|eB0x4lNPU3jYcRNCklk+i;SNElCTJe?E zCcRAPig_xhKqTZTAilFmr1uAxk&1_ViucPMch%(Z=Soq%}iFT^;O1eo*;~3+*#;`vy)!o8OF0ojt8vg_%)=A z$7pKvuM8;hs!1DHhRP<3#3+a13dLkz-1D`=+rc=(`wF?@l_0^TlA{+QRGgzBNT>wwQ24 zN=gh8K~bifCw;F`e}uxjKhtYGPcWL}#?3x51NaN$=}MCe5$mu#t!7koJlU`Wd%{nf z{mYEqCqOnSLGSlt1yCJNqQOFrmlLB-Py_bm3Edh0# zvX&}A$<3EFjIhJQrEg7nq{-te9ugK zlS$8&9K`YD$JnRZVjX&v`~p(VK9ElJC(_7AhM|Dk4m4G5(#7;l(6HdpJh-hrnU$t_{yUo>BCF?taMf3aGVz~6Iaa#z53mvy#a0`Rd&?=3GKS| zPJ)iR?2t9*>U3+ZItpLd`NLC|C}G|DA5^d{QyIN6D~vQgC&W0WMV2e82==sX*%DtW z<-~2sI*UnSu?UK*Ws4MoqxXEXvq8bgHyoNF=Xn`9;X5}!%LyBX?HK?>mrdo!Ke;;Y zGN_14cu-J_Bms#MTns9&D*j4*kVG4(5Z^PH zuxiBYtC3JtHM%6+yhGsKnC*0P#I~|G7_=pZThI0p<4G|_jcSV|uAvf)$^M!cFS=F5 zQW#n^Uq_PCvn{4nYUMru3N#DJjB4O`!N-Ou#%Ler&-WPHK(%8cx6+oU#fy zhi`&Ta(nUn^0O4BPG&uAEw6+z%QZ`J>1)tOb+Seo`(nmbi|jU3+^?RE&J~ss z*g@+^oA1{dp{jAd^_%zS>a%ICj9b^eb}(_^p;6~`!j~~07EpH=fM4w|I?ts~ImBWZI z;8n8w`$Hsfki3XD1KzT@J(0WU_u!FzRN0sd&!EIm6qYCZvg^aS)SKJu z3kS>bk{B8{c;L@;gj0E?6rrGo>84-GSR?GWwJ3Rxm6D^9*W8ULDrO<*j1daxm!xya z-(!wNu)u19KUq-5Mgb*1@v(ZxMPr6kTqK~4;d{1&Y4iK6pV@)~?#p@!<{akb;>}n| z(Qq26VE^9QCjr9>rNtw&Ql0q~9C5O<%D$}2t>wKmzRz(ukw3~Nr*cW@Wty;7t3zi# zTsjhVf*qg`8`}Ae=o2&@f|{+YM1~9Yk6K!Pj*P~CQD?9-N-{%mFM=ky7eVVp+PeRp z#+7XQb)WOr1nfx(mE%%s7Pb^!CC1GN7%0c(KnU$;QB#LznC>Lp&ND-Ll`?kIRc*3V z2l{@pz$Rbn?n{LQ#E=b_i9*;_OzW6G*6G_*G7-SJ5@(Uop4snKgFEpVP^;V=Wf>$q z3S3$TkOIHXE1Y!ZULPJ7_pNiRxFI~Pe3j`>h`6VwxddinR6YsE^?Y6M^U(x{>_>D2 z5lbBryRoWWqea$Rv5@2d0_f-n*uGhi?+~GbJql?!OI8LUpdn>)(|Asy@UwD*^Kg8O ziwDN3Ca9$upR<5t)k>XfjBugfb7%Wzx5O?FbM1}jl6|)N8dGZ_53sG5NT(JEfq!u@ z1_K^K_E0?6*-nkY`S^m+JKNN8X56cDDGlVksSI?^B8{%DXupchl~=O@t`OAVQn}KH zRhF~PM;(MC$FQAMS$x%bm)EpWjJSK0*sgEg$Ojc$pHrJOda?=%yR7ht6CZD2>d4F= zq_ZgRv$H4k;ajK!3X%DT)nh1bsmFZiAEj|@1WCxdS%0xqxKxGE(n z#Q2jAqRAaEZfs6FC{2K{8Z|eOrEUX~OtSdgGd?*f00iJiubR3KdK&8Fm1&O5ihiB+4Rqzkp#!91y4r!`uVbpY8dA1YQJXkZ(> zCuHM^&ibtbDWjdY`K2FI%vC2WeG8|)0aj4C#rk03gfVeEiDU%nWZuzarCBrtW& z;|nute@t@E9WvH3OtsP-mWMWKu~YAZ?S3$j&5_gv%i_I~AE67225Vx2ZDw1j6{O7M z?@F3J1LR~NSMcGZrklNoO{EQ|#K!&Gg05ZhrD9seZ9GR`*Blk!q^AA?0EXBX-mJu< z&2MxH?p&<|wJ**3^+0QmxLJ3#;_e{JQP7uRmuCx@(39`8jnSi#ha}5&dst8UYhVND zfbyg;b({oHd(5SGT6}%>TkR3gEHR`^FAEuP_J8>yK2G8^Q3Mak5YKvT-(jQMK$v(4 z;pj96afsCN5M~auhYHO!=bq(l`|1Nq-GsUC(pD8UQS0hCJK+IL_fn2WLH{w0(0?F? zr&f?ox&F?e6}Hs6Th#Fwz5=Knx`i%G?l54tX~fWYwi`+VD6zGPtOgx_vo$==I#Gk} zQ2~k7#g@$r>__XAg-tQzqUZicDqn^vdOHK!k&aLt*@6@7<1j5vUoehE<(42LFcjx@ z$$c)x>JRigc|_F~%{vd7;rUJ@Usw@Kg&#u7NZ4<$94T%PS8`O&K^EF+^pdI3K@(Y+ zN;SR0`1{K6`<%H}gIa6FfoEQuswUOTOwRN$rG$K44u4%73t9)YVrP^JP+}OoE7P8 z>ZxIX*nQB2HeFLA>-FvH&eZF9`hue#LN-#gFPd2DiroCJudgKW-;p}9w*mZ&@+)y8 zy^DeFmjbY|AQruFX>YH73ClPGI}_XS>T(1MxYy_QORx#I+^3~ z4uuoxFnF9KsP23<@&arvDEpjs)b2Hi)JN_kT!mG9i)e_{SmFKFqXG2x><`-q&~_Pw z*T^s_grWl!9a}-sX;kfB0@&AxdVNJ|z#x=%HQ*j26N7wL^x?XO&sgi>zgg2}OL!g| z@iuHFzuU(=jnTeNkw>7xtne^Gbs~%6cLCV|j_&#U3)mGP#+W^l+IQ45B)00uJj93d z6ponquT({>n|>_MToAs}0ee2?mrnrtxHc2z?9os&t6<1>IDl`dXlL7AD<+Osx$d&% z@+7}jR4)=!6Zgb1Ol7$9I}g2ud{-k2ndkx+x;`5gaXkN(!v6`?VQbD-YEFu{*S9~3 zzV^*amcc8v#3}SdnHM@K$$3jBnRF6RGO7Nd!|%iEzUE4++G%oZG~Z&v3rPz`^13wO z8-rcmnTZA*u?p4CuHHX=R6Qi#)u{ppt+najP4t4s>OdCxlz4T&GNv=+M$>cGu=@H+Fy8zbgFL6>sm zbj)|_Psam4{BWAo9&$fq>pqvmWEzRejM&e^V~tTcn@K@;gn+5S&(w9FCAYRh=MK^& zM=q`iS1u-ar-mEthGkk4BrJ_>mkr_OSUlGPh=zuA6lWjq{VeT(I@U?tClv0qjctwj zTP*t<&-+OZ#F7O8%DR>fl+`xT=0<3c^N7q5nY8%GdjIDe!|ES-1c+rJPh)0X9oDmQ z#ZnxmzYC5!EI?!)h^_%JRl3(KKgmtOkyc!&ge(#rWa~3Xg^uM5M{ zK10VlE8$k83)cE5R)T_~KXeoU=FCg3wi#0`ms+ z6aNy~6S(g!&O$GL-!JdsFsrl*rB~aE%bNUtj{xOYzcO^OCuMWhc2+D$Wu<4eMIzT< zcx+{`(wKFdBp8943+DVo3f1!;g_DjF&iUN;EqtLPYW{dyBSj3Tl_!*5iC>`+RItRJ zbOut3rhJmk8#~!APfYsLghBz(YFBk8Q0{ZSd|V>iQ`B}!sRjo=*FG|+DxHr%ks!c^ z=Gr}8Mv&G_x})AoK=};w@UPJf=d?5=JT!%Ge0J94GZ~i^+ zt24yn9^&@j1Vv;;FEud4zRLCs&uo=|;#J8C)atqMx3=mwzX^wVp1hl*J-BQr>_=x` zG=;NuOR5Q@Z827And@m01a6QJy{{l&0+4Y@6FGul4L&{kskn-jrp`W#HkM$q)cR62 z-Z}CcvPM-;fU?3rDj_31i-nCuQZ~Ji-GKOs@^ouK9;;aoIFn>EFn$LP-1&a1tR^ty z#|gM3RF5NU<1M;0hu~1p3vyAheiH4feJbvcbt=|lGUGq-5RR;A4#_(_(L0r+4q`{T zp4o)JDR0#B4ii}K5?Bp6R&n0^XoWA#3h%JTf>@RGxSShspJOFC>9a(eH*vnjHIB=pxU&0@+0OW6lqkp+)hmCIB31#2G9C-{!uB zQ>_+spY&#N0ID|9>#iq=E)VCP{19XPAcSc-ne~v<3NmP71r6la2Jlp6HG zV5+LIl#x&)Y3?F#W()G444Cp^pYFORvsgpIDBserTl#8uE^h#5bh?oYrC6#I{ThC6 zX$j~`U}6as*TRg4=SHv^ni)T~Ta==+0q5H{@nTNdTR|t3n%r**PsB?u$idGl6G80@ zfWexqK9p?*l-~3Wn+6f9Tm%_47NAyFQM6R(oVT(ddSv%D)RAooDEMV(_4eXk8H7g7 z*+Kv)dmd5bgU`PW@sz(A!UX*Bfe@^O#qpP^a&@J#2nh~nb2l{SFM_TN??l@lF_0qf z@1x*W^uCZMN)riCSHw2A#lVS`Pg~UEbH0UB3J&Hd=s0(0;rD%_jgotx8$$~FOz1NBVm`vZVXEdbC%kGMm1^0Nt&}}ZTOv&RL^|;z7Poo{N!Tu6ng}OajnZ{8c z?tsgWfFXU}b z5}}k&VF+w|C)8<}DG>@A3vV)a*h`*7g6?HgX73VC@K0|FrZYMg$|K3DaZDAon!R@z zmTug>;V48KI$2OnQ;%&(DdIyJR8B-I?z}fiCsV&Ah!;Io$-tfUo6#}A29MP@ zW>RrdhTp!c>+|O!V-I^miMEHo9AsZ7Wi!*XIV!amt09Wq*{C1R3zG6C+>*@#_DSfP zVTLgVlIoaq9)e=ZatiX1nnrlpHJlrEnKYcuhbSlVQr5gXuI&iGh zO>}<(WmhV%U})^>ZEaAdVM_vyj$q88bMM1*sOqVgCt zK>-IH6`qk?+nUq8IJ+ zZW>2Q5M!QcmHz7W?1gxe_mB7r+HNCR?Du@@D;|9Bm&>rD_|zG;;wuHgw}Zyb*oSHB z<1y2tR}gQvi+wqV*l7m<@%{4kKUU|Ox=_I$*@Ebvk_paPuo9w$g>Q{z)1GeEUyD*0 z4?X-U$$wLZfg{#c^U8cWLhv3SsStLg@}+_`XuCjih9MDglZpm5Sb0)ks_3VR_+M`L zsp8%3y111scKO``CbXyQ4GfQVw|_a3FlZHppdM}KG1>*FMkO4i5Bq2Nb~<@xAOJhU zEL!Ji6sa^J=hiq~JbRbXRju55qbes@Yd!GMi%~Z2cXMm19HTuVIPPaDRf>!1bg;5b zbmE7rK4s%Tx`9>}{$_sxlc2nY_6Q2E+p}{~R3c6<*ho9!ly=K|8ADj99*d)rgO}dL zsH~@w5~hjL$^5OjsPG0Ac@}Ows~SV58~N(l>8+#}7Faaih1ruYp9c+}Md?y;Y48tcSYyD3%6R1&jv#CA$oUrKv#^7r}%E>kQUbW5(F%(DEG8Fg4sDJi6*#(1A3F+_-3y!v6C1slT zWKs3VIewAf-J^Ruz%Zx9$Pj2=O(-BK6prj5rP{8E{A4%+kTyt+jEfmwE-YrUr4$Ow zRu7O;AOqA$0P1=7VT{QkU_6Op@I9izyLCBksbCwL0c7;c%^8du%Ve>I=EO2}2z%-z z58i{NoIjgpM{h7SH}U{(Xtf$D(|iYKshj4}bTGd-@vt6whaoP?8gj2FlHKGM5VxFx z?7@I>hSFWLH}^^!O=V&B3d7zFlZrGe(sf>*Lsi!C6lxG#SEAp@6ndcJyeD}$yy%Ix z#G}eRAp2zw3(QJ5)gmPAIR+S&%4Xd$f7JEN^BDTo)YuHEGHgnP;&j?QB=8nJe`#=| zBE$5)+M<^#>8Wy3{(;BNe9aet2VjU)ZUESVX3+%+zJA8^xoeYIrB^87F)ax%dU#4w z#S0s-9{XW`Q<-sq@e~d(X_I)XX}l}3^Ky<4tz~E)!|uIXyVwEr0v6-for=Z^{T5Rk zHWKm6NhuWs3%!VJEukXXLDRL4o@KvM`5Zn;D#goQdcvyO3bej5=Q|BNQ?#53Iquv{ zA`Z1o( zT9%>mP|8yQV*g*8TmaR~ccHI`SiaPrk=}UE>Go zzwyEYbqz|TN3GcJ{Eb1v0a%In55bczt6L^Ta;^bX`HHt5*Gnh>FAV#o$DbZe+_l0Q z15GM=1#%kw8RY6Fal8K==zBWk-A)9|M_ND9BVq#3^Mn5edd3FhZ=Czy!66xl7Q-;a ztl@-6O`ZVauYl4r+gK(hKGVt(1Boh+@k`a)Uc8=Hgx$r@!aOEyX42iy$dOlv@V@k; z>8!fy8B*5j#6862`EOE`#U#NCpq=N@<2p z!v35{^l1(bf9+dh`2-wSasdx%UbH84-zdNL`ucE!<6S4n_A(}q35P1w=J~K~M1%^V z)i~8S9c&sjdEU1dQcO(Dx&#v4?ZA~xsH=HW>%WxA&CNl`^*EdV7Uz!!`A-45cT=dyGld}d{c5fasld(Y(HgKkL{Xes||^v-^$ zA6}L9GHou{LXZskt(VmepE7_u#4VKBX5A=D2R5t4r; zEnM==R;llZhK#FhK{)j|00q}YVE$LuyF!ki8wa_R{5gsV(MBC1)^RlHhD1-wSU{z91SWSEHi=J7B(_&|@;RAkQ@!mbTef`a%lO2!#wN;0YKjnji@?i@S_$SA zpi3g{{6Hv`$n=X=n800>&HZ2@gR+nAU-9t4rJ*L_RQh4nRx++`w5-sOc1BphSti zuudIiZm$JkP{06_yN*dfx7C{xAwa*f*#95*D}bBGYF=SR3R`nBJ6;CTgYWQMBQP$>gs_;2Zj+J(mn*+ZpJc+13rn?uRvFa9mSc>Jyd@POxQ zXQP(ZiY^v8d3TlAK7L{lfr&iR>>io!C*(0B;m5062Ur?$`e!QM+`A+xUsBudUXoo* zOGkGcwjY_;P80h=M19gCA--{F)hNFOdWg8-Vmp-mjQgyj;Q!C8A}kPmW0<{fW3`oe zR^PP)8GCcYS=cTqh?@A`lj(wsWzJDf+3a%BzAgt)227bOyf#j6F$XBK*(@WDR|J$h zq&YIjyp*Et6DNE`TxenBHy1pd=0l%eKN5;#p>MW0#Yu~W7>L)}#)Y+!_=`leXRojq zFx6Qde;WnDu^fA){&0T&^$+qBuU|}X#u;e|$Z*M-0!w}W%%O3i#(oXo zAer3t82VEV_<(u=^AXSlSvOXMTVEf4p3b3(NDYzA1?_U7OR?QM^ABh#e^}`&G&rrp zUomr9G>vj(&7tblgp+{r$V1`x$!=ezB4u#L3nGDQ?nQubG__n0V_?WhC~cQZlT_>8 znM_6_9?s`Dy-FI+37WaV?i&)0Kw-Nk!H!Cy4^XL0$ zLkHMhM+6Kh)<5$NfWdqnD3T87=dW^;x;9o)V${bVIW7qxvv$%?cBI|+Pt=wa)V5jJ zW%0w_J#lLn`j$3Z>C>sgb~KAav-f<10+8bovpaC)MGGTlmyEY)R1-I7@{sA%D9+}0 z-iHDidLV;T-B=!|SYa0Fw|^L+zXdG(@zP5l_*R~MAL)LxI8Wmah}G%!lB-G|Kui4o zoF}gl#Sk6>L0pdubZP&3_<*;Fz%Ggefe;9K?sLp~T-SEIGOR+36;gCl$3dTP#x@`Y zK78)yL#77SQW*W5x+3t`EW6Kl_{XmTm=W6>3qXaTL8Vu5r9prD%?kq(0LE=&+IpItJoW$2@z0Qe$NU!+ErvrYu&mB-fO`z&Hr+29fIDh|Xjg9EVAet{GR$|L#HLI%fNDIJMO&ihj4@Ta5v-z+phefSgyU=96`1-_Nfg;X4#&g$HT4iN=7Z5+ z@AjVt@}FPU-#+3C0R!Kify(@k(`*s@AsA2L8S{^^wj0~Ydrs& z*MF=gk)IL^JI%*{Hu?GG@^|`%i*wrM>ob%1`lt|WD&=-_6#6$!Ph*8;gk%Zntl};B zx&PsP&rk#P;OyMCC=!|U{1Dl5s4iQoK5}1<-4H6M~7E2%;e5W9#Ymjf{@22PXwDr-u4=K`fqav+FFz&4wvmE*w94XdR00c-5 z0pclfd9z%^5z~RpY{m%)5Ga|iR2vZsM91=TM*b#jfssByy&reR2MLA07g!t8pIetL z_LZf7Wfr}NfdApt88@a#?-t^5)SXZcA~Y6tF9LY+umHAK! zfSY1`#(h{r@wJnn0tt8Y(Rz^UScp&6} z_uo$o8}dhs3NoWJ{zWe>B?AWkSP?|NWx>F#{;Hpb^p>?dWjVJ$Y7rj^I;v5z5i~Gu zo_U^jJL{YWG`L^34mr{tN^kE|fT=GUOpfVC+=;^+R$XtGkiZdmGAWPwQ+Y0g`7T;j z0RGI??fJ0S7j~7PlUQnVoeNNgQm59vE+%HVGi=!7emsc`Vr(eDNhBu!iuqjuW z+w^dp$L#v|pD0d^eyiV`^xj~ZJ>SlG3d7-Li(^)SQAvi0kZ@VOs3P0*KVw(Ee7`T< zdNCM7r?eTVlDqkNUhxOT9lrwWn{VlW-3SVJzf^t|Q9uHavHP_)?v+oMD!GHhv+idg zlcSZ`y%dfkH@IZ@vzLNT{#ZUu1MmG4UEjffaJo-*fNK?tGJHekIZp-*|e91 zucp6+|6lbQSq~9N?^B|V3`d!jeFt&-ql@D*NBPIb+T(uTYDqV(6aY*S3deyj3#8#& z!vJ`;Qdt2SmB?Tyn7Oqg0U7$8Z*g=`BS#|yM`mztb8F|k(t{J7?hhs4(8+G#348Uv zPh_#mdAdDaj2rh#Em`QQ07b9iDEDKDX!8`u+c~4htX?_WnI@)L3c@4x!BLB zdB_Mdj)0l?5Yj7|SdI+g90a^L=oK8_U%n6G$KTkuNPwzs}oNah_j+o8s+5R2G+i z;BA9g$*14z;p+KoDNbl0P9cne=KObG{VzBFwxnPY7Y$rB!QKKmDhiMc{KqC?hX9I3rRzGjvGIq^rr<=0KXVqJ; zvo?oYI5{sXm~M{G%XQ!z9|)QA?Y1$h%;q0bm&WBzPgv!BA#@DOQ#WwV1mX^f)=LDo zKQpI?iK)f?vD3G0gDImVhSIFbGh>_;we|nSsY0aIm2-0{s%ko}tcp^(+&iCZE5)*e#Tw_K0;MCIT zx*qxxz*~_gUT7+*odU8%yj}MVz2LDkg7(p(Z?<>JjaCneQ1^5|#q&HiqrdSAq`05v zj%{-h8Qv#RpymLEcfyx?qBlW^^nq}nQlYyrwk$cRd!M3zaHK3wJ_F_C`AbYu>8=y#+LbA zBs^K=s5tN}RmaEsx}HP%!`w*J?eHjY@N*KqiFLuJQfS$=w=OTk*KyKh@|WL7d;r3H zC`^5?%R#Ac>HQxQ>tFt3h~}&AJ~h(kZ4gu}dG%uo*f@tf;BP#-d$j)A71}WFTO*8S ztTrweaRPMo=)8tlz!(m#ZSfz?w+p~A2Us3thRl!DV7B%}R$Tew{`Lu*xgf8f-re12 zt!ckhfay*i_Sl)z2Gjscg?&^fk$xC1+Jm2r9d$-p_3 zZI0B8OVFTZithcbSXA%OaQ!@_WM?w0V$tnV~|76S(wA0aWYMA_viCjCzGU~CfA>*(WFTQvEvk>Q&!I+?vVn?1qG4x z+j9>gJ=4?c@chK{{ZJjoZg>lhq**P>rQ%^0lj6TWX8}N*5SDp)qt$sG7G{Z&eYqWZ z))LKM1N~a+zM=2ZKde+pjRK3u&=e%Ln%+om0h}+NBVUfv83rKa`7GojoQZ9%KCa8* zfVw)6G7=JO1^~eKNiEd!8f$0YC}^Rs;A0!UxT zHwiA0oLL$Aik!2vID-ua`YEw&M(=kk?6{C{5Oa}GP8_IF zPdg(C2Z2!q9HQ@czoAnXdG_Uu0y6pKWWhh?LMgc~aONUR(_exvzsIxG3_fJpP#81ACR@s$JYxq{C+ih(0Uzyo0luC1rm zvTfK4SJTgwX<^#SICJ6`u4QJJ4y`{c4eHc@r+bZgKgA=xkmJ-fKZ2n{-v*|`E`eSC zM3w;cuEp_#2x1DbeM7kgEJm_&UcLR?Q}#Ub+XxWzoxCK@2gLtB1>*l9w7^TjMD;Vf zu1%5oTp$1<#xI4;Qod$5J~FL5ITbEdnB{+*fNCp+$I19nk&N3+YxQ6KPKGB`U$bW?B|66H*{pnC4D+t=~w)zy7avn%OQE*OIU{Pj^`EEPu+~F zd=+TU85;yp_ywZoTLK!$lhX6`UNF`c+Y1=}rw%3!3#{9nN%qT&bDP-pR&xFbog0u@t)sMor@p%qy&pqQWianw2lwHHm{ zCjg5;52$!T{U{rL{dn3A#pVUbtUqtqh~TY3{d&3y+_0hlFK*bNUbxw+sCXdtexE!3 zQ|Ybxr%RyL2lvJkEYLdGEh64$WwSqZ(V)0KL^dqCyBgoUn;Y9)y_!n?<(O>H=;iN) z|Nkg^3$G~SZhutilI{+N96%5Rq+7aS=#nmJY3T;(1_wd9rG{>$8A`fanvure<9p6o z_pWuyNye%D$r`Xk zQ`nGv1QOd9z4vRE`Qp6yj=Vm0o&4(1Gx%pFZ{4>XlC!Ju+7R`>AE$|-;UL|aNEu;Q z$i!*`zwxaxX_j=x<<^7AWZJjsSOR9Cl)xuMn2vUBt$*)ZO(3f{G`!-|zX<1RnN=ep zHfQQ1k307$8^8m-vau>9lo{EFgc>*>_X$tiE3TVE4#?9s2=V&(l#Dxj zoD_N&ao|1q-{l@X&iJ3XQqMEo>#^Wtsyz4s3%#4i z@$1jHSOWnK97gm7EiN#viz1+~LM-q8KkW$i%+c%@CA8Hk;*x|q<%RDmQsn~}Vi$v1 z@2(DBXTNo*)^^s(Lvd@TB+FziSKnY_S{M2^d3{xWp-fhtN&pArv~TUzmhlRZimEV& zM|xn>jV+1OBg|MxZzln$0u37izvim7D2DoIwUMfn0@{JAIm6Wo>6{VSwqflmkU)H? zAOaVNnK$?Xg!^?4?8d}bkXCG(9Mx&>B<{2`cqcf1mx0XIx$PG$13~Vs>I3z~1E&h1 zmC4~{wOk$OKZGzTJA#(b6f@}qGwr)t>vqRBc0WG)1BSX((Ia%<&l^JxraMHDRt%#@ z;#C@BQPZNCblxYkrf9)t?am8Gq6W^j<+rlZOuzdR{a6)=ue+d>(Eu!hg8v-I$Dz-J zLS}$W%N+r_^6pbitwG%D(x%UyITiCynvU9!eP8Q8|Cl~?PQ?E1BNZs-xGK3U()I5} zP>KPzgr62K({esli#$xjkT{8R!jp%T<#?EeinP4dM&jQYd@mNzP0dVw>tzpn+JF1_ zc$02LsfNr#Mzv=L|4@)nfbQqTa~&&sA8t4RV0VB10cU^qBh{V4N%XHgKg-O@W|PtE z0{oD=PATO8YTs{vIcVYcz}8E= zI^ffdVCQKOQ<0s{cgM?>mI9 zmBh>kb;&xS9e^%7nTW@fNVpjvbDB?i-vvz%#`E}Sw_*NA9q&R*Ufb^%0hTAAkS{@>!KOOiYmG6HbXk2jy+IIT!3=~gq8rtF{S zfT<;aRyl`SYf5U(9@}+%Wmblkz1}N#B(^QIz4Xc}wsX?{BsQLOjJ%-Qc!NebRWv0X zf9HvZQ9$E&QU3n`MfpV+2%wwLL??IlCACG_k7RZK(0x{2`4HR7^#TFCzs@BPO;3$w=H{ z9HeSX*d3tRea2NFI3OnA!AD_ZQ#kniw42rUJFmg}`l{o1M|)plTif(~!OFtQ>xuSh zDOLZE_ha>Z7fLo!oRM*q@{q~!UhNmnOLrW^vSM`nE=;Qhf>sMsM8f5 z)Z2G+d}s&AcZ(UYV|H|bM>a7c+p4jL%-oHV`RNjHxu%2{jysUGQLc0anc~FFq=%?u z&<^5Im_fRGFWaJPF%o)AAq57FwoOY7KxpglTjPSD^C`yc#*wGN3O#I~;Ua+YN(0P8{e zL`0T5*{}%A(@`n@Fj9a2Pi7rma4?qa`Kp(c^825e3;~m;R)N~{mfGKi7HOSty2Y+k z2QD@?rPVRbLCYtc4x(aheITz|bY_y`e;F$L9_V^&mb0&>+O3AFdB*`vfGq&_op!52 zLixAmsl!==gG+{_)7EzQOU~JJUV^cQ%(-e-gC5%QjGsJB#h2QSES*$ z5@hpcsP3&b)Rvs2ldcycXqUJ&pitH0X^y1aZHEH8Cl?WhM8cDn^ zTHkOEO6AhLF?xr-+i6lLb#I|x;Drln=}$_?1};8`f=GKq?l;jN33oVRt$KS$SJcRb zGKV`iI&r{gy>+9)>Dur+s_l=jcR#+JZn{IU8+{=a6%dgUJ9 zo@z8FIN^+7)?zfB08X3!^r#c+C=3l8c`A#;nm+ zROUPy-Vn5=yL&pt8X=2bxt<4~_;qZuzr_|i>_06zl=9{J@qc$yzGSYFK)D&qJ=kDQ z*k=qu7I!JhOyu;3+BR+*hPxFPwXJzFh3BFwy?-+7G~`+>u%y~^ z-5WRd-Kr|D@2n*icI@7hBln7k&yv_;QOgK?^z|w+;4l9X;1V>$k2(dPFr07I51*FB z=){O^PYXXY8_Kc=AerYis)ShFI#l7k zmLK$vj$LFU5ic0X()QNpI1AYJ2Sve<;l*N9m^@=}2nxF_W`XZ$f zG(5TW#B!$xiR^EaS+*&d4Gme1lx^DFG$uTy&io=$WP19+hyC2_oH5+?4rN|gqvc&M z^7WLs&BWB@#6aVBW&5+$^KCWyEFlCoL_p+oPFvk| znR683ef)YeE5@76f3H7^ppP1~Z`mmxBKLzrFcbLN&&6*gs`EJ%f@iqYIHbFMj-EK* zx?h4pfo}*v@i{ZB>kr45GxsHd7cCzT3$?i&e!V;ma?XcdHgn_mf2p%*35;y@-@`)O z)MX?Eewcb9Rs##+d7EM=TpKTPU#LkPY=*0NP;!GaP9En2W?7h!b7)9oB7!&W8REiI z{U0>go^>p$Y&tQ-9*?^(1cF%~9JI@1LOVZjBF9=r zG0`Va(gflJfDCnE?$^~1lYbQ;h9R%Hvq+=ViN(FhIPbk$d>1&ic2!vK?mHi~8%&rw z?%e1?5*zlo$c^Y}owWa{Oib!&^AD!KK_7fB@helz@t=`ac5DANhcNGoD}Ta#^_=-k z=D*eeuB&F}mGpF6n{i`$^lqI{voAE8^#-#QVN}|K4TKZQIH_Hq1%abMNDk{v+W;r| z`s68^c!0Ibtm(D&L`i38q*79E&5}Uah+2&(w05g*fDg`81h<6@ zQ(b}ZFr1t@{Ob2%{j+kLy7#y2hwz5PD|i*2IsV_BcG=>f0<|{vJnxF5pW9ERm??JO zZxVZ;c~rWQ*m|_{;q+{#(Qb#IcPBDmqI_+QvkZ{eCl5viK{PLBCBdO0X}`>dM}?ka z%E~7c$N=`zqyb+dU3x-6e!CS(Wx=~(tf-&LnIHIUZ)~$xbJRWHSNc~wQFRxTy~(vI zOCHGwQf$OJBRiXSeV(>n_6G)Fm%GP$RJm6ux~NJzpHCZH((6pKSKoa(_P-l=mfiI} zi}<-gqj{FMy`oY(!hSaOx+tCR%L*{Q^24(8E29t1y?j`c%JknID#+MJe7SgakM0|{ zQ+gjDwCu!4c@grf!>`0k`@8z{g8DyttTB>W7>TZl96bD3Qhzl%+(7p8g=NL$r(@-f z`@hbKE}pW1?8_FIq=!M}vM{`BY$(30@y5lA{FkhFWT2Ec=YY)HunnX2%CJKG2?Xg} z$duk8?zM2gegT4lwPWmYkqkK!Ug^Vi6m{?A)JSYn?%qH&V6N_4U5gPNI5&zDz{`xh zhudq=6o*B&6?mSKU$XBX#KR452E_zTR6D0WSVuhD2!ZY^aMxuH1CF(}6 zCe&E867F{qT8cYCsvO4GM!EUcZt9Au*(w=v8HPB?81U(Zx(o^kwN#nbK`H-1Iq_1)GXmrX7*f6a%VYfpxsz$o~DZGLaO&i*6s6h>CswPU5SzoCl#5Nd&2ONlV3Q{rpS(h~y2CAe zip?E(n*F<}vQ^X4z`;YYuuM|B_1~*o^uMY3EaEcXw~q^&wx<-Xy#4<4OLw_^@t|>8 z$ZqwjW}m~HliH`$>XQa@U`n5hJFM?f6kvLVf@QCVTr{i1p9+e@A9s)6MjkbPCf##H zJXP(*20YM470)1=p7rgvw)p&9W3#{N4MvKpYw-ZuB1_L?ccuJN8~ zla@~yM2srVzYuuotrTu1KvEV>)S|0nSg$^#{5g>+_8DHcJgME^ksd!Y)Vghv)w;8j z$DsoB?QIPgsVTG09E5??jp<>PeZBvqsBYrc>674jJg<>*a=%dbJ_a*t--a-1MV~nm zs8fFZ742*D{`C)C8xK!If#D{BoHsD^Z&|c!4 z|LsXUi0$!pznYryg(sg(34XeiSvE++`tWl}eA4NpsXRQ%f$OVg-lf+UWlW>Bu^>}% zRnsTl(Wt!QkMF-?8u@cUWlDW5r8 zPdjy){+V4GX&@9ohLH{tD*7iahu2H6!$jl(ZwmGq#dVBSc0<4bgY*M#el8cWZ2Jqt zCXI%n5M;FjU}=rUjpTU_%zMUvt&{q!ig1|vN@8~Fi+zhp%FvPF*=minyFb6b;qK__ ztAwnpJVu?8N>Z;!K6!GG-a2K?}5R zcn4g69C+T9hM>we8W1E_i3waFHEP+s3{#{V<_wc2mk_{fv0N{CN0DJw542~%UaVSv zwwY^}ow1oz|H|%Fh$r(&M-XS1Rlq{sv|JmS`_^NLog*ExOUsB{+haxyrnUAt7y!D~ zoTD2JW1V*Xxgo2h zr{28E#SqLjyzn^U5_XS|yIJvZ0{iGo*Av(2gr3Q`;zGT39WjDIteRy&A{uWU5B-R} zMz50nnqfHt!UrL%{57n)9qsEw7+PM7ToRbB1UJl!tf#gok;jy%>b+{$7Fpq*d>k0j z)tom85M@3+R}j9dHOT~Fw*7$ZkL1W|EcaCnT%^LfM{;XczEluuEk>74dP~`&&MRWD zEWL5rOy>^^JNSzHHVdgY+sEHK9+c0fSD$Bo>#iYa zbK9<5v!v5XR7dQiZb0++A?Af=;;^sl`J&f$lRR`uNXSHu?E%{!f|=m$<-=W9yv z-iD`Y=>C;$s^(Yh>5ilRe0R5YfWuzRbH!f>81l{B)N8I^3dQ{7WXa(sdO3uDgD$whOiTJ%o zx!#za8rI}EQ&>g3Sju-tYSE*gGH76cHV{UsT-npwVN%IjWzuG%#(rHAN5c^Km)+uK zYc-U_)A-8Sdb+}pdad4~@Hv!$(8iOD!S<$`qOBi)tObYc%Hb z%p-E#+CS$R?AUWnA6aNKNplN>iC-Z1UrUo?vmCp&36}A6S%6;@ms{hG*09@rI_*AQ2ck~u)l-WGgrZP4 zUXhzLEDCF~egd)ctXEV*IkWl0FSdPWZ8`aCvGFis#EzCF4SuwN`ri^m*>$wVGSb>O18_qzv(VAww@VQWbpzZDWOv(uKic+$q`oVg^N5+KEtNl^4WI2 zy2%0;^7z{DM9asb8+AS`?}zq4-y3x(YZ#F!4mIOIS?xES&hL-HgkiEf2fa ztf?0+^Xfw<9ou5nrVxx-n#Iiu4e2uVr*>HLawJBP<4$%mc7G7E_+Mp=3X{|k<7@m- zUwn1x?~f}2mta)Z4c@Cw0$|{!sB4q?axL*MR59yd^QVuDNblR>Y7vMIO!b+$&WwjE zvX;lDXpp9taRG6V#N#dtohiPEzi|AsO2{jvs{;Mw@|TaEQyBu#Qn6^#iOEKk6g@~ zDqizJxKo<&2eodV-Z$ zdT@I4zgk3Z1oz2NA!)YRWOEUxWkrd%(5;n0OsYqpJ1A#rYbY(RQ4F~K`7mE?TJiuI z83|b4swH-6G-`TkU+MHJHVV;V#=1~5uKO)`C))zluWPJ$JNyXt0*m8mWY_cBpG>4e zGz+d;&44hA^Kd1ZFExUNc-w!U`sB9si)8Rvspc^%D|;`P!@kze3Amp~p(sS`{$${# z|0E88bgYC#ZzuOQJD>qd87*t`<&_2v35%Y$+H#SZEgiL9SwNGhl<8F2(B9yCG9&c; zhN|3psn~0FquBi1RT~KAuMaA^HTTeV7SGsK7PUO)WsVQ{#q0WLBXt=yMro(s_=0`r zQn-Oc7u)^>F^rEr((*+*25EY0+>r{g{i|Vxm!#bMl{oWd`YLniDS1yqe(AmlDn|(G z^u4mt8fdi=91E|}(RtIPV&I)>=W6;?`($VdA6;p?E>*Y7K)5{K$!8B%Eh<%5>k@^U z^S3J=qb2h%dS%wyn-rM^wr=9C_N3x3J10jI#uQQuUM0Rbn*D}TnAj_fyIAR;rI`x0 zBcwl~Jk94G|k2JEATJvk5ZEw3{=_izA}`XyC&x>bxc{M zA}+a88&8$ehtnRK!`c;u-}LV?k59R=B3Ho1AOF4wk**b%9hi@8} zajTSo^Kz=V$iJ*>w`hK~lKAiB?_;S1xIjJ(JRsHFADaCKY>6x+5g_#^g7nsE(=JI& z!u||oh&6V(u4kWFHvlZXS5JN!eGo1a?ZhdmUu+}(55|8+6b1Rmwn0mkj4r41P5bfA zYa$vb%el>+o8A_odGSCV$CeMAH%TGgm6~mx)NyaHm64ou8q|qHNo$`~gEb_cVL)+F zr~y1ireatVZ+J+e4``3ZNg{n1)n#8NQ;fW`m_!PtBgfaj9P{rLPIJ?h(!gNJZaxL0 zTjS$}Fj?`B}GW#e|=Sa=p}8X8bqQW&@XR^88PAN`mi^Mpi0{5gx7)x0JG!Q7@{auhl@+p9;9V zdg|P2-(e-i7|dzkTE-r|*!+d$vy#C#w{_D%2h2_~XsI~jT)_FgKCw;!>0wE1mrej8 z+F3V5iA2o_7>X;NpIYP-9#u#x=97M!9Xk*9^Ej{3@5dToj%3*rb}!oztyIUGg%!eB z@s$)32pDHFd3u>iq`v4hsv>_qoeeLnWj1K>kkxm=DAVQ6QsRE83QnA*v(l#=vadA? zKe)~Zp2LbgQ0F~Th5Uh;~ zVdHFw!aeurl$3dmnHnVSp+TWq0pERUOcsXOxicWp zm*v-&q`f&qPtl1@4>0^QrK>csxgx7iay>)G>fD1N%TOdC&SSRED*a5<2!m|R=Sane zInVbheI#;AB1pAtIt*3qO5SUOowfzVleR~_!&J8UHnLcHSs-_ZnkhrT5|8J0JM4AKJ29~D9;ot-Vb~!Z5 zNZiy@3HG3hs>6}7)BdQ6YaeT+qTTjgFocoiP50V~D0WwXq!A8OAYT|ibTE!$`UjR% z_)m3w%B=A3z|m{2eR!VGB{cvi*Oz5-2w9q$pG(6GXNvW$rWE66q) zy7G2UQ3;_eHm1X3l~p{1)!vywECKwF{m?H8;6|UQ6R4O?4{!**cK8|H`tCSZop18g z+Wq)SjF4lX^r!0X$0u42XsPp#X~%0R2;Ru@hgTNxPD8cUntaK-qDJVWcnQ0U-sg?O z#KRKThmk*sjnxGmk)S63pd0DfEjj-GoVyTK0G|1P%Lr(`7{EBqQSN8nHg=)aioOm`CsN z?XM0OlT1caHAu0i)N<5dN*pd{pJsU>pJFje(sSikcX!M;Y)E6IN}tuCQTJnPg{>d< zmjxA(;|D69MLn7=&tH-eROVWZJtTiuMLV*_PpVvM34eS2AQfZqs-?qqmava7SI38d zlX#`pC&!#d#+2RU1uIn5{_I^1oeVbqT=#*+UKC*r?adLsPPL9{dZbl3!|uCOR_OQ4 zw*bo5Cq>7&Kk{JFY5+FGj`aB2pWK;ggc=Fj2lyTBlO=tb_ zX2_>yq1>`S>Sm|uiNj}G^{~@Yi>C7bk(de{ZdG_iH`;)%377Wq}`VaiV0UzeTo&Ttm?+?*@x)!WA6*kC!JfWq5iQe|pA+<#{3kOQJ z5t_j0tJUSo<_#B{;iRlxk03fTu2|sJVp8U+?$}3KYL*k5gk#rL@z0$3lqh ztKn(jciRK35Y(~N6=NkIrXU1vut=w|$o&4P_Cl@wN2#dc^^30bq544f>Y610bxZvk zRtVJlrt7NfEc_!>CsaHun?gHp;@~km-w-wlw~IQiZT`$){~E{+bGMGUJyoeXac)}Z z2TgCpQMJS<*2yPC{1WX;ED(|1VejJj zn!|b1r&W_OTmPq=I-p`$W=V}kAldDGkUn1eY5!Ri5lceOmo?60!82Lb7?Q9LYJKr^ z=O9TOCokLB33QyKRdE+%B}}3gv{4;XGw+Tvu~*t_M7zER$7Oe%?$nRur|pU~Hta$2r0X8g!I zcRCGu)l_w**k`*8RYW9Po|G^4+9>SCRP~dtcMJz|=cen@)U`21JddCi^VJzCs-H9N z=7vzJ0b>1>wl+$v#YN3B4Y$AVeMy`5sl|LP1{Yq)P2aUV{uxkg{Ev8DkpaM{z|@ZC zB+5yqq-SSS(sv$uE-<$}_MLYZSdGKCbyr<~_n$W|EcR3p;zvt?vAnldRSqAdy$?Ck zzp4?=H~MzNw5aTUP8B=bMUeeX&X2#Xyb6sXw$L=C0l=|${~I`lF(3I~Hy|)WK8XD1 z44j!&_C8roo7*{)esHam*;Zhfd}YXdrN>%cS#%(Nh3>Aw3S~tzsN>@f!~I1k{-D%K zEqW0#&>Rp%i({iPqtzNjBPNx$TE+4eqMvY)3KV~Wp-TWdMX}RmbGbfOa{381vO>qOiY@)D#j{jP+J>rdk zp~fXMu@16b&Ca+2gi%{xU`AH>?pe03V|QCYAWyf`!N(3!oo}#W;+rzx&Fs~7-z=j9 z$iRTtOxRD0pJzYeN@R{b(qtu4@1Ae)4fng%NXy3yq-PidItZh5HEY8D0s!O(km9QJ zjQNZN?>qSAUHv5_uvsG@;}bK+Z+HkDc%jFq9{5A7Fs$~73NM2#d)0&*!3UqFp*Srm2;#ZJTRGgEvK%UtLM-y)J^(yFbJZ`Y&uB@%vpuPb zceEf9IulkH%ypy9Zh)qzh~cXdlD!f4X_uZ>%=YEp7!Bcw8u0L_9M{6zQ=UHZEBnaNv$9fR6BbTS z?1Xf#aDH+6!>hJoJ@(qt2>nBV*s+x7YL#mFV;#!L^$2Mghbp2OD7^o<%k@iUTRw!X zKk|caN_49FjMf@Ekwegx0`r+%fkB}yLF=|CIF50|1PNI*g;P- zX8Y%;MiD|8BVqk28U;AupilX)^hW7`<61+?)Y`-}A#kp!F1e0f9#hs8C-ANT_cUZb zXWn@koB@@mCXER}YGaWE215ag=RGeX4Sh7dVAlIvqV zrd})90#;8}`M)oo4P`1D$vki~KkfMwXiM z&Unph`td!clSqd??Ve(GN_N+x%!xR@)YKepSmFGsaS4~Wzv3fSkSe#xQMPjD#uc-H z$2Jv{%kO=uDGKziZ*&un+oUH402OKOaTADPxlttQOvciPHXjbW@)80wXz8>;*iqkq zDH;C3Qu+UdVuyjoD5G|8>)NZ_$VF6>z*!H$G`b<{`QO#GO|eK2!QIbw$q+rZpm#im zLsI@~Cmm?6zEuv+D`wHh1ma-BZ@Sn5DXy^%ik zVx4nw&JIo*bE=^cRcmZ|y1p-wm~4^kl*waPDrpsczJBAGgSq}VzY;A;&L4zGNF#}0 z)aJT{h{>UW4PMeqa05HKhTa&SQ3xv75>Lqx!nnA^JH_5n!YRXN*_92{ZH&1R8FgtC zvVv5S!|2I*V>@R)73hC28J?20g>@rsuygiv9qEC+h=Po|TtkQTeAHr0D$$5^o}L^- zNepipiDd&u&tWsaS@rx8Td1aZrbg>xqELJHrB0fFzc!Mxg!~@C-w+aFi z=ibhe+uaf&`OJuVkL&I9V}N^>uN$f(23Q)3bs-Gl>Q@zZ4a%S-;vC)T8)luF3$Gtw zN$6)_N7#m*;5CHLghnPzirW|+KZ{)-b}J;@=a59XINKG8em>iHSfft7d9+vHr%Fom z+8QTBLdBHQXjY*>1X<}vZIt6qYNL-Z$7gmG8Gtp|;Ylqv+}E}8Tk2hGH#qSd{rp@T zYGl`Z4Zdv9oluM3G*|K5{L!ObX#~2>ZOs0F;_#<6HWi-Yx7_Tzh9$!qBlRlj{mrjv zI4rkSUD-@R+$dW z)i&?M@)>7(mZQ=&ysONy#X!aay_=@KdxqS*CjiLMpD;bP3}I(3-wouCB);MJtL`}K zm-M7knSXQ_MiHPH(kK>4J~Toc4F@%oAJC zTFG`8ix6&R=Zqmr*q`X~9@_s*&4Bf-<0uNHxDTw7><|vsY4||enmWMTW)&Ns!h6i> zP<$s5&Za042@tF*_~+e{FENfv>MVzvMzNL9_tX@xF$>B|DYdeiZlYR87ZVFaONqg0??&Tz*B8?gvmq`4`n9eQ$6c5uIO zt8Y9nMiPh2SPSh3V+pfK`KZ!VtvP%|Fb_#Ym2;J1^GUg(m&2p0r9IPA4h=Y|mys>k zxo3)cVtxzwhFd=`HQ@^Tg74S+!T@d*Bc;69N3N|#MIogDMt{<9pKs**ABHUc z(?23*mN3a{KDk^1_~nXn5;y{H_Lav=l{|huU6=W9r~BdkTn-fFo&R~Y2zOTGIogg^ zSZ~M|XBwjOPyih4IHanr0biK=xPX)5ZIIGinh5_e1b(SrTPFwuO>fYvhTZT4Eb^tw z;M5MqP{f{%YNYFWLRmLC9O4Q*4_H|Y0HiJg?dpUf-*BPSJ`YXvlZf{rif=>q$VKVO zYwW_Za0@#?KkfA{cKwH;5YCla!K+0$tTJY6;tc=_Sg{3vDRH2l%Vn61)S7ce*t|?v zX!awMpbXm?Nx^R00F*&fYu?Tm3Le<8-#%u9Xl*LEgXk{;gj_TZR{jNmE>Bvetx)3) z5wH=@vV{IZQ0RJU1_~xNJ9KiRGS`O19_cjJG+#>^KL`MjVfl5}F0UbnYZ+H%M4Dz) zsi;uY142PP3b+`w)7&>UWqEkk$wCCZ`gW@{XJTGO-R&u7Nlb{J5)xG0+|7|eS?@3* z))7l}&S^W%KLGvb&(7zrq+{7qK5iW`#;xx~R}qCF>Q{YBU`}S5a?NB{ClkKmld&pO_Br3*?w#> zbmoktvr}*-tlC7{!*fjD0jD~>x4s1m&lvOsCar(X3@XA8|YAeh6r!Y>4d9Dz7r#>fv;pW?1Lu1w}RY66TaN z01Yer_1b)>>?iXSb7aqW2pdQ+M;6O)4SoEIS1s}3l~XTk4dV-t?p=|SQZFIUQ-cz; ziek3w;WdPhW5#BMV{Q2i@Ux>hYj}RMKKkZNFc8cYqJg}zD;P|Ddh5hJ>%4D}{B!=Q zR$FHmK{yC+>HO9}#CDUtYA9kXQW`6oq^hsp^OWy&wA{Z4SKF%fx|JGEWe{yY7|&}< zZ8$q}>+&mU(zIp3`!1ehGx|-kPhP1Ypsh(WS8&e4iZgoXp905=QB9|m&@Y=a^3X!9 zA&S^eG+d8kIjlV9?}yHGZYJ~_`DXm(Mro=$)6i?=Q8sW^jnouZ0Rjr*(ES+}3>K}a zY+KMron@iTMBTQ>^j0G!I1Vc`oiKe5G1uPAs%`K-2FUL}biDA|I6F@~26TkT>)7t! zG7Y;IqBQ6n#Nh+X5a)j#Hf(8Nldu`yv4TK&KINP{CYR`JPr<7w%oqTSWA2fO;E_hx zG#WE_jU<;)@DkPjmjJdbgV@k(%#Z~j13>ZU=NfmO8imXn(6%k)vs@g&F?Ai6q|0WW z2hZudq#Rk1rib=J@Qs~}8j+Ih)Y>fz)ai>(cl3r?Ltu8L~t3G|{rbPu<)RGW8^Y#c3 zV)n)yi1*fW8Vz0@EHmr&XwrahrHYVkY^oq=G2+1CreyZ06A4U4uMQbW61!5JyCF41-G zX>eM)=2*^W+HDD@MrR_H4T|#~1X5*w+T@yu^}-N`@<(r+l2&)G^+c=10lmuq9l!%b zjJ$SAQ*BulR212q(Ui|E&;dAHZsXg7P+nl?S?uyqfmpb&CcH&qr;ae2(R3Tn`}lcTAO3*)|0`-Yy3a_gqbtcUzEJCi3G(S#A*2dR z=IAoySlYg(djoe*%%JN40zf+qN{gOmV+Or2I%`sRFyQI4TpU)10+hU8dBZ_-*hO3 zlSxnv$luRZ4MD4hb*mL@Ch}MyMU>0U89Jm9bTUZde=n$ZMw3>&^ffvHgqxgI@x%9> zcMea1Hky3+h-w&g6ZlJqcOxPH_6Y}xU&2pqyMVZ~a*JLko6&q1oTB4L*9M$Krph|W z2P|tmI#HYqG+O-3na3ZXxQLIGbB30&J{L z;l8R$!0(|rV*O*joO6aZ1VaG3IPC|L(z+_8D6z(}QOX?6&P7;0c)b;L=7tY&207|l zWS-fmP(>O0Kk{h^4_^w{r^(Rkv+dA{TONnsvT3JU@b@u*QemHQ@L(kL{jLf(%{FcOS9WTCAw}ou(D!q`QKj z`hG_w&~md7b+3s`R>QYCwsyx1>&Fj$H8v$cU-~ZQJ`Snlj(o2nA;s8W?=tSGubS}# zxD;b0jLRX^C2wfuh+efiRFf;%?5BmSEu5UEn100{L0awle^Y@jrkB{p;$iw+- zo)dmKqwBHi+IzO10bkp_SMMdT?5DUZO?c-8%_7eSU(6EH_LHLjS4e>dy?(RqkqlR$zXntKOq^WVA*kEo7%S*e%qh z4c7UT7@z1~xouX$@3-T%_{=8ES_|HoP#)%YHJH&e*W=gV3+QTyLP`{aAWp7o%|>|0^~N> zCrr|;nfkQaw+n>GmZwARU%gf|wy$%9Rw-v1fd&(Y;B z1`Oi|3XiLiX>2&-mY-0S83=i}8OnL%&y{g{za+T%UH?_!U;X=zR*G*<0fOzvZ>b=j|ma^2NYNmn8<>ZyBw3C5r@}$M<%6zQ&OBP%90HXK1ZP zw6Px7!=lPBTdvpY0KJn}%n+Vd%Yb3n*$nKqsfAxaywWQn>>N77p zvnsq^I8liz!HF6MPO4$+hc{Lu+4?k;OKM_|%TWURu@j~C#W8N(cyYeh-jBA9q`M5~ zuQa$Za5w0^B1);|Nx;3m_T-gMJ^ICI&jX(T+fi|>;Bkzug-U~t23QGiqhx{ZmK9p6 zk5m3YFjP=aAWmKaKBrFvq*j_hcFIb9C?Hr%TT2UkGC;q2Nj!_XUYjdqxk=s}i1vsq z16dO%JXhq(w0Z?>wO-6~i<5`6 zILy~z_vq?Kdtfjm`P}*#i`Z5RjLUNdID%%vPZ1EDU|egX$#lE48>{?r z`M5?o*%sN(V)o(%(Wl+0YhjTgf+n|~`3qn82!NntZCFF$B=3FJaj?sVdqIl?w;PYo zoX1noFIG&`yf-$xHVy97Xn+Ftiumg&1P3YA(=UaLH;uWOp#dF#d+&`haI1=ckZ&HU zb&=bOxQ`N%&-j(Dc+wr7V&?u0$NpP540l@Xl#VHIedcg_01wm0QUMw?%*P-Bp&zp! zg1s9Tu#GIVqEt5^tn55z1*{UlPW4rSNwm7~FwqQ?n8-H3volcO`qqtnEVn_znu;JL z?Q`8-{^Z)vSuCo%{!g0>63!%6e)wE9vRJs0sou( zqnoF*4Dz8w#s6qDID^6pQMI;Nz+^ScOujN?E|DEB>_Lt}_ukx`La@~Om&3|57hwVD z1u&m%uC-RF1)^Am-#kVY&sG9HWGp)U?SHr0W`?JDo_j=f_|$jru|6!RNX$Y2AR^;Y z4V$Mfc8F;H!Mgvb?!Ny2fI?d>ES(Wb!j3^Zb;? z1^E#2kw8`daw?I5wTCwc*7xN@6VC$5 zx*Jl|s$TPOhn`V|jmkFj+uLiZ07s1cq&feUFUk-eY_A2MZJK{Nin?!HCo{58n5X(m zc`2a)B|CU1>X<{)%EHTLxeN^qS_~r&k z2Lcsw!UK#>JKBO6$B#&0;Pj+iUduOm| z)q@B0Pb|gj$&x(bA3re!Tvm$KfJmykly8(1pGmN-qwg229;J)t(W|P$%GvWvI8Sy2 zR?83nIEK6$8Sed3;_r{yCljsdqVu}2aQrqrtq-vMVVSStZTgqAilTe;d{soj&N>t- z7q_{xDkbm+#P&PeIBB?ye=c-ZQ;>vi8XXs-=)rxj36vt77h%#dZnN(DiFC~^(Rn&z zPtO0QoKG$Fja@--#DLz-R(7bC=b%{F7sL_pJpT`6ZyAtRvTch7f)m``oghJiTd?5n z5+Jy{yGtMhmmnYR?(Po3gS)#syhZo!?tS+;=brn1@FRq^s#evkS+i!1F=misIVM4) z1pF9GFiTtb>U;{HZ7d$6s?@CR5-yX+rQL{MG=Q|}pQZO>oki1cC=*4nbtm+dto7*m zzF0K5;tehxEJPdN`7xr_&myFY{s_B++uDp@Dkjvo%HX zSZ%Lady>umv#Cj&Y`f731+>wNa1b~oboGsTXZ8rMGf>lY*ORkT9+MJ$&yy()tPA?e zwkoXXW=-X8ADA)(c$c4zHy>1(!26I_g+hv&`k&KIubQA8m1ZK!R_X=sBw}Nx zpD$ysr^?eF+^e{V)Naie3tM=U(B7+27w(?U>_ND^S>Ah(uF@8Q9;Uzkd2NDWXwN11 zWTwJWt%GC{UX(h_EPn@7h}!CTmX_06vbypIy13R{AuSARH~u6_V8FI9U%;o#`atDe zjC!7F0a}T}Q1Bo^sC40TH%-C0k*4d z;sVkEGM$6jg5Qkwq6AQO;Kv-nVpUf;K7imlfE-z@PcK0VJx!-Wtg||064~c8r}8Db3MB{{_g1JV5yP;Q2js;HS}VRNokw*MYXsm z(-+{ow@X>>##hA&;=SxK@$rSmxhsLntU~tt;Ui3jx$=g zYKC1V=mz&lmlA!6d(6=p2*E?EN zkwpO97d;Cg*(FfWu8$VKd$r_Tsqx~^uw5ivdX*Ki8ZJ`{mRArc12qLO;I%vDJyYd7a&n$oZC)K+H+mQzV7uV?+{%!kq z7k-UcqY^bt$YfqaE%6z+z_C}T+W_hs4eWeN$>V?t1jv@1aJS#(H@;q%b8$NT7HF_g zw?O_&3xEj4`_WZL{k`rIp!BIQhOlJEmIkbX_!v)=`XY+GD|?@wtwP6U+0php|4-Cf z<(>&T(5Ym{)-VK@1Nb3t4+_g86UiQi+)x{$4E0FxyJ`yIuZhtaHS&o)=_&omC1RPh zxRwl#dPgpS+N=BEJOKdO^xM71%ydYj#k6z40Je><+Ek|}jQRH9KG%7NyJX3}GE97p zqj?9+h1hARGp?a6^DhT#G{n6;SjoJLz$>|*G~L@j7iuo=y@J^btL8`Q86|+wLvC&clf{FpX|GSdon9*o;f_G;w^3U-tCvi zWp@KFS*RAdi3g2Gz07{!Z`CAAg=vxxcbb4J)&x&^E9KP5me~Yw=SiC1CM|%ZFM8uW zjlX)!`iKB399Ogp$Bb#b$}*kpwD3fA_UiT%4_x*_Qc^?O*|C=@@upV~zm9p8vC5ts z+*4+qMeG|qh9QJrFJM0jGTWUC5CydkuiOahwx*o9hbC(U?y#oKqO6IAVlbBP2U_K* zODl}8pj@uN4SQ01J>c>=`FS87ICgVmEGr6KJ%=>kJ^zBe@Nyt)pRIEY2X5oghk6Wv zaxl1Gi^L!UL=?0i?^gV|t9ScR=WU(x!i+2?yCtP9?P@Y0Y*Dd?Cdp3A=z{l(o)mXy zp2|PJh?4#<$p8OxC9@O&g5wf4pbEf{2%#(y7NAXYg&*$#q_?{5+Cr%v3uCvxh!J$z zp>*Sng@|_lC}TG0J}vMPcRqe}ZFD*cD(6XNUp(*RGerFyO>D($e@zeQOi5_?p4X|V zVU7?N7bW-LJKeRzLC1SzB*P9ScHB5P-QDd+T{M%?58v6B+$TFzZ*+9RK~PB8Y|~hG zch%tJ`=4&rBcJw$qKVbE@w@8Hxzjg6rw#m|gsq0F-SY!3N@>wWARWM{BT0a2FdFrt zi=Blg*VT6s1|ec=#OTVSMA6g}0f3CdBO)OeDU_C2Fxv8$0^yLv;dq+p?cR};*g6;W z!~4zQc!+2i&!uX0dy|eITULGqA#TKGW)#I7y^#b9AH3=Hz6t8nXBOdiOU2Q(e&*$> zqf+}3&|hGAK{-*FAC^^%#h??5i3L=@%5Baz!9l~+?+g2^CV@Rlj~+-w4}plwoQ%n+ zX$n)Y8bwjt0VgEEL6=E=%pDS2F5Gh5j*H0>4A(IgHf_ELm2>4%f3p2vLjnLq*&76L zln>8~rdosPIZh7lb@qAjHYt|iDi?!XuO@qXwka}OD6d(->1P?V8iiz-Cn`q1j$W82Zpj4L4lYVM+xO}`A6A{Nrr2)3GOtSX3rq!7OX|t9l0kh#Xh~GYnlAGd!e({Lum6kBw$jL1LHbdK+Dj=3d|xZq)z(3^x*0&CK6evxiIq@XnPGuO>!@4oP06rUY$F@ou{72_ux$ zGCvSh$S3jWezWWeTo`zA&{@&y2wRZ+=JYy`RpXb&56%^8_N>1 zg0^)Ule9HPhyy9%g9sepd3}|uzuyZ!-i$U~WhDqj<}gxof)Fz4PdRy85uOXK|CaReT4)^i46t zH0(oc*YAmZ^LZ%}&(Qy~&&$wv}P{e$;(56HJC5u)>_+uYkrAHsv!QMJ`ul z^r9HtZ1}JE?hgn)5bUkeQ2sJAcQ0$Z5`*T!F2h!|b8+Cn;Di3_eqELVQ2ODE8yTe< z`5RRO@rhVTX#6T~cJgiki${f`$9|x|V!o1a!-n|vQ&&xasxRA34%dUQVrgcD-8d!! z{vwgZc&cI4TyP>y-plDuCwIyWo+a}xz1`zV#WsSD{hB~~LgK5Bf#FKckK7;nvOnu& z099Y)k8qU(DO!w$)ZmPJ{%-$IP_Td!#V17LcZpnZLpY!v0`$fgh`pi!dM)>;YpsAPy`lVIBC!E_MyE1hUOuqG z^u9@W&=b8alBBiY-`F$$EP`UAUSeyXN~H(E3X5gt&sDDdOCbtpoSM^{@>B_}{%OVA z;pN#=0-66=al}_P?QhiKp8>V+Da1CRhJfan1ribRh=)WjgN$RhEa33wO$6K2Ec~G3}sV)o>RJye2C!v*ghD;1kv#>A2uHI*+rx`L~120k>} zUEu;pfn+$0eleOKR8?VvUVn|xKNqyGMj$|r%;9!qjeBl>sr#d4()?&ICm@N`ml~_% z@A(jh0Bl4QLU}ai@2?J-fdEtqAgR?bc|DGpv>#7&2i~hMX2(+KVb+r4mXwk5aRM&~ zCs`FP0$E72evjW|{qLIx{H6{Bs7YDAmJ+w6RFx0!Ps4QKf-RT3+_P}zGyn4!z%UcT zfM;TcLCIst4F0j0_F>*>&jdYlv`(Vz{A4je*;jLnCEM?e`*TKK&prR=mjdgr5~BBz zK=y%AvyAxqt2w6D9;Z&fOo<&E5(ApdKlaaK3*2RUu1mLL{PQZ%t0IiNlBJvGYa%ns)FbX>_tpm zQ#t>q<`V^`$Zam?S1vaiv>i?dNg8igL;$~}7t0xqJ=UG^)iy@Hwp+cxW>Dx-p;Jme z_gG8*?=fp<0ea-N-Ie)ovj!suIJ~v*<lu>mGsHZ}iD$POxS zF>1dMWZwHNkD+zHolKFs_NGy7k9^KUJ#no_+k@F%#{3**20_DGo#0E!~K`x%S&Z-4qP zPxaR){ZIcxtN_b%@eYL*ac_eB+mziW<=-qwM0}Uj<1SFf{gHq7_zO4*InXk4=VtN$ z_QwBg*cXNZcoL>(D2e6o1v4J)gBq4AO~7V6FWkqzX8&&k{Xb0be~fG~?CHeCjMndj zf9qi_FsNqXL2v*6b`UK174_ML8&LFbsL%9QGV+S3)~CPi^*_Js?~nOE?Vw!*Fkugh ze;e<1*;ms+!xsBz%Kjg_n1&535kBTiEvCP%9$6XiTC9b&__HZMXt682dYaTyz0pp4 zf3a!RXmi90$UG7Y$ub&6B*yaSX}D2%g3-pepc;PuNhdV4G5q(g@LxI)qV&z0eFo66 zM<9Py#POaNhKVjQq^#l4ZWl@@itv<(N{Ug5Kt)VY0;*Bi2gjXPH}bDJNdtN`#X^Mm zZ*hSD2k^-V!2!H~d}y@9m+fBPYTJ_^;_oN5)b_O4@&)%wjjZ{M{u?d1Lj*CH zfAYp(!THhbH$raQOFC7tpZ}$5?ehPev45Y~ai8|YmJQRFt+(T=Qj4-AeeiPy%B9=K zX&&8wI}so#qDTK`C*6zjPyf?cUuS9$bM+h;Viyfqj*cJsNxYhvY-no+e~r_Bw#wrP z0ZO5ew}-DZlxIQtdoYl%0PoGZUxPE7__uMpbON@0AAsi*4%pCY0lCfXu+DznsdpsL z4dID&Cg7$yE3LF>{->6hd_yQ+-88`OTtm?ed24rasp0NMqelrn6;Slg%7PFAhSXPX zgOv~Mx2p|;<-Gwc0cVqJ?m+6kGHqNH6vlu`#|{q%>0ic}hXPY0cX@lY;cz>z2e|&W zbETLbX$f^yqs$1{4_rr64ScWP>`Nuu9y%k8@vfG(Q2Z}K{eMn4pc+TyyK5z_R70(a zp-k>F^snJ2HUqr4$&|&%tQr0%$GP7~S27(5x-hgucMGBu&hAE<+w#o1yoK7J5<_hF zziiTm%NNk(@NT%JBdE7)KaZ`V8kKR4X)(g-P5YxmdEW%;l1?V(=&0~r=L=AcGr$lq z|JMP0jT9Z8ukS+McY`(LxiCOpG5qcVV_T#BXQ}%l1AQf)!vA6PSeV7?HC+KyB7Gsj zr~v%jX+zP6%4l6A^*M~tUg`~j2w`pi2z3F3d7MCg0H~b2abppQP_{~K5M-e~MMi=M zM3SqfB)?pw5sdc(uI>HS%riFQH{mqP--&Q_&fQRipk4=+hqTbuZRk{?o?( z>6?7GKvBuj-da|$e9;8h6nifVvx(He8d&xw`QH!upuGkTuqDU>1f-wH3kxwq)ErjV zjT}xd8EN5%ENiP>3(QAC){xv)80}w(K=-S?HEs2I69UBF?E)1M;(wZ{{_^-Y9 zf#pGf;KNm>&X_D#sfSg@c=5Cy3Q%K}>)5SkZ}On=+xVw@fA`^E{$H2{{CzDCFP&+m zyXRL{K<$y>FXNU)dW~epYe$##J+o&#B$_-n#}qE5d*d@6kdEDo4T=+OO%#SK|2j&% zu5Kz+AOv=Jj)v4R#xV%8IvTD?4e>qrV@02aw|`4{0ZJ<&(JWus(g3xsymCao0%yTA z2oSW)6a7#yP}cw}Lnd6JktV?29ht zDLNW(x}&jr%v+s$J>7l%zn|{f%+4lt6ZX8xw1&v;<}-$5EkzbpI;tM5P4lr1>R-!W!KxLdwz&pRRDZWh!cd@VoUHVI!&FWO5w7J82XmY55Y%K-c0 z0N5*A#xbQYD3b!o<*b@-O!I8(WoSZ0T~>` zoiV~cXB}As{MHhJK|47+b0pE;0DRo%^|YUXa))m5%KZ8k6bPEp0yQzNAdOn+Sz#I1 z!q0{QvuX^iwtSZPjxr6vXt_)OQXfV6==p$nHv%WGSRVBc66x#+EkEAV^&qc9dN27yBkfJ`zx)F3 zB1KwvXyiK~6uQssFx^SSh_7xv+L4pIrzJ4!bF1bh%W>l~N+MCJe(GyMRc9?$p?5 zmR(gxi|S*lx^_YPGvCqX$uBLxn!j}jxf~Q=@^IEJa6itC#QUf0r3$C9&4S6 zF#2zj^Grw(9snlx?s|?SI=702Tb8i=Li0H0!!wV#SXBCVwD0ZJ;vJ7V3!Utr7{Ok2 z8l~DETUBd$i>-~&w*bs^IKZ^pqsVb*f=Ei~X>r$;;*%grQ*5x`wuxF@+jX{$`ieQ5 zT6Zw=2{T@>Bdo*&BW#~k9!59;NJadnCCOuW16&)Zh@kM9e70A&-U@!pTe|hxG>z7K zgl@vQOuJ3yPBOmkz4O}ez@^4Z8-C&^Hh%zpOsET|f4qQ_0}Fy|nDhKYM^%LO%Ag{!z5a`HjsAAp0}CakrC}r5^|%G$gAX1Jmvd3o&3lr-AxTJ(i!Emr14w% zLDGunp=!tgk_tTRR6jGHEn)X~=*FK#GjX9O>8P^?So!TZud1>UPNzkfKu8)Xi4|t0 zRwE2o-<)SB^9}&Wu08@nh8%hNT4=9M%qP))cFa8>G75Cy^y?GCQyt86u_RXYwh=o zqp%TxM<}Mqx&;*RrPY0U@RTu>jC+R#6_tF2I{=0`)ZUk-*c+KK8;*5`-jm04$+(NQ z&7g(K;59+cD7TWfl&@7V+ZEWcaUMr^IgpnQZ@Y@L*11Bj77pV*-&l+&W0j^byDrlub#3n+sqMfFcjKxrAScsa<{noX}NF({`+b0 z)rta8w&QWMYZk~yoy$pav{ymXrMcKis+Pu|kT}_%GW;qPQ7nA0LU6lQe<_hjxd@c2 z){48?{ECJFRY98y=mhkCE!^L?T&P+}=zYk@b1sM{Xq>pgV;^uXNv|uunwMD~^qg2r zWc_ySgU4+_yhdX68xls&A;_tP!mx}?Ci%dOT{({W$ae8v(zW?VPp=s-nXW|hnK zoHedQ3n=FcP(T(bC!U;lB8!ohXV+TOcp~Aj`i;AHe&!{-+PBBTMw9ztc0un)7K!5P zQBBr*YsQ7nGtZ@_msOj!2Hg=sgCN9HcU1lQ2txOKXS^nxs~5F)_$r#OH{yBx*2~5S&%TMHO1oYK*o8R!U(b8vh+fmAAOMY{ z>*f2sE-u_ma;!>jst^O%_nCaZz&uvGy!m!#Rya&*wP?IIeK?n0qp!AnE24%M&<=&D zKR$Y-iDES9Zm(LZlLgec!7&|b))7KH?LZv^kRSb<GTM7`|iGKj3*O(u#xD38y`q!i_R-cg- z2#hDSiw29>#22b2V*5K|f`$XNI?{*?wkiY1c zyDhKhKoq4lhDZ34h3M?F-6sOIQ=GF*itJvMpv#9|G^}V7`ODC&7}P5ytfFsII41{E zD6q1S8M%?OulG+-?K|xlh4ahdYOOYmvb0HLo-%5kx627HjA}GQc>!KQy;bc~c{nD6 zHp7B&nZ6Q67%hOqf$DLk0WzdSdJ^b`ni$hh6(`~1%5mRrW$YSV!T|+YGn`UMC6ZOv z%-#CWlO_QBP2sY}ape5F1{6zOXys=34Pvvmi=CV9+i<;ocNjGFOJfG%)R^9PRp>>o zgDVM4QZSv}#6W}>JusDUA%G9_h*xLEn6=Q7CDfcybc**u1|Y@dj~Q!kc_}?#Y#j4m z3T|MYqpQ&0a#0^N$tS&~5BO*@Kga^@ zQ|yn8kbt)Tl1A*97!`0)D??_%kDO@|Cl!}3KG+${Bm+)^Dq^M9vN!m%h*fWeoXd4X zNexV&@&6|8U+=XugSI6dAH3|{5Q!Ye2cY)6UDB_$9^-O}5)E(fs=9>6nKV5311fAL z2v1@hyF1wAUVb6Y-WmAsEgN2;$6KaY9U{77_*N%jOwCzb@g8PPt6Zh zu^&Y2$VQHJy|M;ajD|LxiA5EuynWz!yT8l78oX`}6#1nYi%w4MiAj2F(+;y=U;iRf$loM6!;{w}M zMbi*14AedIYS~|4v~%PccP5S^ZtYY(!ulQ`IRIC0cveioc=2Y+yk`g-T+|+%t|OOIro0be(FpG%IT|xK@5u5iK2g3mjE$GZlV8}D zjxa1`X3o%xbKc?(zijrHY87VE(an9OB(S`u&Fxq%!$= zbzIaPxa(&V7t1ELF4V9b($r!0U0)GAxVt^C=j77N>YJxLcgo~0U*-BCs9)v!(Kd}n zwW)`8XDZ&a6%rZEacgyexj_JT-L}y^Q?rUq_B#w)^oNzC*2aNOK-q@D&!YYI=ZR~V zqCf>uqmx}1EQV(~%AszDDwDlkI5DBE(`WVS!-Yz6HIx80L0$afkfMgGTFz9I?@Gc>25q~baAMf6FjV-SvU%BxckVp}Wr_AZr}EklwhU{#pszEXX&bLU zX-6tvY&>)oyzjb#gM8()(cF`vOFwIUFiR<-pa?Z@6M`rXh+MeAIBL7hlm9XXzC<&9 zLG#VPbEhK(;T$GkIaHtD#h$ZiABLbDS6;(Kw~^Mdgs#0y ze&g(`sJg)>2q8BRjy~)?Jz`*oh_t{6FV%qZ{xETz-I}1%kb_*&t-2+8x;gS_Ppg8uqMrcw$emoNW0IS7} z#(jxqMaYL-*&WPMB9As57;vse2(W#8U?-B0ds`vs*uhj*g5GD8H~8@Z+TG)1nU{;Sd)+x;t3E+zSR8h}?}ly&AhZL(i|h?5 z8I)p_Jv5DCS|2w)k6ZCeY39x)7FxalSsUaxt{T0#CoIr`SD68@sK`)VD5|hC-KARZaB-U0zXWLJRsH)IsOgrBem_i@atjF{{YAxz^LSp^Dj)R#}%!wbD$4-7I{o# z>R(S9k4^wM8fx_)agU zI49Pks_|GF8X7mM{0}VDhuFZz6F-bF5YuAt34iS_g5=UguD78kw3>{+^3m7NN6^wG zs6{);ZI~h@=jT00H+wW^ya{Sd(g0|H@$+NYTS-egm9pp)JnrrvYulecKS4!h>{aay z@Z3Dt&uwtC(ob#R3bdKrSnZV9srH0nyR672GPUv;%bra;3j!(?TZK4j>p`UNW|VE0 zveBO2loEL3Qy!-BdZ+!MlB7-NZp{`+4?2P9VRf=N*a>EIy+fq}SPu8Ca)zs}uL41i zCKe+?@(_oBY?jXKY>z!Ppsy~fbqH)=2z`p40O$i{_L1#?4YYD|lmOX|O65g$x~)>8 zE_T%DL7P>g^FdW6XnHb#hrAW7B#q8(QSMMS?TifpmyfcuI77F=O_?v@*Ug4I*a`0K zPqxU!{_qRHHH6`? zUTPCDwo1$C9-{;SplMvl)HcsFx0fkdLM&PB*nPtigMcUdi+4ZUJbj6wzF~A-A$r`6 zV(gz~4IzV(A~MXUuZL3XtR2IX?6pchh&+F$)^4tzK=ST|AIfoman!vUfT^B)mGHy< zpD1`|nS7b(VaXz(!rR67T9UDa22`*jC*e^p^jScuj)%R`rKVVg$KBMs94R0x5mDH< zc`$Kt%Y55k(bgld&fMtq6of4-MFPF8m?N&YX}CP+y~@Z*97u$G2qnqPkq^ZV=oZbT z2J-Y~U=H@4)8&hes#ZGG{e6dK?Y6RS&q@LX3uVL;xQ!7lHWeDVosV+88Fk}_ zCNNMjC)&Y}x9F32;ijitS3Qofha%{o7tx#LZYGVp#bQkWp=N%@p`mBHc$>Fy$U{DC zURs?$){Us3{fHRVBW#K~Rsl^&)_BaZ6z&9*1nduZo8c5gFDP$|Uf}eUK>@H^?ZQsB z1ZrCb3@K4RMOM$_il$2H4*XkygVSruCJN*6q>X#(`0T^)BMnxR8|xXHvlkwhkXQQa z)5Fa^C6t3M3|8OaS^=Sx(D-Xz74ox<5)JT1?V;RQUUN+Q8INM14j&NSXbY65l0fAH z}F(>{H#FwmTg4zj-folK#3Ls%_=9JpigavU|6$v<S$w?hfz%+_WK>(wIBI zYq6W-ye;t6JT%C-2TB!GNd753;|NQV)3?D7R1V7>UvK-Um*qbHo+1#A?fYlduK-o-K1v8Do{lH3qq4^t-i`qy3U7YcZg@>Qg0w7=s}3o zgkIy6V8$gfq{tKZ7W+S3XNPSK1}J&e3(HF-`_X@MPaT-zK)#Q9z+=xy)8^v%akkIy zCD7E<^Hk%|k?Pav>!49^?a75dYy9zQ#i}0blp(;Yla=~`6mbXKo-|CT!lqsUUR2i< zcYm^8&=Z%-t{AcQ#+l)sLOnXeu>2WKXT3N0uk0Ghfv#77#qa zi#XPBZbM0*Ajo#-FQ6Ct9vITz)9HA#5UVRX{&d*;H5xT#l}0tybk+*}Y2{rU&uZ;i zNnF^M1NR*vmjc?F%ZD`<{|Chb=wyw)j+)EI&V=`VsTi5;$0eGQx>+BwSD=S)#cRvh z<snE^)*j@(K}lbET3)l{-Y@K{VnKU6thT-5|TkzbX^?+!V$8FsvjpmlFTb{VAQ`ceLY~?H+ zSvii>R_T#*9iev}_^9&>^f}9i&uMK)(lI^w(MhxBD@k1QmXUk;3SaEFd~bp-QF*7Y z-p=(AK86aFREmiG^xf)xaN$us4a?JU8D1%4_R6P4OfT@hxeKiEA6rGm8+vcQ?pysN zbiU$SP2lkRDINmKrG1~)v|FVo1HU5$qAo>Q^pEL_$apv|D4O08hB}fP9>$7vO;od`DO)1h?$*lo;1efO9c$GT_u$u>478KF+tNsp4yM$TQ^BW8ec9tYCaMp{gSS4`94@nH zwA*=PmXfCng75i;43tRT=b9vOVL5pq={dZZHhg2JvPMO1yrtR9E^b<58ImC&W zBPs!IE92UE9qFO&c@rHhD|=7RIc|z;^sTN}M5BZt+jN=AiNHz{;c<@GO|OuyPD#xP z1|2hmf^cGD7#9REk}$Ut5utq9;t-G(`FLO6ApkjNWkePc?8jrXLT#z?icx1XZwe#@ z@jP69X(1w#M@Mr_yv4suy=ccOl*kH3m?)Ahd7J+Y&Fs9;Lpt3(Pe;~iia~eSWts4! zAyiBGu3?M2Km&A5nK&eKjpj;6a>k(REmo<~%gu=36UmC@Iy8Bo)f3dDuXXE|#S9}1 zaHIA^GWggNoH9~h+1rEZnAZf`a{jv2QERy!+Eq&K_vh*r{Kv>+%NY%-g(iEnqs1!} z$30%3sy$t)44F2eTbOMLc%p4)67Z%b35qTKkp==s@QtyxEPfP94jt{gAQap>bv4h+ zwA(|QCtspWx!Q&t3+12fmY`4!mGAu{1X@L6+`F(|)kDyDv-{J-2Oljdq$EDobPfy_ z!X9xd_5~LkttkZsJk`Op6FdgJZ%uGTuE`KZ9nRqU;4o#+H6Xxtrh9uYAcRjj8x(<^ zHFnTyps3%7!#d{~UWTM@nwLIKgVRfX7kf_A&tr8w!|6@$Er{PKT<_`O(+cX0JA>5{?o=knJ3dR$ z=}9yug^tE^eG8ib7d(JpOEdNj1a)P0QM$s2{!x&Ut_;)7hyIO)fP~+=-Z-AMjZ*9d z-RhuBw(xkK(o4O?w3)U9^;czNSf&94&6jPs`Ql#Yc61}Eu>E#o@3h?+F5; zJ$u9D;&ni3@zdLMLJZc2?_RunMSHrwO>Bqi5fO}3@1T!c9fG+{d?E5DHC#@!7?;x(8S`AFT2nN#i23qt1Y%K- z9;I(MJOuOp0H1#>*Es_s+^q;dCm^%4Yoji_bzGB<`<^I;V;28tbEk@1I z+bU_xzntxH?u@G+)}FuJg`zWD;~qu(_P70+k9ZNnlM z)IP9Zw6N0*58S!wyllBxlv>=jl+|DBTInPjs6{;4 z6G6zHNNBSEu&l?hx;I%;r4!K8cfV2xT_9*rZ7qZEpF5>!^F>5%MrU;qVh9M{||Dq?q0b18ui` zV=e2rD2$sx>V0V4%H?R-+W=FqX5$U7Ped1IGmdT%@aNQ+n#)d-u+odQV;?gpyF{b1 za_Ce{ujC)8X12mv8!3;_RMjl)J zncRsYnd*$$);rl6_&Y_UCa5U?aP1{Fp`g(mRh6*66Qx?N3+i&x>}_ zu=^U7Rm&d-@>Tp?*aN6>p}#L8*{ZpiO3wF4mXJ82KtO<%kq`^Zm(_^FT)~Q>zjvQx z10$EsBkdvyC4B)*OJAWveyDce;1Kq}L7>s!7F!%d9Ny`NA|jaR^DsTK;6W!7-TLL( zBUZjZBDq_#-ZzcaDO;sc7*~xxB%XM(otGYuPh6nkB$y~lZKson=CsKwQ2uksz}wKM3N!IdZgaa-q)%BB;nH=rrzBxGg(<%bl;NsPFxSL@(1H~Lzv&xg! zvqBXd5uxwug8KoUXKU>ISL9#70twU9-e3YrkTWu>~w+H9lSzs|PYcpLkfN)GmXwCZt=Y0d7>tFs#rBXC4@4fxVd=jKc!f5MQ zRVf*LFez(N*cxPIZ~bAug=(s_RW?l+fvC@YRs2f5%s#egdXJ8olAT-Agt0KpbJCzq4 zH{#JN)Pt1Rx$5M4dTRWZ@}{o&0%}WDSoLGqS6)g-TAG@I@h&KZpm#X{=jd zaV-07MiqEJ56>#j=S%J{5l$IQ*E8G)`7ggv8in&og+gZsq;4*G_JWyDa!XFkdoZXm zdW}PqsLfD$RZp&IjLz=Z8D@2w5}?N?39%$_S@_Y#mgrT4KbB50ggi{-pB;QG`_% zehBmD(&1)f7%0*rKe;=!&sqF9hD$}ZEQ20MiocTJg4F>caM9whzmD*77U1vdy@5VS z**VOm#*Ltca}>@$=@2N~D`I+EaKz1q!tXTU5H7HPEyWTFYDB(*J^{a>anx&0@#%*! z%!Z!o3_pnDcE`R4O(-AiT3*&QvA3XQ2uFxtxZ+7p=R?OmoJQRoPWKW0Dx%~4-CW?6 z=l|gPeMrp^J-gg=L+rrewkvG?Cx#$w0NL+zW$VH~`LX?@+;6zMfzZF1sm}RdzEoY& z>kIKrtm66((qfwUa=_i>h9}%l=^5PdIo5=N#HQS@IcwBn5K8;+lHsoxh57Q8I)7mj zmosxBeifsp>pa|mBXHS5+8}_Ry{L~r@jjLJWK5A*m22s)8HD>ntgKp~mIkCj^ReIz zn!(0-w!K9UERgjXlqh!Ll7)E}2db>=T@nOK=w{J_+Oynx z$i*rob$vSj@7vlHeZ0u3x{hWn-HO<8{<&7ZFVQq<7{zX!`r_UtiAV}4N^%vaSYO3r z@8*XtoR^Is-FIAUMT(`VttWQk#ti*?3oYR~{ofh1HIC8< z!dsa!g9VpLRIUo$@Vo^s`#2I1!j2EwIe)X5k2D<=%wixBxEOu0h=4Rd-34HCi()Mw zyxHUE2yP;Wgyr#(Zn}OOr%lY_Eq^;Z_A`eu(#hfycv^b^dr(Ua3>>mCe^;Y371*|u zAuBppQ4Jgvv~>Bf^4|$rBA;lh$$d@!jNZc=!c6`yyl9{GoCZe-A$edx2%T+Qa(Uqc zSUS_uSUBnUi_uux$o}N5Nqtm$Iy%EdCK`vHP-yIaFftPp&(_(~^@IV{tF0-_w1>qGUk)Z#rrgE6 zJ=>F}bJYqnr3kl@d7LiDlqhes-ENv#Rwe^l6nDo_krW$v_^erVf8Hh=c`ygZ9M~Bt zrC7v$w3$^5lX9C0i?aR{0iOsLJ)Zl1zbz!DTdKE(wWLch`o50E4J2)F_e zvBRjw1Hp*;0a*$s1{T9-bVDsm5OtZ3nD+iuvt|>j-t1zYO!{~jWFpThFNvKIk6xdC+8yu9Zmdk&nYe)N=T;Im}kpVyJtBsX4j~TzHFq}Nr6K)j5|LROFls8SfrkyBvd`uPlIhwJQT<=Ev9r zCM6JcKj+nnbq*5b)-V=uje6!XqcWy!td!?^~H`&n|Ro*&d^3~&6Q!Ckmkomud)6ZN8r z#f5j%vVs!@CE0xKvT@5S#C8kLy-_r;Kd=JDmBcjb+M^m8p5@*T(R z*3HEiQ;wFo*~Bmq@s|v592VPTkyN9EnSOKH$T?+N6r?Cv;^z*VrPX`eD!EY5^<$>~ zU}D44n06fLh5P=~U@4ykLn#=_6uDZm*|7{<;`UvN>zsY4EB~2m($k>glbh)es=hU> zaKzIiSg0$-rWD5*YK@Cy+WRJTk8n_;15zdB)R?sYyvf}D)g^XC%=s6v_2v}4cka6I z=?aB-^5|Q>?NPQ!TuAMC^;`fT+%PciQm;6E^KWB{UTu#gkc7VLBoqow3f9Bs}hDO|N)D z_{8dpcPn^?wdu}tV_hbvZHxkC_Fpy`K^|)GAd8 z>iuYH^y7iOL^}uLll&X>$HFPod`fKD-OxsYgPC1j?fSDk%iz-Zrs8k=8>S>8aK0jv z)sGe{2~%1PZhj37QqaE0!a|9j`UphEnVsN8@+FlzoW;%&{Bmty6OOMR$7fcQN^Mgt z0_JIyWc759mvaZwf3tt4|Lv?e#Z1L2=m(iJ#Tq*jR)|z*CfEga&74KH424scnq2SW zs2WqX6w57zJw>g?n;C2;vZyRQU#SN&?~s(d?0!q>Y@!_ht$P9Cp;|BRYdH60523EkchCuWZ_$eM`tdr&-vS?|h%!a$r2v zij0%KDpAc|tj+j`g6h2|vp<(m8m>%CTjWlq2y|k>6M(%YURb@F)qD~5ztsoLB~rst zFwt|BI`#B$+a#_*J+ zaUPzdXQv-OL22%*+8hMIP6aTfm5a_1Z~7z}B;Q3q7Q7oHcd9@<-==2+yWEIQpXvqH?F5)pr%njk6m%kYO zs9O~O*l&%xfi;>|h%s}xl`M?yPBaRUEUq zo{tjlUd*8v-Y=fM3@`3U6Zt({9pZVJKmzuMknS6QeJ)Jw-v}E@%`cr&J<7mIJ|ZFz z(rLpBZjH#&Gpf>f$cSRi7Nhh8vMN`@Ktjgn22yRl+VlyN+s1>nZ4Fh#_Wk+-rNz)f znc}mD>(zSTglhBpJAz-q^L)FCa3Z)d)L}bw?sy;RD9&6%CZKv|wg=rIiqzrdW22*W zlYC?o&3)Q(G90MAZ}w(-aH9lyJvZ&qu6*Y-p=QB_@Ahw4$Dg?G3q|a64|;y6HCJEO z%$9he>>U~CGmv4n6_XMTHc4>w0rxf^IwqBn*kG$3OOf75#FiE#LFa6pWd+eF-)jMD z>Nl(qX8Hfe*;_`{wJhzz!96%6xCIYRaEBnl-6goYySqcsAPaYb1ef3vAh^4`yM2=! z$v*cz@BZ$%zt&i5%r&c}y1M$Qr>YTm$2C?*E&3i&k=){@_hI`k4;KW#5ruuH8T~S_ zMOB9Eb9%1O6g*zkCNut?!z#bL&T(uN`?*DUvF;wyte%`G)Q=XP>w3g>@A-!=PTs=k zwpgZ6uqAs{in8Z*(9#xPJWX_tL($l-R*aYcInpG6qXZ}X4US?<62^(jacD3qCJri$ zQ@H(6JZGiepgXFpNqO{k2zkMN0!EiopvM@9kO>7x%N_;|IbOX!B*^#TSrY?pU`_i@ zB`9#+%4s6DoN-ZThkz9R#l&>Vd{}YQYX6AcS>x{2UUX57E`^)msojp)vM|F0XZDR2?Sro7h}_FkCpQ?$~|5BK2v?3 za0=(<%rc&i=?BTi7$*5_Q5p58r>L`-iXmuUNooHGq+T#f#j@f_rc?*1%FTHP{))6j ziSFtUdPScC94PdH#B~Y>SA`ykMaua~VR1?=h6?8>E*q?C;v?93N^(;O?>OkqP=gEvHKJ!E_{vqdP8 z{a`u6A8USR7MCyX6oCmm$&sv2K#@nyY%Pc;GAiod3>_Dy^>B2CFC?#e_}-<4Vi8oiKA0Y9|NN`_50MlI439? zauy$c;_~fJ3ZHFwtQ)_=P(h$~j;4w)!GFX!yq;j56CsUq)*X@NGnA};ElKC+x8XIPr|P%cE;jSrQ(fnnCr?qZFCybjeasUB|6_!k0(a4I@G~yUfNlVedl_cb2od z`XnYEG`+04Wc`|~zBeFXY0!<^w$xaSN;Z+vYwcYnQ}UhK{#@>oz<^rKc3=LX&Wf=O z(M+90FPfOZ_9e`4aOXPl28-*&)3|jcbtZYX!syq14cF69*iR#@8|Gy6f3hv@PJV_komz zDeBz=C(qtH)-OqTJ>7~7-7T922dRrsj}WFQlsKg_-;>}3%?CxfRM%x=KAoofsGHt0 zidaq#=|IS&IT8&^n9dZ0^eo0aP%6J2|Fw}b9>1Gk(WK2B0( z5`~Q^Ds zu4TyyCXCAHR*uG{SATk)+_r}2-boUMT#W__XlK@Yc+3Ym12npsnQcC1IDN~8zbIIN z@3BaYi%Twd(G5XA9^B@!flX*33Y_zI`u^sePXVH=;)vx)p~XQGp8(=iN|EmXu3rFE z&CaIE%RVn;%UGGI*!>7QiTk-+R)`NTP*n zl?_$As;yQ;WeAGAY8Ydli~v9@4@0y~$P~hkVH)iA`__j!?TDqe!!5J~j%sh7Y^L)| zU+bDRoDjn8;Y^i{=(dExPDjpYPf%An_fnI6ygW?*&bG3}={fTbkoTmn_8RIW_`|tS zYmq#B;sT5ku8?m6lEKE*P+E{A-G;~6K0aiY1i~aA<&Q{R( zw5Bt*vik;@jX~EFIdD0dPGnXoT}-?oT3Q3?7fTI#Qho84n%ebk^&hM%RE3Pgqi+&o zgyrhDpxzSZuGi9ND~Fl3DxDS12(q>Y?BOHkvL_dLYB-j|t;o)vv>QzdW z&Jkcz#tNa}yxmaloKXn*umh&b-Z$Va*-vRb;q&Qh>0>E+t5#`8KBEO$)}d39XJ5q0 zYmx>ZXOSc>y|hp!?}O)@vyu6hawxveO0f@w1yK$NGg25zmQ%!QR9d5ntn#8;vFJHn zvf&p#C8KYBBMS?X_`c!B-`!{r=#k2EDsXB#)3zKomQ@;4&QsL#b`Uxx;`m{*zvC+Xh$6W}A4F+Qc4aIV~yZcPF z^QpD}H2W!Nj~stfAQJufbbPBBg&*a|eQTv$FBQy0w$Ft@uG$L+Zt4_1%Nu$5lqSZp?eCOAzuRWDO98>N?AIKi7 zSu8vW(oMQZqqDBz|xU#8WK4*U#YaYZbs6qWu4$o>iQ&BC!PJ zyN6dd2|NMyvOkL!bZ-yhtF263$0pwstd@cY9ac=j=qhNT=}8+&N2CCg8OuB)Dusgf zDd9>=msOEab|oJR>-}iec6)Zs)#7DisqS{iwgpAl$27jVyR>4AJF>M~{YC~L@?i60 zs#pzudLbV?D)iZkm3Z-^lw_x5-ZX#i9DR!Ohvc5_X@Z(gDNSy>9H6*QPm@% z@$tLHLx&-SEm5UG_kN9KFH8cjCub^XK}ghmP^G1)LZ!YcSi-b$OBoqhHsUvj53o zok#Jwkk2T6-W|RzX{JBRNZTDRX{1dP`dIV~!FlD7^ZJ+CYGa*1%UmqRdJ+WyNj8N< z$P94+K8({Q^SN+xWe`I=C8yDvqWa00{8xwTFU|nk$XkmDIGm^=4Vj(a_-DdK2o%X= z74Xq_0r!uD4>r@qsNIE;SW~lek~IU)hU4JlukjR;n@(XGgKjRG1fo?|lHgQbnXlBW zt0|oZZomXwlorF*^%Bwg9(*vmLAhL@E}z_I5N~t%fmb}=RlvP>^|NEG4Re6?aq8Mx z9RX907tye?L`g@?!5f`fE@1?3AW>B_)EtTcNmUB%G=B2>HHv6@#Bq~sAAyn1`EB`o z;&{gt%GYc&^>pbGO2LfescfC1$qv75Q!|@V(SBMzYiO|ar42kp|Lu}d87pJpB;IZF z8m?$68LvnD&YW`$`BNj6Of@)7NNp#~wS93EX3#yJM8}0Vtv)}P5r`1nHo!2jt*JkT9z-c5;j@`)i@J-uzvgk(5N%`)wk|&%MAsSpNx!AOt3a7a$y_Y;ojZp=8$%*5I~4!`W8(e> z0Q?aG>LY+JV#bRzDKtz~a!&JM9oOYb=vR!#gWH5;iwjWujw|QTy>E?1&Z$e^!T=nd zna)qI0uiuZU?1%3MJB@;YO|#R7@cz z&;oro@anX_ct}LQvSV@Yhw$i~L<@8|QZzMYQS7=0dRa2%{-uFv*$sNBMd&%PPts3- zbY#dxfsvIBX<4^8;AxT8%eAk|MI6gf!%9wLCJC_SuMCIcx+~tGD>OA0=?K=w%LT%5O;qjHd zgD+q3qOU8gPQmr{vV#5mUeXVl8Rb+S!%3F~8QjeB_qV+iO*vwbcQ^ z<(sZmKfmn#Q=eH6Nsn9(5P%pZwe$%1gpcCSN3I5!+X93@p$p}tlo0m# zS^Q^1K`vOUDFN39*B`8=4C;V*K#pJ_y!>u)?d6k?wicYkH>)G%!vf!J)`dlV#E5>c zH*=7XA+oK6GlSK~6w06-0BkIsSbiRxcF0(0c#uZe2)SBxGiO`13g9qUxgS1k{eZxF zpQ@XS$&CEn6-Xj^JLxbI#f$2hllG2GZo&hrsVH;p>EX=e$1-^duA(#OP*)G9=YB-|AqT zu&h=uozHgH(Hat+uK^K1y3LhX90miA2-ZOl&F^rZ8%t-K6)#uMn}><<0=HS?M;tTG zmeYnsBv6K3+q>lYYUxz^EMMbOHVbXOfh12(i>r=`IEkLU?zxt-Tu4Z{=l~@-@P%A^ zHLW)InislF4qS9xgmTV>Qo5~eP~ENeb}BZTpnARsI8;%&2M}N{xZb``Z;#c;M=xYV zV??tnQWUE8dd8`qB~4j+mmvE)EP^3MVAsmv^i+?(lcTs;&nLF}HJ$?}QOad=oK|HK9LP!Kij$;|kT|Tzm-Jc)4@-M4&goR%TuciROrYHy z7FKS;{5_hW=Nf4kC`8v_)J7b1nz*gFc|$J8AwwBowAHmZ<-GK(i+A|=YX2j~VzXuN z9s8j|A?(L42-o7fmR8?}U4ma^>Q}Oa3XR3l)Y3uvE2<3kaf#wMu)V!;=I0wdMn0zj zIi4VvIUv5_{jbar}E8Tzhm{D*>-x}_0D5~PNO9wgS|9w zpR?r?rjYz$;NoEA%O%utEEsGvSp@cH6I4L3B&(6RfYIBQr?ti*&}l#HBs3>@ zKlCkgego$FRcLUReo1O!Iqd}>E#)y)y{`C2#QBU*RRnk8ESqQy~f6KbB!V*S}q;@9<AINcJ8NnT=l_* zRgCcIFx>pflsOoBFRU|ZSn6?cX?xJcs%nj}+{OEs06ONqk0-DJ?``Ako%CN_f(bv_ z>}@4Xk$L#)20V3Jp(kR)(31PiQp|Di-A$iwKmQUYC!b~Nj}EnI7K!4J`zma46!BobfwzktT|H!YN3*R0e56Az_VWkk9mHX+ zRUYqefLQyN_d49gGY2Hl5qW`lW)`A+U8;2)a0-Z# z6oXHr)W2!IJ-BALIH-^ETr%;kA7g4B>umqJ@+lNpH%F+bM;|__3FH z5Dx~#dtD2Jyog6Lo2v)v-n{A!O`tUM%CXzKmqh$r`>V67o6H4@H0<+(MwypB&ruy; zK?C>sVsIup5O$RwX#;!+vW;nBe)1J5md|yO-SjAuKC5Z3uxP%m;-6&D=(ovcI^STu zLMCm_f(|>sJ>T3U!S`mAzBf4DR@{r42giEFZrEOj7?GmqBFayQVICet$$8wZG9j3| z+bAKe{UM9)?gYJ61ay;+hG4B@=iPM&A9L0m@H+yHN+(zI@u{gu1a-O2FyUrt^|I#f zo^?2|<{bMsE+;U8auMiiENF3s8frg^&7>=#KVc6TP{T@g z_TE4@5g`hm((>8^!*=<+2t8*Fel-&H_R>v`@V&If)=)FX{aX2|J zo>q!yt&$hY)GNN-op=k1rl8a1gM87|P~XyNH;Wk_m6uQq9T09x)qRWarM|Yg+@C|P z=m(c9tl5q>d=y2(6@H)A(;x_281kM7U@caycRm401d|d>L|K)%!yF2U8mg>dI8jQ4 zaG()5>QZuxDK5zwJWh`QGd7Fza0ikw0MPTzd+lozDvHUNH`BY#_^ z{6%cv7d$-#1naFgI(WBE|6RbxnUslG`)BYgZKim5xry`($hTfKd+TAC4RZ0v{5XC% zNIy+Mv6Jg3&Ax+2ReMkMSz_b3bruB$A0sD6m^NygKCOF58E@68xLdF9FD zM+(%!gp)D+0GCv0Yg8>^;z&$k5|Lnn^Um*hcNf_z0foK+6~j9Uqh|r(?!Jk(*a}Gf zsd(7YifamQyAV~lUswPw&nluFP(`V@*m#Ls%GkZ}kcvrvkE#+oT_Xliz6iFr8GFcF zc!TxHIetpRGinV^m#JwrSq^=rDWF?YJcela41l$}U;o%!m<2enUeZusQS7jnd$%ai5X9oZ@c%9nWEfTS<=avOPj< zd%0^%Om)8;6PtpM>ix%fycaRw>))8v5I0jIB zzm&Y2VHYKUsOjD{p4+5?Z8%u#O|*yEt6KS^RVn6sh$c|sTNow+&HQsecsdBWg>|W?Xi3#)?{$q=Z%B5&>RpP^8wIpwql!aAdQo?QEjnCn4wEzmpH zX}SYteFTe=cyA0o*O?D%t&QxVu0pkL`BBlwK+ z(P=cy-9i6qQE=bOf8t6JR}|o$V9l<2o2iHQ3Mgr;+uP2yvo3Qrrb@&!#=G=AQv1g4 z?x&g*S$8$G5uMj0*q%(iu-wMF$fubMZX?LWoYsa_bpfrc^kM49lh1ms=$SmuQPLUQ zkrs2Wy`Ebpx85MXWTHiZ78*R4bWwD#+~2^wmc7PEkYvnvGwV{_S2NVPX&<5H@=ZYg z9A_Z~5N)LgCr{pMLpNYkS4xs}xZoxWC}Dgzc(QoZ?lSy%hOqFO@V0-zP1AGav-6oM zhFqJI6b+qd)IkD=0(pxyuR?kcirB?qMVnk=Ba)+=6ViKOIi%o+&{u$09{s8YrApTe zEcX)%_cwO1WsMU&Zs(_F@@D-gu&cF&U9V-t1`}G6<@;M~H`{%Iyc_Q0?j#Ng_qb4N zFQ{Gtz90J56rb~yRuUs)*U3#$ArF|~7Bk4_JiRg*dN=4>8vQ;-eBIgR>DDypIKDG_ zhV^^DmGUdIlYtli;ipMUAKJaD*h}oy;-jIRw=h(u!4>-p;>sq=E<9T0DuKSxT`lnS z`6jas$PYR;ZadCVT5b^#sm9D+a(1X&i%RE{pm^pLc~`Y8Y$~5Wx{6Jwm6gG@wpAXS zgfHmIbaU4foGh>RP$XP%Ap!=;0iEK{P>c=6 zP|))83F)NenGYR&x&D{;UcT}r$lLj4t}0YETDEMF>;55qSTWDt+x`U08HAg{3f`3O zz9ZeB!M=Q%R!FYjC}hU5@HN#Jy(TbtAYqQtK9iuK$KK4P6d{a60P* zx|0=REJ$k>!`2apkDm|kF4o3#1;;P2NQ#|)h89Qgw2yh$+* zd@n{Y?W=OGAtK-uDvyk@_7S7I3yb_`mb~9NPCohLVR4*SVhsMF_Im)u9Zi?bPjd+D z+nQ*8XGJYBh&_U^!zE=GslfZXy2O_0$FIn)I26E}oR>WalBYn7f6rh~7=YHq`SvIp zM)5hi-}S@BrU&f)d<%l32klWOK>@;bl2Vgke=rrHs8$u8vKvrgMX)~|OfbHf&JBZAq zM=PiK5R>@*@P;4No?Y0LNp^2FnLp6?#4Fy8c<>92%In&gO{}HbgejC)XbI9frLe0! z22;&}7fXrXe(^Y(6+t;Zg&#?dkqvkliFt#Y9v0}gnIx@9s*27!fhaqExL5r~j<+wZxv_80;9Kdiny`gcZULf-mJ?JRrwhS>Cq34eY9gX(w~0cvWMme!~q zPb5Ed^0jPb#7l{Keq&~eJdV<3g^``pw^sreUd7(lEpJvI2)B37JpnKg8%uR0rtV9d zFfgM%YL^upria3cm!A%*&aaoTC;Y@{l`nYKV-O)b1fkBGHbS`HAiOKqQS%6um)#!A zJCYS{7z|6e^5t9(ROSnHQ7FQ_uY_kk{D7a*g8D(QZgo_AqO)M?AE<1vy|jwNB8xd_a3$epycncQdxnIFsGl3}Bp z^=|)k-OCa~(iJm6mV5uLeS#kE{?IXgESiYiR_~6FYRo^{FJJYfJrJ^o*p+ z3EtL~IU$=!7}WsGTNLU(i$dITsdAdT;ag^krbc%dxoXK;&U79FCZrJmQjE}_S5M2- zCj-!8HI`gX=eP)(X1zdvA(OUmG+bf`S6s z9OQ!{(lSLtJVAj6q6~vja~PgqMn4lVBVT1nU=oyD5a7s`&QG=KWIToG4qWRFGc)uf z<$KIsY!-Tq&?1K+4fCsn?I7eWU4a;M$z$>jeIJvvB4ImIXsh0hc8SZGRVOcYipup3 zd4J5^CzWBLxbE26h5qtrD%5WKXI|guwy~i1^Clbi@eX*;j17yP=9P zrZUCRf<&Tg+^?w|hZ@GoS6FI91TlC@$c>MS)ziX%waJ=68m;2=B>}X)Ea^L&5-jyR zsLSpy$OP_Lz`wVFit5KZ_g@GY?S!LimVy|CN1wHjhR-+g*W|F57s}IA*$C>uLVZh? zp8*l1KE2$-YG$Y6S&4QI4K51_fLSn}celKE`xR{v)Pb!<+J}2yVH9Eka4p$68RKM< z^^P4p`sy-yXvXx&#Z;Sn!hTyY`Slyj0lm3 zHA)dxB79C*-}pXWM35aIzyn_{C1*U&kc}W8iz|SGekZ%4%hs5VeTh3!(Bzh(vYJ)s zbvP2E8#oJxoQ_3?B>6q<(6=9XVO&-+a)iIpWG)}y^Y#*qXZC5UDoImGN)BtHCi~0n zRb!-=h|pI=GDhz0HD+=P&PaE^O(?xG^JM|fQ1o3|Rqd`633GDd;Bzp9LUx(2m(7G= zuTF``FL%xYa6WCUZIrid&Gd_Vj{FRP27=|v zhzMV>Z1b58H3oH*1HOY!4dG~b0m4J!@f-5nak6lx+i^tZagYa!1a6Xfg}1F;cARkR zhY4rg+{lrs=B6ci9s5uFELee!M!UtQ%ln!}0NjG2_+>Vx?K(^EOX}<3v^F9+LGkx8 zNA3H3Z*Get)E~}HGg=xc3*50b&P6#L&-dGYuBXleJA~K*{)9{BAlvv{-J!5t7Yr%2 zo;*JESQOwt2#;Gy=-qWjU+*|rd8^hA5fCB(r-J}^AhEUD;WT^c{Higak#P8YAXN2N z&NIq>gC4a?&T{uX;ZlQ7(>VAmg;7RT&##JT{&~n)*Z`TqkeM<3+W#?iB(Jyeq9%dZ ze^UStD^@q69U8N1v!Y_E3zq!E7OxyV#&X^LdpqWhZf#|p(gX(|?5gZ!&pECUU23Fo z=zj89=_?Ti4;4M3S)!ia%zl6NcYFgBbWfh(e&ZGsm(yds}SNUqnq3$RlIFWAkYmbF@1Wne`gIL;^sDO`G zg=s-K@r5TmpE*m!YEbkP%-Gx-@bfnJJ&=d#i7r>Q?gdy!2U{)0~eN zwBN6lV#;E;BecJP(Z_E}88`)UMBxhQTP>whd3%pJMc%fBog90Z>aMgk>J z;gG$a{hz)Vw-T;#M2lou5}0h=;kBQ`t-t0jv6c^~Ww0JAJ@q7Z&u<40aZjtA3P-Zx zrj6OyZW({O?hZ#^-f@mKvKUZlYQJTwd@_%Q*H9;n@ zB0XsvFJZAa9`&8^VDu+O-BNWgP-fqHP4N^h!aNd2%IAkZJuqsN<;Sdv>Iu)1JGk|PQiMlF`!O!F7>}^o|7VrA;{J`3;@waxoMRz zWn}dZ2u4nR24uo=349J4s%89Ly?*!VF#(;m(G$5WHulVtcSe0N+EjFh4PgisBtBJTQ z6i4l%{dOe}pju*0I9JTjA|kp2(dVT?F+4a4eKWz7gqai*2%Ga38+)rH~fE zY$q=7ptgT9k|zygqLz&UCw`kNPJxC}Q2qRQ4aEv^lzyw_NZq}r;3}IRvYS`399tIt zS2pz%5g}GkI)}Y9RrD6J4gEo0JY>UVvK?F+{jp=C4qTm;EY^F)N}tUAZCykDK!^dQ zuzUV#YN+zMuPS>Y0@^2jt%0g7r8PMg|QFuK0clVMGUmIJ6T8!%PP$>8j!9s~J z{5e-fGoyBM>p!kCu~Dhk7?c2MLG1%%KA#B#WK`GBWOj54!@l%+C)FaKQ6dV<9$MenbB_1ng&<#F@73c(8$lK7aFC#ZCUth->MHkfpN&LrtbT`&g|t0beTI z#-m;Q#n*r|R#_DhT6^4*huiH;x44_cP1^w4=6IG;our_`ZYEjL&KVfGQUR>md25N? z6DroH<(f-R8u;69y2Mg@ijZ*_KY^s`H?X!NQYq3z!YPn>K-SuXs;?Lvz!hJ6>f$2P zoJfN%%}(Z!i}hP_+vZ`S$QyDXDs8!&!>!p#RC#0&!a=EOEIEI#u=kodyw(zpF#GI+ zfBd7eCOa;91A8_cw`{TIX^)1RZ)hm%T|J!)cYZU?My;l3=i`T^NvU-xaA~rdCI5^m zRsA>u0~rc`JK_ZO)#4>9qP8DAcQ27$QITds%Vo?{U;T8{fV~{P$I@k;Gwr0_OI{}~ z+Gb?k(qLn>9=C(Nx%ZyAtM!=-Sl!iFBkebRF|h;`Shpw5L8%7p>qZI!3uF?#Al@GX z?W&L)LbM+p_dESJk=b4&)SM7ryOwKmbP{j{x^vSy+=$2GBVbbUzhyRpWpkg|9YtQd z$2+3oCag9-fBt~s04xC9CLKpun1R?37J2QLu*Q0HGm(gpCEZL|)Ap%h+fG*(cl%>H)FY^VGOV^i_0t}g9oTyKZ#`^bhv2@Fk&h4!aN7Uu_x#ZlF$~ z!?oZkl^mK2Om~e0TFFNj(>V@eyp0`%66L{Q}4;$IjACeEC`Vo&MZ_l(#_AROL zIZ;J!HGNn^KH6~Ul=dN^#uo8^*}RSf^aD<Bpkt83`3zD|b7N zFhfjUmEmCV@}NTThvy2!-rlD3Z#rIb?Dyq~0Yp=x^UjYdE`7Gm(XU#~1x`^n#+i;eNlU3Ef@%7S5*H^c7=Gk zupD}7I5zzr^1kYi%=J|B1V5wUN(#b;W`%;0!q76E3#(PZz#0U%sPJR#Ju0BE{A9nC z;?eS5>CAv!Q5H?zmv*KhliN|9 z=BJ-(`a63gEo@1fFgT#c*MQy62aYt$((*ztS<+bGZI50-bXv`&J>e;n^&E~fi2#Fq z00#Esn@yGnTsVP*b8-y1gu$fcK2+F5N}OBNaw}gg%kd!Iam|xX{G#o`G@PgVs|)Qd7C2Bdrjz=D`rXk)HJ<<+#?|PQ z6sih&g+4tf;C=i=%EF_DFiGQ^-t@TdV65^bW8>7ZPN|q+dL%-Cic+xP{V={) z%+zCfgGnU3dMF?Dx)TRoo644WqE!ti2(SmdiW7=Vw5O2;#i>op!NJ9W`aj#%o)@Y~ z1OXyGP>G**ueH5dN#0GA{GzoJ6Cj!;vN7IFy(8E}Kgw>NaX7qTKOU&~EeFVld=dBi zgA5F^(droUxbBI}CN}$M77L$y%+fSqIM)v;sv3-3gV${N;Wyi<4S6c4oDC(@{f~3K( zBM?#g-@QoXk3bENyl5!Dycy?8Hk zD9pXJt^`@~56v@5(-gxfffCg)eCM>D&Bhg1H9ssL0B~2a$U|)@QRhXsUV*ngIi*ui zH^@wr8Aq8HZpY&n8IJd$x_6(pQ;B2#vrB(I+QEER2_u!4@4OvD#MK2{nKrUl4TH(b z;^V4cO2hnP08n2BpeyoGCq{&nI23$L3uY;&;TQ=i%&OOov`FyOO<-KizyOvEAkP3C zF-pT?#S0*D{1;H)V|+$@eD@lif(3SeSyLbo0rUSD1OPn{syRX39Yar_NMnz^+5dHrswm+1c>P!+($ z=PM9yHP#a{N}|x8XZQt)h=fN2_>~4~P<*O(zR)X={>W^b&=Vb4VTdBdG;p zKRNK2I5rr4aadTY$ym$M#?Qab$bZfcET(U6IW@HzC|esYPWoSycS844RKjXrYzWdf z1eM+42KFnbW2!tA+fm)3Jjt5f(|&|ax6@6ZjKkFf$3Q$yl5)3r3e%>y77|Cs?^S+E zf?^IbX@*IF{O7XA0!LSIE}(yXSansg)nhrWlEoWYpfyC@_wD!E`_D%G`y01kdxU58 zZb|$wK^M1tcSy1AAnUtA^ZsGf%|yw6z8Uyf!GFoK{`x&8^)F*gBETO43eC;VO$DBa zF+e@>t16@nC7&JqBrW-`e*Rm~zXk~Ct(e&W2td2A zU=oO?2t@dYA^g+czgkCW$X2d%2+x~AD^8m|T+XLy+s23EO<{WyDuvu!&0TxB(}V89 zhuY1Zp3*>csl`0dpP@j(11bbU_lkc0ciVy1!SVw`0Tv_n7a9Lm@PGZ$1>>dWV2xg` z`X4DPS}y~>_&qlDe_IBBD~j($yLyGL{x#|^CNBgV5YvMYOZGqJi^A41o&HQIG6ub3*gU-;<#R3bfn^w-u7n;3y6G$ zF7o`yc2Ej9`v0>*|FCR-C)M{E!xw`pq}`S>hJM@IZ9x^EwtI6h$zPsDeg(1nuMG|% z2INN)C(9@N5&vJO>c9R-M)}fuS(iMUKW!2VgJqCo@m}g`7$c|p9-1Ei|MFsXQlj$h zuePzWf8L7%sfh{%0BKmzi2t?K|JOGCFFz6p0eVVcj#3o$r#&u&FY4D8nH%&+{r-#D z{a^HL<>ifb@BS(eg&Y_UBy{?IPb|8+}1S)y?@{5K-m#fc;Pjhw-`coaD`A70{enTP& z#lmkDS**onrlhEUJEZ@M!p2m>dN^;vq*glHbr5txGK(DE(0mUtk{s znUEEV6Z~m7;EZ*pQo8LN5Z_(>taEs%SY|D67~9STsfCYSs+G%3u@CnD-gR_IRzz6k z$}{@1bQKNBJpo!rIv zy1VIf(PNac0*N~ub>hBsFFPE@i|r+9AZ9SJwZFTah|b_X+^@n0F6D7$2l%R~L?cL*e~B0u`2Zv5MKhV(Uv+4`ce{VJ#D8YsA3B1D4X#yp4FW=I(wd1;S>IpwXW%R&8lzD47n6hi zLW;mv7ufqt7enEFfs8mdg2h7Rx6fD?3+D!XQnhE(@TnjFc^G*OTa%_t2O77Ke}XeB zeG2|uf(ei*I(9manuIt4a{qMpKeY9CW5qthI?PUyhJKB`-~CzqVUkDw^Pf(%kH4HS z$A?H0|Ew1A;JTJ!1ZLy=aPAe6H@VWkCnq4Vz2V$@6xf=m6nZWasFemP z&q!?Rg-3NEM;}FbM|*<@3gblt-(Z3Y(c{p_VadE8L5EFfeBgG_|DIfCaO2^pY!Z3d zDcZN`=wgLLF%hUS_oQ#xyqMS>8(P2Os)c}t>&Y%<8wi_cJI3giEU=3b0bA+<@nZaQ z@N=>L{VJlE5R{jb+-_Y(ki!%*mL;Yj{_k|N~M8>8la4oL@Y_*_C779Bo3_byz@IGjAmCXLeH}zb%#r9{!O5)$H(q) zOgPx2SO3sU-x(4gYtl;aTf3g`x>QmqV&JfSkFk(Aa?(FA!GQi|qk;;V>BM;yk6^67 zSJs5H&5M}5ScRn*M{UUjrYP{w21rH%c@hWbCGpfeDiuTq4ch4r$2J|j=W^U%aI%MM zJeuPUEzAQiaeKH%uQ?v9*x83zmX#3s(AaPz<#2DwHqJU*4MX0FRt22e9o9C)r(J{> z9D5JL9=5bU{`&bkcKO*Ry&>0Q$y0+Gd>)-bi@KrIf!!zn6JSt-c>(5q zV#EHhZvSVTy6bcLotsef1ae25Mj&}`x{A~iVHzBt#766A@j6f_!v2?(NSJK4-z@|Q zX+!H_;7SJH**GKT#X2grN0!BmkW4IdYx6v*QH$qAXY03!STmHbO?*9WC#oALVS*psH+Ez$?li1vNDSnPHA>uO zZqcbbN7^1FbP5?m7RU0%KTTs(XAN^z$j3_?Mn}02!cTS|7jGoDndQOP=uTnuvKR2v ze;!yLk$lT6-)(1@UR>76Ak9(u)L9G!uz|~MrshL0M>4%1MJi}D#DPFY-qiaenTu_7 zQ?BG=-P1&0D57a>+LhFUU_#{ax@Aw92D=R#e27=qKxY3w6O&ONf8szA5@mFSxbR8~ zWPk;u06+Oki!0Jf#*?CF@6Fcy@eXkFreYz#*Q3;{W$2D?HcLp~h)&{LGE4Lcasj!K zXWGv16J_-iyY7xqUrSq=Za&!vee8$_|BXI_P(;4kitlCH@wrq7=4mz0(#g{R3Vs3& zY~+_8xy0W8F)KuB+1~Pt9-@dGlF5;Kr>>IUqLaxf zV~VIN6GR5k?m@l4G0(r!q3F#vm8}?J)*EzCK$JNoZGQYaFQ(%(HkJD(ME$3&4}ryK z!bim2kso@`uit!#12X57x9@e==M!j*qbdhsSs}2pG+Q0S>B~c-H*R}UoiEtC$}A%4 z+?;m#kv{-Ynz6tNYD;=-;nBHB^_^~VJeVqKT20W7cPP~~YwNOJPOsYf4_*Bt3U}m} zyKi^CO;OBG^(I8%>foc35KMoVgZN-SrrPo51IOGkg|vKN>UDs_9zdzcxr(l_m71?T zCUUdxH0o&Tib68S$F_NNxuKjioB2tt59H21VvRjsUN1NDzNzTc&R`24NNO0ApvUdU z21t?D+VgGCKY{~{`&LOsA*h|L7u7E!aQwSOFJ50Sq9D*g^YVo8KDfxVGt#I~7PN{W z=6g(QVWT8XKx{mT?Y&QL9+3fn>8t23l&Ng%j=+s-5}a;N6x$GQvc;0<6|@HuIMF@r z?=&_|SF2F>n^QQX$f*->m+cMy20_sQmv?_Lg07h264f za0~8k0h(aJ9fG?CcLD@=_h7*S1b6oYcY<38?h+c;;Mz3M$X$8&zUSNzcaL$-80!ag z_v&Xpb5_-?`ssc!bv$yUtJ^K14&j-IuCx6${E@sQoiD+2){e<2@2PF32`Qa)l7n$O zkCa=?CT%1B#mP95Lpfi5;fGGktektGl;bBrR>N8<%T5rU*Idh{F*;J8Jsq3oK!~o9 zGLpqeN^meJt>G`Qok3vtJtk{w8S7wK{+t2Wd;!k5=9s)O9tQl(t#LqJJs`mMGpAL_ z69iEFmL4c$sY3D>Y}{*8ovWcXgq;MlPq(~2vZdWcR51~(>LeBj(bo~A$rK}YIgGQW zfU#zOv`ci+3qx699y#jszs!b_wOW-V0#5u4ID4jNN_WL zt)I;xPwXV`7nYB0IfZ;ANr~Wml`;nnyl;j$BJ4!z5>Kd1bH@5onfytE4Y07$LgZ2Z zIfu*g;uYBx_hVM{H}5gqudrsliAmb(I-K7qx1CJqnBH=id&Ej(v?4ol8ME+EiqB4^ zE+-JeI-D{QP~z^+kdm83VkZEl9%I=BeqfP#J7JURd3hzX;vT@kw(^ohNHqCx!DIS= z+$m0c`2Vz+2meKPh;AtBAZ@W%J0+)O;lwClD96+#5i&~V{arC+F(v4_M3(vLKa?Pk z2LCB~R!nle>9Y9gx9=j{ysXe36@JZ0aXtS=P{PCOAOqr%=pf~zx#7i};_bL?(|Q9BqJ}I?_v9^SlTAtn47_<%3@R zWgoI^224zDv*@f;FIavBt=g>g*KU%Wjb{kwmrVwRpcDO813+qXT!*6eZjG*T*{_9G zKXi_>wy8*#JA~JaI!X2>Q@QtRx{4VLhvXJ5xj?GFv`~h+$wLTS%f46mzUE$yHjC*j zyW|{y$KjCu6h0h5CFCkfO>KZjt@NL(ogMi57KyMfw(+SsDdw|N66e$O z1Z+eo5j+Jf5pm_e{Obc%GWcSNIE)LA4@zo!Zx*1>m^8UHKIkB97Nc8?t z7-2_2MB2AMk)aHT&`9hq^Hd{;IDxDD>O<3wN5o6mDCNr&qIQ*Mt=R0HhT4Z@nB)iY zh!s{X>pwzbi)jyDP+V8R*FAuOXg#y;U39hF3+>`Icle(Teu3OaMsYx3xNhk9Tws86 z4+xJ8tR8Yxm6~DRHCy8c#M3GIQ^#xCN<^9?hEDsSWBw#>DG-rVI|&eAtmfCG!t$dN zXj_jD#No>lf&s^$O4}iZNX&NeBq1ZOs1Uw^+ZFfF!pPZzv92>a@P8 zm>S?Zydty-m~tEf<{SpF{a>ZQ95cI9WitShT^H&+=8ECjT^%O#wwbQR;Y8f`bJ^+j z%cO(aP7?@&r)N7LA?76|YcQte>#9yuu@)#04We}ydt zs!d?*68F~-hFExcKXvS|Z9<0^CgDdTKnXUeLRn&w(A{Kv3|o;Y$+fhr719!0a$Z;T zUUTix(NhVDUF#c1D|C@Jq>1S_XtgP0Y(Jj6&840N=o62O+`38xY9_Iirc$YLKR|R z^F9axW~4%5vvz@x)FMHB<0e^A=9ECOWwBcHKa4(-gJS#R0}bGK3+j0AT;C^!FU|6 z{3FUUlnq!xxeFPaB@wD79Tsr@%u+v zP|cd(b;qWGV#2n>90Fx#I&N}XS*$pz^@l3yTxb)5-sq}A6+V;)%m5wgXe`HT=pim| z%V&%Y2mQvubdi%gKq^w!y6&s?WB5#qec&`UNj4#0GSdsS@KKJl(OU4Gq)$U|9n$i{pQ&N+{>23pCExo+|A4KHoC? z5isu#a(Q!12{cHm*A}ZD_U+$)O8$4db@_vW$Z^%A{tKYuN2Y%_>n-)H3YS2T@33JO zXQjcImt6W|VdlI(mnt~?!Q=SrX2ze&xpIg*TA=tk+q=bH;b4R2Z^SznW>doRrx|3# zwAAbFCsWIMTAF7GdIcaWpZ|=UhKv+NHuVlNl?Rl@Z14xv#4iOF2f<}0hYcE&H-gm& zj}Hg6JdedQem!pMG4o}56tpkp*Ta98#DnR-Nqi{335*oHhcc606{QRsE>Czie0z#f=?U;~};f1)qG{!gNUsCl{njhl-k0NZmw z0*E~$&hk5nE}uiUSdU1OHmO1BUWAx{Px%6li~F4aw%u$1Hr{~Q=5e01$rLwq`K>NU z4zMzrDh8rp;7bCPUsp)+w{$WBL)#PYJ&tUvLgYs$Vl=R`bAKpqRYC25%Sk zg7Vx%aVkib++_(lX@8*FV7e|O5MI$3vTs24&Y=YBAlmT6tmvUkQw*sxQ4O;|XChEq zzVS1l{G0KBQ1AXW&R*v%er!3#?;A4-kieBydMMqZ)Ys1HEko1$qXl_0K(?M|=$*{X{3 z{x*az#`5>KJ|StIC4PdkMdngwBjW7Es-mx?JEP55I0JFO2+|jo)i*CaA<)W|VQI&d zgiN2fQn)k$ zZ&X5&<1$(Mg>BQ?*4C58o`J8<|4o%;p<6A|`+Pp{XXT66z##jB;0=D6=$|c4(Zg8x z5J6lS&U;a#N~Gdi9!!YsYJnIgrJxQ97}kty!8EH>`=Eu@^FK$sohg3hH4dN5qllWh{N#FYRI_?;<5cVzd>qlH@YTMaoebjN!Yq~J2cDxDLz4%8@R&+0q;la z$<71syz-=Ox!RH7W`Esr@MVkf{$M@2%+}eTKyezi`AXfMUpd%HE&Yp(@f@pVb%HUGX)Nue)DbA8p3{2 z#3tbk#JNh9*eFI?nYRRSk<6pbzGF;Wst~D@7IdqK=3m1{qPsV)(|Ku?Mp7Fag)6eV zC^PO6N6ip-$5w9Vo>om471UVksc+dB>jg^_)N@3e-PFRY?|d9?&7-f2^CS4MrdZ*R zy2mLQO05sPXu((?)LPdJTdf-ZLZBbhs9k5HH;s14j35TZ7<~fRU8AqlwbRG z*R%`eKVvZm%Aqld`y){>spK-&PU)M;VGPb!XNeKc!rrTIlkk1SjakvLyuK`1}yQ4`U?N z_ZpE9D-iy=Ln8Z=nv&9jc(YX1#+P5{wiO#lZx<_yyE=F(4CPvDZv~5ugG~a9zvjKu zKVvpkRsHTw!KgyFN%>VFp?F?wPSqU#Y?pHY|LM#1p99nHw-*dg9iIcA-x7`~W$&vA z2Wt77Rvib3ePkHknT3a2-&k)Zh*KvJ)EYN5p=xU>8{cSFUkvD(9BB%1!#CZJ5r*)s zj<)K7b!wr^GauYcNHPXtYt$%~(`n{HVjB#)3h7{BfuawnO0@5~#Ev~@yXEbfHWIYAYKPWrwqaSz24XB7BI_Yrs5or#42@A*8AuwDR>O=>Uxt$Epk>2v~Qm`P}M<4 ztz_oD@}Cj^>j_YMMV(0y6Vp=g;bp`+4EYl$jstR$Mk2&+DG9FYC(?p#^9m%jxm8pm zEKUM#9y#c*X}zV1bkQql{h6bMBN_ry>?alM6-*60bRc|(A7pjAP3}uh zj%@4+4FTw!Y9R09{kvTwNrCVXm)3WP+gX}~KMp_i$-FU=$@<(^klA>k@KQ*xk`j*R zOaoWdpIV!?c@;E14X4>b6L+)BIH%WQSbx z&ALK@85V$pXZDR8t_G}IZG4W3zbdJb3mVT?_r%@*mf`(p8~63Tx%w1V{rbjlXxX;+ zVbufVFYCg2HEXum3SA`j3*CKfw<7wQk-DLK(-h&kU+2dk>U3%;EIB0eC*aF9qSK`H zW1+8m>a{$wua26hCdWz|cRm{D_xMzLoQl$%Y&k8(7vh1pt4oZgc1WE{jpTyr?swGx z*!~zc39FG+CRKcmq?C=LOzX2YhJz>ep!GqHhN$6{U8ErhUCB2=9Lyy@NN{wg7hd$~ zGnmLF^O5$e-ArM2Lwx6mG=o7=Zh-j->RM2T_liz6=jU#lKj6IA4&J#fb)!$~4cC!o zKc)({ghpfAbNRA7QDf}HW~Uo-7^ypdtn0r6ljgKCSuLNZt&JKuEub794t#-}173=7 zOQUrcT4(D9LhCi$QKe=`t7rBZ?ki)h`#tPPH64rbF}|YfEn_(XI)#7nRSd_zsAQ|~ zNsN`Oo8Fe7Q`jJyG2(ZMn-8tFe9_-*(fs7STngs;zP1>CWWVg>?Cr4jSC3Lk{3KI{ zGITKFc0^;c5?@w96Mj=ZqUiD+FFw!7)t_UZ_41x~>$p}46ygeuYM3|TQu^gULUAsS zBUr(jyH3};(y*hQ5|NeRe_5L0pKN&J95@Z&5+51I1+D*Kx0@i->@>GyDCi-7Gz`bjlg1l`BE1nSYR zwWjI**V>6$_Xv3n@p%Gojrm0nN_y^RLuVUYdS@HiWIgfT)JqoHz|)9fqp?0V{qno~ z;8@4{<~@86{rkd-4ZH9?S~xtK|2!9>Z~>N@pzo`*pu_@F*1-a=Tok*%aKUZngT2-D zLA=iUfaBU7QMn0F5pi({`p5`bcPVv0lIz`Zh8>>4xiW=;bXPpi3aeGeHmv|>5t4A4w>)=n1tk?TD6 z62Lj7cR)!~Y+QmN;Mg~{ct5|OlT<}Uw9SsL%=elYhgIpW4EG-8gWdA~B)}1`;ulJn zF;b=hS2gY1V}8qUqVg8!1+BNbZQw~h8_KX_=zM_ulIKAS+wLI~ncWNfPK5i-*rRl)~&A6Xe0e$zhH2YncjgmC6|h$Aw{qR7x7C zEiRH8hJV|A+iCm^L#wVn4!OAR_m=mu z9K8(c-hxFKFX)e2q{=?TtyTu1YTMiYWbyF)6-5amIQIt=5HYz4_`^ z+U-XDe7WfOP{Dp`p!gJNcO2r?mLJ(Ru16XHa#+0xQ9b)rF211kNbjP)pZ~nZvckMBIU49Z*ZUCp3V*xFg;ulBrb^k-l`-S> z8CXg!{vO!-Yfe>|i#%QFZWdVpP4f@9yXvNXZuWywwbt&~G9*Q4^N37QR|T-xG{pTm zs6o&>&>q=gmC^efso zC|8v&nD7%%88El!-04w0!+Fbkg8^)qe9a8Oh&Y!U%yD%6eefY0%-Kb-|o$7oTTR3aie% zC5J3122})G>fv@CO3tXe1s>9KX+GC*uk)p!m)(~En)DQ`qYB{X%ws6zl%fdeP)C=R=wnUe4^s|Nvp=>^xzSy+3 zI>D5Mew=$ZZP>6}I)DR*eY!De^J+bUDW9t2o|nFLPgR~r+RsbRiq00F(}*$?J8lbO zSSz(u>F>aQ3NP|8?VsffTI!X?cx(y#92A7ha5Wq*9DvZyltQMoTK7%FeAmoTlpsK- z7W}u#-^9_fDq{Z{mqm~&oe1^f`L?EX7cXW#wWCSIfaaoO+O+&R?Ur2V7+;l@|5rVk z-C%Lqn>c4bqZremj`h_*kA$zwe6o37Tyr<>_>f-<@c z!gf|dOHffzR1ZVqf;t#J3EU8mTVpouyH#Z?fj~e~QmtQG*n)mQlriXM(H7x>^X98= zTGCgBn2z(GA86+LUIE?2QHxu6$d{er1YtV1lo7{Lx<$7yLRfo4W^Bmf?`RqVw#buM zta~SL;xF-Hg1X$(dF+?;u@Px85#>nK<>VDX-|=NGh8^QDAol|a;>c*uv@ZSyvb`&| z6|5G7F<(ZfSg69FZ9%UedfmvvyIS^=T_nkcdrFS_RkJCMNt*gUi-e;T4l)33mf^hF z7QNaVy(t;rtx*aGnsIKTmY?1Z#Y1`{uA-MQ)pWQqjB_^=mt6hGL00hmw54i&{W9HE)vNIq7Em#Fv}?F0@kx@Tz>K|1rBPJUO!aBn3|hijT%qMx_aW9AEUk9BIcl06M{2Oq_?t7 z!GV!+3jq&rQ^tD>`eYo87^Sb(_^3SemV}iXG%bvnKh2+hS|f_l>4dRo3b;j`QD;1M zrOA3=!_EHOb4F$eX`aE``*GBbR8=G?K>fA=+i+*=bLqUgq{c1^oH#2+81G;KuqEZu z5Dp?uuAqr>+vvE3y^^eaysvSKA5awdak(#g@NClSdJF447L(2Lk!+IG&_iJj@+O>E z)w={g9C}qkeR{c`U`hw}aH-76Yy^ScGvr6$;$$M{FlyFk$;SvF3A}XlSPBS+*lpW= z)fs#a7w{nf0#UW5Lsmo&d4mYMfd3fj(}OAgy!*kiZ#h6}#djw+8k+L7W_F(NX$@88 z6k2u2y>gyk>fFO}I$wf{IH%jd6cA4_uWPri%lmhp+j?pN|2NM4$d}aUhZBit`qj;A zTv`yLQZk}Xu)nUM8>$TLCWX=W9?Ovw{d~(M=MF2t;~aAPO%uT*Cmm@T1&Ed!)zz7W z1wUNZ-8@(Hcyv}*8)fg2QMO)gGWtS-8*hHzbJv`J1feZ>vXg z4WmT}<|4WI&uoSiFzqWs0&pTc46F1879^C_sGddYmHz9E>$Qvx#;D%RIn z&nW(U-OwM-J+O6G(L)BJ`s-Marv?7~k%m2%re=xPcLR=WgETBU)!K`S4~HSPQ9(Lv zhMRh!*Q3Iv5k=><`saEmAq$EBfQMLftP0MVy~55y;kEdUm7S#kDnY3 zw2>qNhLxNNIh>h>p>i2B>WF7yS_Ly*UB8aqvUYB?M!9dg%B z@5u~7cH%pAAE8xtb8F_84c<9koPrTWEg5!)t4q7T;DP;)YOsO@m(AyikU8L5MdHu<9E=%j&BA~`TuIDxz7iv5GXz_Y$_FUX z(Lm~pn79!n-m-^>W|bFWhFF+Ep?OoI82^rPnEVot6<(4Cg}4+)Fw^V-=l4$aePd4N zM37$0qfYbyPRyFlU}FHIW678gnB6^Zo+xGoO7!sYA39=Li6_|*Jpc0gz!G(2WL3_o zKDV9G-?o*vf*Rj}e=W-X?)Si~5~NbOj>)~Pnt~2I4|kyoj<#4p2o~fF!ban zHS<}XkZ2Fw?6a7&s9zK;=)Hy4epiH1`r>Y!>vKas<3!(9jR8JI9o)UOq$!D%nVf|p zuF8;U+||m(%a2^axwf5tr#i$v5t}@qu7Ol-05iUAnej^VY??2E9P;yuRp?**?d+2N zrln8z_PO#X>Ax1<>b}OCe0hSR2|k_M3aY8dqgh9b;}wD!rwiELXYhQ=FbfS4F34Z; zzCfjPG&JIs)VN9HtnZ~%7LK?}SY*X+2#Sn0^f}mk4!XauR|URI$T?EDawZp&iq|{X zj=n4l!BE%o-^{d!lph-gAm8g<9UVV4g?hJC&uo}cI@WAOP_HHk?~kNL=Tus)Q7LOQ zlb%iF&|+i?6xCuPOLE4?jysTY49@3evHZ|`nPCtr(?ey9hbFW0#21c3xlxL9(Sfi| zJC#6{Rl#wjN<7k%u0D?{;&@zmYe{-toxoRTR?h|8VND_d?>Vee#UkAel)Z#px5L-F zFG4YL?tFCa0tTfLh97cYojaeCDPk4=O-3SDh|U?hL7NUfYj01WxQFq#3&K=p8vvV} z;H!-fvwp^~0?GGp(Cb0{=P!@6x#EA>5mJO7PKXgZUsc^XrLrz}f&OO9SbZ6}C!Jby z#YvP@CbKP2=LsRmk3=L2GO*~ntK`!o0%o-y+yeD^XWss+Z?Dk)>$%H&CC0@}fT@L# z9B6KgB|domp@s^|67mHc6Yj6R5hb!pNB`mSmtxkFRL>vcv02nZ8lNzKUR0twG25GW zjuN=OSrP=T>O8CW4$xu~qJn-(@)`=#4P=gjo4Q`GC&j)N?OH4+nei? ze@59XKSxBt2>ft48}@?!>yo}sz3N?KW16Xf%8I}&_9@f{)AOvw%qkW%zL{vu4)uHE zxh2N9?zpo~N_RlYp?WdSz6b+%KQE;+)Zh)_tu|~+<0we6#(WOx8YMhiJidI4)^#9^ zR-Yg1>O2)%Kd(7(Y`w;@>Sgfg>?3lHz>o1d`lH)nGkD*<{*zOF(;~euD%MQmdhcLZ zpko_1hK%K#O|~OOit4`I5b7e1HHOToH9j4;GM5XA;azf$q=tnt&H-Q|lfBb0A@=f& zfYO9Y>?*r!b>2D@5ZK|JCU?Bp;vH$+dOTiZ20DguZq#!#O&qgN z-xML|4=kxxkRrJ#ck79}m`PKkARcc)8eH?gRaihlIJ?Gq0nZe##IQ;0;*9j;71v8U zu8&Cp0kmvyv*9~0u3isY37w_OQP`LZ(r!sf{_2kTX#7HX5;VStNKN4S&vB^3S-Ut?XfzbBTvybVsj)? zr@d3NhX^N)y4+uFrjahB>^)KuDFiVqX}>@Ea_~8=>lkVcJz+_J0Q;%x6aZ?5e(2YK z=3SK9`WSdp7qX)G)3u`;n23|EuMi6{mY0c?FCBa%5?Y<+W=x>PxG`Vslh=GDrw!Ef z1$m#;QNu3sJ~z(_#}H%U?X)E{x6n6yf` z^w73ldl{|{!1il|l@u!RhMG!6E)*+qs?`ZLuzkdTGOcG?uZVK?5ygCjr>HU*NNPp9 z3+nYIczA_M5JSdgAA6Ek5{elD+gfUFQX3!|lU2 zPrH)@{)_vlbeaSx_kSQ@{95&!5c{+Ax4LUPmSWyZ@cN!+aqH{>`n0xQV{?8_DR?n0 z==21lw^N*lR}yNZK60k*H;)bv8Bpx1G~W&)AzzCjq8Qbe2krZd;e^oJNbtXNjrD(g zt_klyU<&bQN^-Te^1>mM2&QTyw*`kcQ-^Z{U9YD~RJihIb@SB=35l>H+0LyNH>-HG z=5Rw(qu}PzRINM&DTY{PszsqV!k@4o+S>5N>v{cbhI*e=cU#!4u>G8k>Up;N{E|(Z zlvc@G*Yzc+(^4*&86t{YCNLy0k-w)+1ZwNgqmL)a^_lp3w)7rR!b`iNwv5?OUT);e zANK=C+7s;PA)wm<%nr9SndzYEmYg)B&>^28okUcbzO~#MrBemXi_wpGlb)Rljdug- zmWdC}k-7%Xi`gcy&e=b%Gc{l!)~2k$F`8fcEdlQ-sgY)PhmY#-IkCl(_JF&~MH>Ds zd5Q#}L=SbcT4aTixMH+87XF={!M7Z}(e>nNh48yOD5A;G6B=f@nQeCJCo_$gnXE|8 zJd1YxrpFc~X%b)kMQj>a%_KyF3Am|8#hArH%w37ntk>Yu_Pam8hnDo`9C9GFkI4F= z;zY)i)uMoth1LOh~9NK%~)nMo-8S@GuTSi`hm=(UnH3^$*KhCu#xO@>Z$~s zu9Tt~uQq+{mx^rlbkF{CcF|{UWr$5GIG6w-*$Q3hDcNfGBzRP7-pYRN#Fp(%Gc*%o zf)F`U)sFEdg-|}39e7JEGFBYNy=AWp({2&JqR}HOE%?8US`){xQX#!p2|mRneHYL) z`7oBS$V~h9mHySOTl?vvBz$6}{L$iiXr#j3KL;Phq13Yo*!PAM&&;%m7o|Lx3UONc@b0RI>ZH0amh4kjVJ=@R0P@M zJG5S9fx2oifIQY;CeZc5-8H$BFT?w_TAcuJf}{NyOZqtWm9*;#bfeU5BGS_z@p#H6 zVF&FJUB>kcs#Be)vBMASa?J`-Ka7_VHD^#tLb;a z8_?`IhV~M59yr|p!y`Kvt4^T9sg@^Fih?%rzR(!11@fkqfrr~B;ijv@b6zrGJl$xU zg6hZd{ca0L$gbZqlgBEHoml$Esi9c*@4eFcZ^WaH_3j!qgccJsuM2*94R_jh#CF1J zgqtCA*OS6i+~RFm?3zL}qv4P;;$QLdyXfxE+oiM3&{u&06>y$Y<2zA2{n&cgVR!Ue z^2~)5r)fO%?Q56G!>`j7_Yj=Aul$)QDzSjIR18~VwB!0r|dlib5qd~HXaO(v<)h7jDKPj2kdc2;cy zp>ikXv>AxaF{zm&Y1a_`Y3;aQy#;m!+MQvxxKrgk)2uHgsVtvh!fi_ZZGOInLM!C{=XOq=KzGqjJbeSv-z(8ahF zKT707>n;)f?;<#LB4kIoNW|CfsrC=N$NcDsjb87m<`@&8P3-pNu^#_nP7ah&WhUCq z+udNqricDkr@vG_Rw;aZ`P=tYBHR3y(RO-P#CrxEFsg47`dD9s8#92(cZN}GR)tlp z7CwSsC<(Mb!6G-wtJ)0jTy`ornN!w(xbt~YgwtcRF`uy!~WyV-BiMqx;@gI*$i%iI^khyP* zoSysuvit37i@*7*Q)S@g_?INFQLS1wMFvl_=J11~j{(}8^P@AK`j0Y|lIDkVtQ{sb z4SXH=WU>>nPGRFW;1OB^-h+@*mZGhJAu|fn9xR|Nj^-Hm^^94HFcp905FQnD&4y6!<noJN8gRj-FQOh*T&OkHO4ivx<3LHsM1U*R!I>$LvwdT8L_&PNGS2i29mKBCM> zby+c0%9`-+pss~2=7jcF^M?kVs6Qh0xva4i?YKP+`7sqM_%szkWQR2E z##F5r^l3lqu46sdyr#Y$;7wUq-~hw7DY-P0lWs2#A!%$7fd8flHQR;1l^nbTkUPm} z5f!+v%X5x`^F;nXWl9A2R-aMMd<^U=Ur-bCOqt>@6C7#V>|u*nTE%h}bD-%C8>|p%tY0Ov@1)3iL236b6~2yhzG->DvTwLJ-(Nq z|0R^h*;->tdmE18KCvITPvjnfH<7hNr~iwEz_{@l!FIMGS4WFm=7b$)aroutoIET*SVUtJEJ&%cpBH&hp&> zx(f9T(7&eu5rNJ+)L$x6wa7qt(fy?Z_UD@TurH`2^3HMXiXXr0I(c-=KDg5{eT2I? zqG*F!q@t?lrS#mk)!wbsI;+X9b}c*-Z@h3-7DRT`&bRcXbZt?Zo`5&mNitf)5qe^S zKg0J09hkS9hu#%dCCeBF7k{2uJxAssKKKX_j7Ug*M(>3 zdJfC|LgNlrozMNFQmqXwRPIN*+!Mt=@=+9NOtx)l_4M!e=HtE0MM_W3d;tEx`8&U8 zY-uh0Z;<|}9b6G2_URuBs@m*-_D&6Lqys`)Q7mq9U1K?sB~v^6mf-2Swr3Ycjddha z(|t5rpkV#-c%49`CD|K}Gn&-6PP#+gaY`vx&?=%%zX`w2BFue=by}b+)XDFHoyuV- zYeFWjX}!fj5Yb`R7TmIa8ZpdxqG%;&75rMRU_QwI~KOs?E?kV*;eC8|uq<83w( zB;Wt6J=ALzYk8>}`d+_~k)NgwR_nE5vk2VKQn9vkWdCkxUZPm_rjP4aSJR$oc`~bM z(x==KAoM;^|9oxPNLs#_s~42xj}m(ajTzfIs!Afqm7IXzc7?~mZ8#o&!Mt8)`kzdWC=(jQ4AE1Wkt_zi@Iy~5i$rwEctF5FVJV8`seSk? zwBq>&IhM1Hg58WJAhrQs`|o}zt+DkA1YD@iZTm34Bcab82s5@_s!oqr8s)VTk<@tY zMlE{VL7<)XIN2v3p z^eNEqM0zs+lS6Xo&}s4aRtdSm~MalR`&a3=g8 zj#mTVc#`3$5_+J-a$JO>fWpD8mQ9!ApM;abvqs5XP2en>@S@s@OpZWg%q4x_c8}KT z9AC)J30H>yZ?@0%b3WBQV%8xyR0J-O9qwSp+BZUzdPjqeEsFZbo;~?-5f*v~!QPiS z()Y{fCXL*hV?8)QMPkaRo>(WXV42z=vf19F3jn|Soy!nw!41mrr_b@(5bMn|+CGD3 zdqBwf7t$OYU5ox$a{!b03dM}vu<+O!N|6XJRgiKl?Mz;07mb-G*+H~6=;82|W4G{2 zNO!j`*qU3uCYp*b9Vq*MU&zug&!9~sQ_r`Y=V%;-6$;L2!0e4@w1Oz`%6U$p@wkUl zlyPVbiLuKsn(s2#bgLT$STJggBS-73%-D3&b+j**$3Fv4D-&TXbZ2{83rxY4Q7EwO z0G}sx0RREjZVXYXV)+7oMzF&NeQ0lin^!(*Xn6#7kf-)7lEi&7sXFV)bft&bASp3K9 zpT+sf8+B^3BY?i@#w!xM^4n7%$oF%?t#p5%L5MDczj@&+Z?;v=yBM2q7iI+rAuh<_ z&}E)<=vlG<8(I7I`5bMNp1TWR8zj_F`;c#s7y*rqPV6}inV;>7vN5#@LfohKufl%2 z{4oYHxdjWW+-r=wRQ<3>ijZgo?q+^AmpVfyRlBlwI4tgBX_G&kdk?0PQ&~BR$mZ>5{+N@9r1lIr7vy z?R&+87-RO+=k~Q@>Ih3QfE|Cko|@V{S$W>m)r8G3LHMLCC{wL8qKMy-@c8TsWb%54 ztV0(cmpq?@P=4w-{4ic7ROE>WEThs`gcI#h6tvREN|P~PsMan&i(mFUT-6N={~@r5 zRS$r8CE*2lg(jy4T<_O9W)KZ2_K6|}KMbP{m<%{ zem2qY{4<|ji|`^R&WdQcESt%=o6B$@rw27W4wc(93skB|fHCT{@qE6U2cw>Kt)qGE zYWbhSf+ph#CvX(_fPo*nLfV9lW8MYJSD#{QY(c*h76!ZDwE-q^+1*Q27c;fqw+{6U$QVFfu8@7q0%_pI(>yP z3P`*Z<=WX|R$w&0!p1zf3;TEBh{ppXzkWkM`gvAuG$SoM<`Yr$+omsjtVF4H6RKO` zUFE(_qPuQf>ErqLd%~A&msWMskHuLDZ{}0MY)y{(M48L@Bo6gdx1!>H6 zY%-Aztb!JcMu*}&X0%hrON{w8|8T(l09g<^%dRmP<&3#;%A}~POGK_0@AWqAWT=%o zJ`tP0p`q2#?I^>wN|T96CVwma{$O|%+yH{p%8U+=^Hs^2DGlud<^F$< z(T7Q*Gn>;wwl5GfwiIV8)2x+u24KQe+goqxRbQ+}?=;*x?82V4No$RJX6mJ*gO2`T zBV7saY!7a1OJ0YIg+-42jLSxxI;wl_QfX>2L6#^(tLJKFtC28^9^r3yGhw%(-pJ@# z#?9`Bup3?YAsJSLKGoHrv1BVCp$eO8&xgAleAc_DBs%56D3Mz!C*z$yo2Gpe`ipgRUoE zh>hflW*fO(4hdC1sa_sQ(Il=dgndhzgynzmkyL79_|KzL3V(+Nb)ZaFJ zNM%{C-pH=YK*M`+Q%y{?ZC^ybi#~6$#YzqPRC`_%!-f*Eq?{*mq>Tb@$Xc zU3gf!;h&_8;r~!lRz_S1GTV_0d~BnB+j})YVWlzc$U8!`6fQ(`>13ZHYeu3tn1l!L z$9dtgW_m}`pBX@i{^X%}tr%Rd9~ZTW#5e_<;p2ISX|d7-%o6F>&8oa)lCY6^HZ_;9 zo+9ItNNbt&YWv@#4QeyCRe#Cw@wdeo!Vz!Ua0g-#a(`8U&t_C8q>FLvGjZ%bubd2X z0bD&>nN%)GtcTb7*5Uxb3RPpkI@Nd_PunE1tQICzoegz7Fse>GZvCpDt%i4zBBw%w z5B47zZS6g7?>`zR{G%oG=7_vkiqyeE6^`2Ts?HcPadiYscEgb!Ui6xn>5NH%K2GL+ zvxp**Hgb)Y-O`KBD^)0x*l+ENQ2z;Uzf;d2u3%DwVt?=3BtobIKqT*FK5srD?@2C( zQwTO-tcqrvA@VGLK~*g0aLGOS1FIGh-y_uT{+OzYu7Nhl;8iD+{JYUPVG@331uFhn zVH`@{Clr5425QMq^&d@7{)Kt0q{`5{@?E;bN9`0)R=W!sf@0+9?fQiV#RGqOYc6>v zKYm9ZDu3&pj)R@GNrWw_rPc7*<;Q>Ki<(0tAJ+U)uQnXR1OG(A7JsSI+Vs?o99(y? z)adRnO1hP>6a3p6+>;W`(RI=(1xVVMk(^QWUfvCZ!xl{>wUgOb@tnlZYjjxtt|7vi zcmKHhBFtJAm;uu0UO||w2f5c5$)u>CHQ|*87Supf3!tAJE5Q_6-#_w}SKa#m@?wf> z`X{Aivd-9{5vVY_HfM8^Hj1?-JC26;VUm1R@3$t)Hp+WmI3;dG{>F>%Ub^FJ>nYa( zx1>fRrIW2Rro4qX`Br?NST^YjLKG5zh1US$YH=hMHP-iHmo!~k)anN_(MZ9o`VIUR zhFLwJbYELojZhG&tE_ENpnf7h_l;U|);di@Yhm%hC$>90;~yF&xR<&K^=?K3k)Nr2 z&}qv3z!Z;lc(&GZ_eJEZj9jv5MX4h*p6%*s4@@A+hMYOEV~yAYYCe;OO+L+%Nb;+x zvLe!veBImnv>h{1MTOxnf1o8rwy-X{!GgWvbE!+VZy#Ofa*gh_Uc<_u+)IA1nLU?zZs4z@+1y1WvjQ?5)y zbqvPjt?cbgo+h&FxtT5SmH+ zX99+Kj0$2B5z26883a-RG^l%rfAIyII8t`_Q^OU`zBU9|JB zM)k1xKo%)+H03Aux`N7>Jk8a)fBV^aSu%6hZu4}bSt zSxr*oRiynaZSgN8%>9q*g$l*USHQZ403AZN+RVE!cK4BqacfK{v;;)kc^IFJnwW-(wi%Y z4BiN^_$2?M?6>`SE3CPBymj4}G=;Y+S>lb?8t;ABb{F4QGkmCF$w$Opgg%3@_%)9- zlOpa~_dl*JrM!mU!gxkBi1&?J_C9bN`vcNf5=#~jIYCOuMHp{$D!zYk8$|EidH&wg zN|c074A$Lls2_C-E>>Dib35f4W@(9$2E|;40JnvRAv-*QbvC(bFF`N}2 z-I|W0(J!enIp)4R<0qPP_x^oA9efw7zl<6d>`w;acavELgiDXIO^8ZA_5I=$eS&LbbNV*Hsde>Ah z4IC<-0)VGC5$mQ|W`Vp^ zWuVm+%xue(YYt>i34Jhcu#VxZ_<84bj=f9m`wM+Yh@XKGiQQ}pjHJ<#@x#{ro!Oq@ ziek>6gJzyIc5{Zwn&2pX^RD|#WQYh-9KLCQeyppcXr#%3Bn4|jvFMPfwX`B5TMYz| zF@x;e`_8diFBVIn2K`q(9pb|O2zcN9Dw=vm>4NHP-kCJ6wR;k0xI!bEoov)1tME9M zG{(2*lg1rZ^LHa3H_GKPbX4;FjE=;$g!K`RZr>p9QnPRRqi<-V)(OR;IW?cxvP;3l ziLc(lx>_xcW$z_a;49QcH*Y<*j^|3ICy?+d?PGP52kh*M@ZZs?-~rh1%XiH4xy#Yf z%hiZJe5Fem5@U#VrIy$(jDFEsN|`nD_JQ1vYv^miE%o`YPimsHaa7gWHruYOyT6!^ zOX}2P&e8R*pemM`V)j z?-KttJO&EPg`m};0mn|XI41|1p;Q@7L%`s)vd3z@2B`tiX(f;A@3#xIHnFc7aaoU^ zw3QD}zEIxFnmoFFrx4G4ceo)4ivBkXzPkMXn*~3#%Z@8Cr>c$3CH|M#;&UykQ6^Jg zZdollk-7PWn3}VshWp`N$cv%X1Xhs(2ktk81Cx)NfK@%mM4I+LnLrm<7hLxq@mSI2 z)X!>NBoATN1nHNnIF-;FxrFB$)`WePU6bYG3~oXc*JJEa28X;=T^nyeN`R0ib8YNt z_3ik;#kUt7r7FEQW^3V|PMqB+FY#o+^SQdpN5;KYHp$toJj4aQA14Y`Q)tjHxY(!; z8M%-K8F$M-pj`@3tOLV5sFm&25Fa3XZwAm_4s-1$vvqK;W0V{&4FNALSt2N2LA4Nc z6((T+_wQvi;y;)AcE?!hG-lWF^WaBXnK7+?J83xhDh0r%p3()oi|g7mvvG5RW(#xB zy4hYQJxx)MND&cokRNP^kyAUNfMaR?`R>{OhkU~1X_F^URODtF-bW4ZI|Y5AlRv>x zojsqr8Zm|~`ulwkJ`qHf-~jTpK?xjwk8z(6no%N<#La7#JRD6rA2gZE07(Z#Vu;r( zd%barN@)qDbrUKckYo8k!NZAftmTS*V^{_tfz_{GfDq~G@OOo>1yC&i=$NlIo@3EZ za&2i7C`A&f6X5lp!4vHp{1nGmb3Yfi_tr{*sNWc|ZQ~2rUN{2{-h{5{Uv%{%NlE1L z97{oUXsJ%ycW;!ajZLbjTe^s~j*si{t*0^fgChYnhzls);viyUpTeUbd#~>)B85)3 z@`GmrMfDJ*OsCp@Vx@{L`iQ9gjqRtSf3W>qd(UeYic+N@JNN%k_LgCFEZw$nkOT{^ zA;H}V!Ciy9JHZ`-ySuvtUuYn>y9Rf6cMtA-&E7lN=bn4sd%ydKr|D;{UR^b3&8nI; z#+X)G{}5!fV`$=}_RIveA=f+I#2DWf!b=Y`=zzmLZLp0*Z&U=`FO(;MJtm&S&wgBq zSMC?W)WkAlM#c+tKteS?)mVE>qA{BeiZtLy5s`)*R1sEt4kzQ93a-bv*h8co+bv&t z9#wkEcDDkKW`dr;BYv{Dyui%YZ!CiyZyZ-PSi(H3U*E?$IiB90YF1bB_K5)W6P7_B zS+&e2i0L}_I#F~v^t`vW^(2v~|FyduL3RbDi(U=*88D$lL0Ff|w=fz7#a` zr~ytWX$ipO5e4P%<1Uv`pHt%iu&Ee^xB=-&P6E>M;lgtoFz_4+%{YC6V;{BSuZht z4E~OvuvF@I4qb1v9rr_(A>~ls9EN~5JP_NsXf^A{W^PwsJ2pRkP;Q0c5C{_FOe~Ok zoRCdHHjMbO1Ci&cfEDUE-bwSDOBxRV{H2oaPD_Kt7xVrp93U1BK4%zBLk4cj8~sh=ZG+y>LnU3_DkVD>gwQqSA1Ol zq@HQ#aOJd6Vi(|>hzjAo;=w^#=EH4%2@O%Sq(5j`W89TG1Ilxn{@`cEWrrLPE^mBa`GcMcpb~uk zAuWpF!y}8(X6?Rj-0t1;ln!h@dr4lo%uKH$9{N5b|EbdFKh?zD8RI54$C(yo@u(dH)7rQ*br zOn#D~;Us}cWrDP%l9%Pl-u78wbX8O1zK@&RjQRa8e={lZagdDbOEhCzFY|o|(881@ z$T`@#G+;};|M}Rk7+{X{_^IJg(%&?xpg>-LWq`83i7o5~;zWa1h4~sMrTwXrT!`X$pZuhnSU6&uth0=9|l4`Jsi-n zIiKa|w``)|B}51j{{G>=`D7vp;FS);(e^y%A`w5_(uC(04RSodTzJpzNy@GNX%12V z;3HpFtucS+TVKIAy}Tm%+0*7J^W0bcz!{Sqof;oG#vY6Gdo0nHuwwMy+sb2>7Gmda zLeVNRFu(t@9xlT|F~+dudPmzM-pb)*Y>UQDp0EC9J#<`Rt{K*4|H34>QK$UF?NI>` zLu%uwJsLNgI0KdCy8oHge*-E1hEwK%doKxJ_Xk<*t&q6(EX?;+tDfb9%clS9$0PtD z_Zx~rGTHCf=4~L20x*SMJ_ch}5gtT=&v&Y}17F(>Y}^wLOhg$qSA?2a0pC!8z8Nbd zFAnaOi{%XX*D8N#y}-pdruT)VV%)Ug#LQ!V(ck1eRt^{$au;ZDrok72|N7|vdOb|-4YNSjm)Pp!io{V# z5_)pTqOB&QhGB`JP0IP_S60JNGi5Hql)>PBGhT?JreE4VZ5p;k0)`@D1^J+(8kZnA zv7q_$;184VZ~OoA*ZT%0hh+d%MU4H-)&Ak1cW9$~;nIjpmVNl+*CsEnV3Jp;A_H`k zoy2MiUd=!^&cJ5TBi?|tFk&wtpdoi*`pK}DJkh9+ibYdVLk#l=?aU5sDriS<`_E(k z+l5JN+i|w*Rwo|Iz>Kg%|5_`;01$feli~WTrQY;?2u=LF6II?va%{sdwa5kX);35sCx{oZN*>6QP(#j5;EM6c3Sq5kurXA}Uz+iKq# z^FO-Z-%j|y|Aho>!I%V9`>z@CMS(|?1_#0Xd+Rqr{Qq#rjUU)BXDC31{%J;(!;4KF z_CrVjoBl7x`#=2aU6}?L%;+Ac?SSm}$AZ3jA%{HOTTKR@z54(CpufH>q6of|N(3I> z8ShLhK6Oqy(>KiKerKl=+|5?U|K{IkiF|%(GLeL#(Ep1KqCkMVNy;`2rv4c}TqyMX zV@>rF+Y%`kDr8Nh|Ng}Pj}EW`x8ph)@-P3_*^pv@&L9}GhWZ^5{@0N5zgzR=j@QTw zvA+`b%hx~VdH`a!?DGt=xXAxY`;hQ?v&c^%|7}Ci%j?L3>)HH!>;K*??@vG~W$aTx zI@zDePNe9iG4Z3o=Xy?Yt@^#f zb-4x|`+9E2H8d`~Pk;R4zx}pI3Zw(x5*6N4ooWkrg*?Kuy^7ScEBla!NPsPaNCccs zZ}=Q+FHXH!|4ZaeuBgoX)6r`{B*acfypH+Pzr2Jm9>L!M{nAvxjXo*CM=LI1=IpaA zkrm0*)i4&0PT>q${D+S4u1sqCk!GvEg!q0O-n*iHK;#kJeq!kIl>Z--teTVZX6?>t z+&4M=euQ@tU^Z-2W?aD+8};$)Y_3nA-L^>f#V9u=qx~Ix0Xgei*0#mr#0ENse2D7*cy-kF%aGhI414{@7OWG1Ex0CtT2z27Qj3AeD>^xp zo*=X&SSR^EJBtyX_l2S8q^55b^*(9G?=BE=eX*&leK!j5oWC72^$XC4>1(j7d%#Kr zSo6G?`OUCi2MeUhcm|yQqr4%t=%eE;Sc>gMS@STODgwxp~be zs`AGrfvFGZGdL#PKUq3!B~%g1tX*I&vYC>-(!18`F|A>%VV$gzvE@?Fem-TyWTf?1 z56(h97)wsZMJfrw!@R7N{*0A>FIEqUqLzz;zhUPp$_n_1|6?e?&47lcTw=(6cRZdi zoEQFhPAc-by?vf{Xc5p71Czew%Lg8~u7Itc#+ zfG!~Vj;R#ndh6k%;INp4(3%_=O8V)JG0K=w6aMvJ-fsj^8o+S~%F@jS)R)pmyAlo) zRYq!pm*pj^Iy7Ulb$%+lJLUEOjg!I0?}`veefMTF2NOFDoPka3Th8)mzs-U_g!;0;?}wn8qTa~pIO}y@+mfTO z$}Kagi~Vbv@&;Twg6iFb0k?I}gq-+eBr&y;?wAT7NmRA`p^qZzKdgyF@Y9fuTWTcP z8$qLq=Wg}oS&laUp3s*9Az}YuKe*J|NRIkW;sBw-^yrN{nDXWz#lf=sr!~Zv&DYB>B=A388ciybOkeNcN<_QDi5K zprc!@PzIjT=VpFtA6ZzTW)X%6$Z>9OVDD5V?WO#CFf2nx;Bu5Wq!OtzXz!+Zl@nWI zpst>O#ZZ1ywcZ0Dj#SC~vR1TvTnQt-JZ4Fk>mx2-z5^cozy}0;&q;xh_;rb3A%J&W zPHE8n_xp0=1AZ{3x-uBCYr3!fEF!p<6!g-I4-%_wh^@V?&reiybVJmbnn@J6$nNlzwPYz5Ape^+M6zNwtkQ85ji5Lj(topZ9$E`?Y=wt8>f7=08c=#Qf(^RBJcS$400m)hNlsEuZJ%oUYYXbLH@#4qP8b|JsyW8olOx+tN$?3VLL9zi!uX; zg9p*d;XF~IhE2If3QsEKW8#(JA5ApKo{YZtdsWnJ1Km7R0nlCse^E$ftSb4`9lL$~^%b_8p4E2j;^n7o#K|(r0>6 zIk%ZHy`CJExqgC?PmbMaF9?5v>w9P6>lR=A;|{OdH!-35g=2XnU1zZ%w^|M)KOk|8q!#(jOxwF)=l z(~mFHp*#ovxxjY!6zT;pB#TI)6*7qt3Se8goOYwkA2&ZSCArBUe8aK54wt_Dt@+Q2gfZYYjqGoDtlcVIBcFbOztga_=Z;?)lG0M=d6c;Fyl!6Zj_kO} zn#S=^;E6Mr^W`UvqfnHy(MVV_XCF|(O7eXMHtTa|eferSrbHN1ldK2Ot3>DK zz%u{r0J%Q9qq!kM`0XK4bs^OBgl=x@v}b7)U}gB!Kjj0TcVG;qo0m$J2EruNsAO7qD#C&nw<>1W_x4D7V;S`CcNp`&x70# zZ@d9^T$RF4Q#B;t72ahn`T>2%&xz<}ld`R-IHRq(gXvcwBUKrmpZ$u{?pXjPrLS%c zf@>l-x0km0Zor2nagWfm?2Kk)rFne(vg!WG)MTv1Oi(DD#kLTQ!Y$NDjr0C`#$Dn> zptS`6e5LP=@*F>C@H8WWZ;;q(!HWgLC?PVr^#|XdW!u{#dONXj0!Y?8M?lK9lo2Uy951bsl@REY6nQkL0Df;XbG? z{J`{_h7$+Yud9f_Lia8kS1uRrI|W9#B6)++N$t4jEV*j!$0`y0RurQM9Clvy?uz#C zl#7@!&o6}$`?C%8i#8MCXZn@Q4k$*=F(@iw3c8qdMH+Y%aA?xCrlp>ljtDna27^&g zF3iURpR{K_N^>h|H#kbL3fFQ&RC~SRh-UFaJ}&#LYG5{A(ToaT8(fBD$j|vU3JNk$ za>34~>j$Yewe0eGE#_B`MFb`%@KDS;3~0k8u$ie^*BwS0G#hQy+L!qeUky0f2AD`{ zrbf(<y!FjLERnAi>nM%d%yD3r(Y4E@n8QokNz( z$}uS>=Of8s@#COub2{^@JQqdpCh~q0(gn3fg~T>h7KGmq(wsP%D%FMI`D*52U-p)x zX>~icFF^H6LQrsaz^?su#%7&#_LmKAPvV8YB}cH!^Jv}(&4tNK;zYWCMl)4Muihxf z9jcFBmTt#zmnGlN|Mo?792QuV(b}e!?O$4FlMdfQPXDmo=_greedxdS5XLk3_5Ral z2OKSZAjv?5`P4Tx`tcuqsN*dL6J^fx7N2h`3{ry|lA?TIs!4gfZpZy(MPa2S?~D_Y zW_@9}fu$gx*|5Ft(_)VZ6^~G^qTnzX(Rx7*+^}QA5-K{DYUY!K!E~LPGUH zk(DOoLx6U+sR0e_Pph}vDJZDYWZ~};1f`-+0vwSptR$XxIe1qQAURoB=+oaQqd2IE>w5vF0NF^ItTvV|f_J}>(u!~p@yy%ho z5DSwbop9p8gA|ARUdR?LTG+}-Fj$Pv=IRAqR)f1t3Sd9%)L+ z6&W6f6w=-KiU*`1=L1jYoln7?l#Hj|1OT&JK1$yq;C_h-)VPwzDBkDM;Mnvye%T^< zUr79=teBUE%?+fs6`V8EG5mB#bvuIEBVJRhSi7l7uC}exEr$+lH)9az_`RysDfjZX zR&nh3r3HvZB>P01i^VD|rdZJ=A}qNc=s#v0P)1HVx3TG8r@PBtw!65zPngh7J8P;$ zq^c=^xHnJCEt;{AiPd4>y+9R45M{p3s3`yg_mWW(UDQnk$e(t1gnXD;%=|FSOMB~c zSNjJ}X_&MnYy0z5Ies#exRYi8D?qIm0uxkL#r%Tyy_z@Ij028u%*IMJOMtnI$UrZH zRL|-J2JIuGkKp=)5T+s(sl4adraj8{L6943VjWA&2Q@ z^}p>x0P>naaEq1B;Nupc){Hz!YM&-yt?O=%N6ih)MClOoi=1gm{DHBGnnsOIME{*!d3ZoTO+fl5i1_|H0IQ`AbAVRC za`)VGtKaW$LQaD~ZPaOA@{_qd0<<+ou#au^yr(w>vI+>=4NL*nnwu#qqC0mLe7xDz zRIBT1ZTO6K`lf_bn_t_Lz-Low+}^e7@3A>KD2AlMZN#GqIE{NhTsvJ@nv$(h!~>LMs@bqMn9cp}Kv{Vkric z{Y)$>c|r- zElN}GuH(X<>{1W88)kxO;~ou7ly=_Eh z9!x=iCe%{S;Kc-{f=&+xAv3}~CxR&WC|w`rsn@PsDNeVut584}JS;WKd8gb(T61%CK)&v!!I z^Abs%dzm6=tRv6`1LA6R4 zsgZS0Wjd(#nxtU>4pUKl0$v!#3!#gJG(Q>!zKqX7@IT*g`U-9_?JbH!3nAmW*F|v3 zY-kyXJ_)>IFinj(M={^W!S&PuROk%`wt^b0OpCbJ(Cckna$qCaPahHGo?4*niK#W# zS_DqnPt1T-cLrZ)wZTjS;&hxCdVk-GCej7atw&tONdS=9rr3Q)vM+9r)1CI=_WlIb z#<5zhp{Wdm!_->a2u~?ygF8GxaW@Y{t`}{&V%N1kvtDa#J!{V}|nGTsd5( zGA26Hh!$`B6|j1j;VHGR_se|l2zxw((^;%%ZX`|W0niI58Oq_gnD|1YFpy8(x}|W^ zDdN+))ntov5Jo;Ttm(RWz2cc@K35^;LE`pFLpt?FSjQiG2Dxx>yNQ&hCbmx$pq~`omlgS)vS@^SZOk z1<$}@*(;3kv<9)j6=ZAe)oWj4eqa(Z9{!U5C|+G!h5&Pgnd;fnOm%D@WZPfRLVWk3 zx^RVxD9-V{BmFvG-A)=a+bEe$emiq|_6g!sfk#h68}hSLt~lj!?Mejf-H~dA2H{+V zA$;C9sOYh?jJot{|E3IoVg1nkjnK%$&NVD}&@du2?)EVx-a&gI98P%EJaXa`N%J|@;(u*wTyOPm_ zeEj;0I=}TQ;4K!n+BHm#g%gjg64nDVcpE@+?*#-YPIBe|#SSJjneD;qVJ1aH?@WG-yyNo9;3uc?Uj{ zh%`KwxTXrMBt6BTgkd<;9HHyEqhQ48h*FHdDt~*%c>QzoU1<+78V<)EN%Cojg8O`q zAG!#n6tEGZGn@9r|7q1KNx7t{6cB-18hMQp(gCaV<}z~u0|dLMB$h7?lU49FG4vks zI*S8qrrO%-?s%PzuW_Rp*mI-WoslyG>R|q;rU8|trYCUmfyl`X{yA%cImhBG&UG7l zO934F-kqPJ>Rmo-AvHRl%qoQ@5%qDXWs$#;{OA;Fv>5dLD{d7Y;;CNFh?uxw{q~7g`J>Rp*ncw5*&6`;{%X0g7kxI zPNK}>Du{H)pi25Z`1YleFEPu5bGDZ)bj+paXjiyvC4Nu$jr z3%5x*0hS0IWB%5uSU@4rF%|^@eNz{>XP#$ChI*sL(<0i+Y z_bM_P1@I~orAlo0ANa5vhpg2BS%RjUeu*j1lmeEeSmjX%c)U-t+_Mkmq9vZLZTClg zJ-ERlLCC=}Xd_EU1}DF&l;&v zMrq%8Slu$|zYpv}qEjx=QV*3ny6ULnBXlpM2}D)m4p1MPCU zMR6i(UFlzO`-G*az@-!1`4cv#c6NFSF--o)_H!lSD}_?lhqd+KH2(5u46W`rN;0%b)ECDY>?Phc->k1oDHa(&5oe^3rBH1-CNG+U_< z99y^`cAg|i=X0dzmp%QYWG|Xkkb++;ANmr9L+!?Q+8u$C zPDgefGLM~d{ju-wG$e67B^s*ClI`-4b9TRXi|eEkPM&}R8JsaCsrQq`*`7Om30OOG zKz2C&m2$4!t)P)NOSpGu&+g5pQ4^jLHV0a^z^~k zjXVgwnKYetZY|;^F|@Ug)`Iy+3H&-P?$ZZ3?$MAV--v3%<28jH5A@hEE$D7PLA9h@ z<1UbOa=+V3<%xO0&659*xLJTh`CS2*2Tn+Upbh`k8;o%EOF(=`b~^5kt#65cjKJMh zEKSYZTO@YZUpcNZwj74^Li+=Y+~bY*=M#_n=IdPh{A1GZbu>MUXr}LEC{2hZiR-VM|_)I@?tF{!z`RRrpIa-|nMvc)I~A0J9biVNaWVNp%6IxkHd@&W9|jc{ zR4uU|kNF0Re$;wEk_C3rVF9dzC@<`01F(~uY187vdIK?W2! zq>6=*)5%ahaN6b4gVLBNqd;c&C<=JtJ6^ag8>eLu$#}6eugEIKR+noADb#yR%8?;p z7nmiO&Z^4#v0$!tqmgEwq*;0G|0<3TD$St|S^rBMe;%C9vBg*%AX27_uv&G+AsM>B z2pyfoCy24aV8%LlMV*f2e`8<4zT&=aP$$0|C>4&guTF^2=}uc-ju0X@O_x@`F*x(% ztriNj>}NkCMU6KOc0fr;8}(@PwV1+&*bPl+KI&_8m@#pUv2LwBdl z>F5bU?mRjmeT(sSRc!?j$gh_^6n%HqXi!^`pnloj<|ldo{sTsO|B|}6k4E^>$we@5Ea3?sNZ5S)ZO;A{P-Hvy>1xGVNtMxNPf!qZ+328=1tjHDb8yJCt zB-Mh!-}NJR+~YW5Yqa3QC0rUA?EMw1e>Ta>!w?tm9ORr*1OM<@cP7{Z3B z>==BHiJrdgfQbUeey+|r1s}PA4MRNWwNVS>*aQPP>7d`Yp!9>>K!rTWEbpKD{_FzQfbSFs!czE;cIeXd_wKZrVL6STk?arg-o{*C15%J z5_^cFH*`DCeVuEtW_ahM9=5Na)CF)ZVZ3fQiOWtWun&GpSGQLHN9{M^ufSM}8h&d5 z_=7x(q7}%c#X<$Y!u(P}`}qn*BiRx-cyY_tIBK6-E9dc$W`qVnvHc8&B0lyKwK8_M zAeK$FM08{oRDVTTR8p!?8lY_JL`sba81f12H=>!%5u+G(@j7uP{ysqdt-Iq@<(C7_ z=~;^W1;TH0V|liS27H9{tgApmVkY3in(G9i`;v401jxG@HnFy+`7OMh@J1a2-11m{ z*)c-C4cfO5@bSAqZ@%ke!HG>R(0e4dAw{@%O&?F2@du3JkI%|HAS07aZtwAeM$ZDyuW@_E96d z8jcrh{5c;51uUvz*VX+*Mp9w`u|-+NI0Fh!>9T2mKmkmyo>SOI{J`mWVpBI8E}<&} zh)ZjLDD>_CT@mG7D%ibWgVjEEsD;16hh&s!3GrLFr;D_{6uH1(mK z{;Q_`m@**nrFV${)gfmUI6YJ~YgvkN8JWSU*!Z)Xo6gMr7pzdYqQNF&QPjFqnFW#p&;mwZ5xG%ffJ;-e+}WwWc$a4I;Ax=$0 z99i=q%6=g%C?W%r$PW1pJ_2YLU_!@|>^o3pVpDPiS*iJyl?oe#E8@S%_ zQv#1Q5{vXI~YNg=*2{Q_gSJ=zb{{$l5q`ic+?g?pF4M zdY4>9<8tzR?6s=O*QSrJBI>s_s~!1}ckhT4gRjGn;ODu6PTT@=VC!Xwsy1X?3$|}GC-xS&3=aUs4g+om{ zTA}-rJJrD6#<5Rep3r5*>H1oqvtCb^FZcdn*YU%hw!j^C z{z6@vsYZU_e(e`I+T|~&8VLXiq%5Bw&+%;Xom8ub%*pXt*_m9dM*BtJsB|*DP1$k& zs(T&4ly$C=6n4j!Xj5U>nbKz?$%xc%@0D;91J2hRe-bCkT$C*4ZjFI^!^C^0-Ko!8 zK|kQKmM>!Um=+*Mev4sj+51Z2aSP=BuE)3-bQiFkK{^5y$(3~x_kYXh$4c6yjriGQ zr#&=S?o$X$f3UqGtA62z6Z{8mII;ggEH||<$bT>%YTWM$r5>(PE%yuq)({NS7ub`u1Z1S~MOEsF%UHAAjPJ5(opx@gM0R4cUvxUi016#Ewd=_zYGb}dyEA0}!@ zm0BMeD2NXLcTupYTMluY|H1a*=Bsdyf1ON8M>!oEcz-A#To5!qr%KByd|&*hRYT}o zS72M2YCK(1iSY^_5bWM$ zczGT4WR7&qRks>ZxtRz+{%ogWkNkXLQ+A-&vJ$1=GuF?t`omYE z0PGr+EaRk!o@T0Q>X2{D2hWF^P>WJic+clzfDsvzrp|~3){$8j%@kx%xKuo$i*mQ*UpaZw=64T;{8<(I zzMME@zAzj=Px1rT4B& zJ-zelIO?W4R`-{%p7OGdp63MJt)e~9sX3TzU(JMRMYCmRe)T--@SFqNl5q4*-f(JB zMkA^);>6s%!yW~GT>Gde){2f{n1l3m3XF$i-Ehv+>~SfNa_gR6)&tJbtba}NPN3=! zo%s|1_#rYdRj16O{?#f>K2+19lk1DZPv3B;H?_t=AbdHUR4jV^904!fyr9r)Dl0nr z0tbOC>}?Mzg14~gSdltfzh2b)vQUJMIA;+_@PbNYq@f%XsT8ATCTmgeJ$%LJHQI@m z!@oC+yb+X1(J?8iaHY`sc3#`sIeU#NGGqPPd?D_gZO#e)O7nWIwP8`JM~g!}Dbm8N z1<3f45*;{}R=(hfO6zX6>bAM&_&7eNm#!W>sX07Y4|mz|#t+J61RNP-Q^7b`<(fz%=*mJry_T`FHo#2>B<<6cz3>IdqjJyB2Tb`rt2lGrX-{I-UUVH;a8%QO$S6-_wNpq*}`~Te;q|VHE(&lKJM@h zvW643YCL}dIbP8h+QghaS!b>eI|scgwK|ase=W-x4zffbUl6V^=q;q0b8u>Wdu!^) z?U8G)jkBHm>MqLWi*_Y1JWlKL3B>q$CHMGK&9seVO_BXN-?oH(RgJ(5_@RW5`$ zL_Wxm+(pLSul0H@VBfcm56XYRl7=w8KVH@p+<7wcJT!hkQCbKBCWbJ?<9<)AFRESp zs54zb=pD1{iz=qt7Wf+dwXmml0ihb_S)E+*X*0DjKN=IBtEBT4q!}aDk6UBkJN$`h zG%CHxO-eM2#jF0&Xf;KswJXS|gG#Pv)q`Kn&YS$N|aG)m$lbtX8h5okhQ z$e^~{kXIi1G34LuPOx7yUkmyr&)V|{O9p?Yp+t6H%5y^GA_ipym2d+iww1 zIb+-Zm`zY!NA`1#((aoa8H8*$P)yL~($jPc|FP8Q74;Ql8`g>)ruf7*R5of84PuiI_Z)RF#`h6STi4X%72I3>Qw5D?~ zBrHqSYDQ&!1RgELEkV2eOn7Yj_@PG9@hNaCnJGFVBCODYI@YyQNbZZ9Mve_45w%Yz z!rv87VA9Yn3;DKRwZoLOK_R@~BHtzOKHA3YiPp+5?|O42(hnk0*Mt_7Ef`*sYlsOz znQ6ZW*5mq8ta$QOlDq4kd->j1wLnld#hTM(5n70sBDO#!g?JOU6TTig#AvM{z1B0^ zDLQKu>D;`nMG~#LbmNL91xDkp0e+L|6K!`4xoK=!!f*-!ipQWQ_*)pcJCN8HWS~X-j;>EW4Mcc zDJ{TbvEH}`B>?>zrp4(ewg=o>C0fl)OanVvKkwVn1Y^uxYemz+CV|W_M~uNUqA4PH z1$akFxpzM{Eq-z?b7tj(^tdy6tZZn?<@P>L%V{Wh{gq)-@p5WE4HZT8{E@~ z+D(fUNBPy_b%hLchL*EHpHZZqcQ<>}hWUJxPzWX!Xk=p2Aj4OkWEK~Z7q%Aj62DcF zTH|q8y}|S77aW{-Nqs}qcQLDS8E6x5ik#!wYW3rS%QC40rBmU|B~rTDEB5Sz$nU7` z&)c)e!>+NS0gk#@Ewyug9;j9|Sx7=zXyLBdZ%`O}M=b@kFL3EqpghYh>-7irQ|MXr z_%aWM!o17xxYjHamof|&ZSu<_4|pz9-O6vxio>A%Ig{FE>FO*+9D${-0}n=Bfm#f;@1*D|?FmkN?l2JNDV*cR<~DpuR8FuUif#1HIW0my`N zEF;}I(PIWXKvOIcPeS~x8zsnx;g55FO}BURRe7&yacpOB^BfnbbU~?F=N=uw;u)am zq{xsrP=Lrs_&S+Ufk>7SjA9uPMx|>4_nsu(#n*xWTo8X53160R*@ZZHJ~oC}HkF?k z@OemYh9=V00j1U%f|%}a&(E(ERS~mn0)pC<+d1%!-z?2akJDi4;ZIs{l?RQa=m~LHZKk=lx%D)T{ay# z;2t|>ICltV!n|JLHQ^@-!LH_rJMYYc_vlY@nCtehNvT5vmNx~w*!*Fd8FMT-cpnx7 zWnEMKQbeMB77d|8pdDk6%$ZiKHAgxhPoSuj0r2_N?s}d11laQ!UGj(dThXBwsC1M?O_RnXS7EW7rovq<>)$OrQZpLNs=E%Bbq;ZtP!zb$ z>7Vf+;>h8O9Z!p{+Ta$RT6XHjycds~X%`K*%0l8^+S*`^b8|8hVo#FPp9Uj%_(&O5 zXUPXGl;Pzjm$m)afCo--v;K%R1NH+DNS1qE3+%e!(OC5;bFu`@4>^UJJ?6c4htoV1 zG(ykA$LnaqKz#=?E-Rm+MZ70R%n{VXlBY_bD$-mQfJZR!*S%t?;f1rwlnMWZSL1Oj z*XQnBA}A!lRcYC2WLMW5g--!8{^2QI_Z|a5c2cRla%phkcsIY9`?H?;{zpOC4-h=} zs)3GtVM7DT#bcJc(E)<8nYr?*G@OPa(O_z#5`jZfLjL}SCr`^~!>(mXSLy2X^H zo)EmRZ*Ucq9_dP-Fq^kXc@)hYIf&S{ACX~92V>QcRxgj1o(`qYDmrDDIw#TfeIE#+=>iGL~XauMwr!)UaeVz3Q~62oF7EmVHFn! zd(2S{QH8SGU&Wf&5EdkYBQLrrHWbx-YdZa2GcPDx1%(%}3PK8q6sAg~mB<+d5#0tt zBY_cGdlUT?OG4V1jEJ_5M>#pHRabAL0rjLuZ=4ay*?Q8D`4X8iT%-@55%y15-dR9X zSlUzPAR2DZ!SF){A(t~2*khwNs9i6T0GopgV#~QM26<1Q9!#zl&I+ZCU$Iv0vh0WX zGTrYPHUWL812iS!>H~@sLZm`&Vp2k5>5tk|rjkhoYRpy*atY_fF~Xgsk{L8I&A#4f zP~v9w4bxyHJfD$iM}0mhpOqo1w9uz@v*hXeLPA=k)m<*|ynX1XURJ@T?XkxNqHJGg7R(gapu-TBDodK1w!w2Z100 z!xMt#^A7Ygik-D>^hYc!SQj=4L$J@%Vz5yWlbRuar1vBf|YW& zs8V`@YNx~K@_D=~SFZu?HDtNY_CA?xf^<6bls{g54g@&L!Op#x4;C8~HH1Pt9bUGe z!^oncdtH1oAA~G6+%G|b!=jIH4zG5Y2P}p!>Pro`P}l-CZ@D9>>gu^b7JpJwjA$_> zd%g&5NAnX^7A@3^e!6{s#(gx>JoH*eCHu|gW^RPVCHGTZFi1wc#6cSe$0|r3e}=_s zMJO>STtsAm$P2~8ColR)l0@Reo4C=vmog{D%-E}}^PthSL z+_4e%g3o#%r29`xW|}lHjXqBAm?fH>kce&p%sS%xtn6+MNTparINnoE%Tp1Yk)3E! z%;AJh>l>@_ zopZ49TtTRM263=7GK!h=Qgdu-j>sd1DUx~;V4*?y9~TSWsZ0MSROt2_ z&Pt%Hlj)4COkdk(Z8@8~RxHX-%c($593EPWI26*})NWl#G%mZFptwStddu1>Kz-4UW&nj3{U6MdYml&85vA%!dz82n5@+ zIAda?gDU0upEaU(t&d`A*sHXhln?; zeB4OIC)$xJUAG_u_^5fOpbfnu|72RK;Fu1r4+OFh)Z2FiR#GXsUvBL#U2RMdGSmXX z2xbn~-E$k(7A_K@n9t?pElkBFit5scZ_a`vglIC7z5xno0?-?~# z8E^tt?(uoFzE6I)DTKMY*c*pSXZvh2MH)ibEUV}CU7n+PRKKtBWWY;nY0~!K^AQGm z>_z4B2RcXYU3pyii$QP`({vlj*6nO~HRKNl?*-n)_C%g3Br=(F%zfr?$f6ZMdg~A_ z;0&h^n_rD zZ{)01O4{FQZOWynz{kr)75Kgrd9oB527V?l{SgYGz#mK-wzr%LsJZYM#u{~J)bde_ zwq;hBka_ROf*i=2pvo8qSg4c_p4av|sz2xVyva%CIfAE9y1+OzO}uo<`0ANB5xp|B5_EA?B=g}ULeh~1Aduvz-hl9 z*EHJT>mq%pLe>qAvmr^cx0sb*Hr1itG^(Oj_-xs!(cAmHEnr^y>e%k8yqUc72)<1U zbBH_cn8oADA2(yjm8#!W0$E7=cw4?PBF}9T*v8QK4C0OawT(#wTIh&YKx<#}izb4< zuju+meEkB(jbaR~B>Ou>lLFM~{p_o=lVr~{y#<3uN2u1sv6Zky%ur6c+RY}_{M)Nl zM~3Yb7^yqPezN}E{>~30cyV_x?rz13yL)kWcP(CYQ;NI07r(Rn+3%ct zzx$l??|x>_WMySCE6JNT72-J@Flkh&AZp(838<+~Q`LOP_rfoM_@8VbK=He|a$T!Z zlOr=tGKFASNDh_DX>c{Oz5-+nntnbg=o#=sLj{!`*NVG%G1M`#FV{nqVUCUe&# zj3MWw%M_s>!XPMyaM@+$hy-qd&^}{x+#_&xN;Yq~M2}1)1rY1R*uBg$AKwxr4`nKEQaj$H`z1sVb zqbC8I!G!OrJoHvNp351^(sMhhR9r4=3sXk`DY}=AIrnoq2bgec@~mOuV>CgP9Lx`m zj4bTi9=fT|>pK$=?N0Nbo`0gR6TOvIfZs})X%&C>-Y6fbTnD46$R#Z$T_W_w_89gq z4m!JSe)y1O5rN4_>I`FXM6u=)h%uY1O5&Xf$zldY>;@3x#)xHIHXFgSc9tt`B~a!A z9;e0Xd^P@6?qzF=1p1Iu>f4{m*U$?eq#EEw&RLvrYYH_vK@=V>5_yAobWh#PGI|}^;tGk0%~uLU`Rvfb%@!#>UwOt{iz3d#uv$|1oG757~`$#MC4Ik z;IiA~mYSEh87P&={ji%}Y!}9JtI3YCeIuzUB;l|c<*!iD-_Avi#T-s>9%@trN=0Qd zSUiCA!~LC>dNEFhVzTmVoA4Cz(4E7nP_>$%P&0*p*QA)Xy}!`)sa*1v({SGF4Wh-R zah<9`VnbiY`s2q&e>B=Sn%O=vz`eZHl%FUHOg;bpqvQE|y=Bz%B$e-*9I9p1(+ZT) zLnczC9ID~>CnUZ~Qb!lHOEw<$;T7JziN{xlt76PVO8iRh|q_5 z=FW;~@70ZWe;c3p1{52g5o`?*cu-3%KX!#Qgyc*byf6-P*7mqdI8n-Tes>0ce^9yM zegJ#|QD`W}sW5Z3C9}z?fm{xC0FLZmdD~1z5&2yBP}9EQd<62H{3l6EB1r}>o95%; zN`9SuY}?h<%^{zy#Hj?wrX*VJwAZ#3Avp~eI*cSl6sCd#e!gY)SIU8xe3_+0y?V^q zLUU7+8J2lS>^_#*(dDUZs3=)E_1djBpA=r~_c^#4LV_3RdAFBK z9O|d%`|5gKa)=SpT5@ESSmi~|rQMVXy?Nh{~6kae6yvXBF zwtI;F_WIxKjW0VMVUL3?W;}#on|%=GtSQ+mJZHxWZme#)t#ha-!XjwxG?~U2$WY`R zuUf9A@48Bs?faF%pzjv}*qa}&1Mgn4AB`kH5|{mGcX7K;aH|wd6_`a^@2UPY zzyP}1$re^$E0f~d^zki8IME6SOp?sUA3gD-doidJ5l2T>!awR1YV zel-f|5grPDTErx(yO~6rtu;!|lUkjd8?&wA0$Yg{-Yk&87a+`H zi`1EA-v`o-1FYFU9v^AyQACgKUm4=}^DNl5Cje2K7yVq=Nn3D^Gv8qx)&7TofgMPQ zk6l>^ApcpjPF3M_s4zcLCLYSppAYpIj4EW4@0S?H!v|a``)YfwTxAFDTgpqUGi_W= ze^z;_lLYP;*KSK>`F7Mm(r?<&#(}D3)E+Ir--mQK320x2P;`7_VYA~ew)g*b@dWn; zX+wbLq5qX`=S5 z=UC6FdLuD0d{DHwgV89%<4D^f#>IY;@K#bT_oZFyg2qt&oM#&ZdkAO<#VAN*657_4 zpG*%`*5feAbsw=I5DvxHRrs^Wr0YQpP6I3r0l(F~xYbOLq^$kXEQEzRtVL7|f- z^L*BnG5n<`*J5P1H{D*FiNU^4Zk^LB?$lv>WPP|GJ6nQT@@6!9+57Rki^9#BX?oRJ zuded3s8^|u4AJ7^%|5@lY*FevOF@M|5|y)1)^xp_O)8S7+Z|vwZ+v)YN+?>gnW&H%yIW3;k?t=JE+%R zN1*jvY$jX zP4Q0f+i+8PK&WUf8~)Yi;iJne236?1N!(|FV9(W#RUSg(d5%iLt5+4EI)LL0|f&yjDjJAKMa?- zAvpa2$}z87T;b5qG0m4xPzWJo3gnXa#OmrR-DOM5;1LBI5Dtuz#m`0c}nTx)Y#VYW8SceS+@p z`Z?wHK3?OYetTlB|BfpH8n2K^&>4vE=E%kbW^if>G?g)|_XHmtgL2;rV>rbL%5Y2t zD6&t986LG>p`qaEPwNnp8cQWy(jtW#xPaW%f&xpCaKfp~(YvzKIe{tnopvubpv2V( zAH+Zo=nPgan>vPwO1u4S*9F#%K$=J56BSGEyP@zEGqyGS4TEyAEZa=lhJ|5Lu_&4z z6)SvL$gx%gQ*wKLn>g5|qyAf**#R99nT4x-O?gmcuMJt#*Rk}u70e5O;Xvv{^`#W6 zla9-5S;hF|6FR*-hB3XTM~dVA+VcbaWqAETq!HmVpN{3Mx@q9OE4#egP6h9|z+*s% zeQR6;c%;c=>oP?mu{C%=?FihpegiHu$XQUyAx(zP7ND=NDjJxK)Gi=M`})Gqz;w&I zUEs;{j-3aq^jc*_h;OA%ow5< z5V4@r6GFuL;t~b$t7x9@jFd*54Nx=$3S-m{ptvggu5%23YaKMY@-o=<85d%Qz;QA- z`=0XNw7Rr>_OoD(b?=96-W&6*02l^2VkqKiwY*zPa)a>PPl|~E{Y9@>WQh%@VI3F! zKHPT6?6GX#5kMWzGgHOq?4PR5j`p$?ifonUhOcOVz0C%3cSdFfT~4?c@@vZeBN75E zN~7bkqZjX7LXZ>&j9sl`eXFBa*Bctg4{K4k8zutCqDxylA3`ri?HKjmon-q~+^aojcHN$= zJO?>=Tl}z@SYbqcQGWw@ixw|*p%b$p|DLT=(2xG9i+%8o12$FtpXMVdSxl)l82N(6@(8Zcg1R~@|o8szY zoyCcFi#5nUFwgqigZTc=f60Zfp@>RtF;LrL+Z>jqCqVg7w%MfGT6W$UhS4o{h*ykw zm)FrJo^re1=z469qX*^LM&fPe)M4+@QOah;|2W|0nDa>3r)YkE?=76c?}ELcN-&em=r|emr)Qu_5OSPLYTFTZ%ly&f_axYOG{VwfPhA6_Y10qQu>pav#BXgFSeR<&{MJyJ1DT#8&iyont9&uWLpw~q(Oo1-zp zvMmN^ejk1Zq0y*+1fikcePUkk-A-mI<-C)*oeW5BcG#NxX|rBAl-d?|Ss|LR4MFWy4MHFLwp-qhb8l7z5nP4!aQn4) z^@VM2Ckf(q5G9_vPO$%^x`6fbdBBfD?1$<{M_ zeM8(o2{0B7isA9k^kKB^^qw+A9Sq|Prd!PVlzI0iqo6ibu<5)JaP3@cfv&Nu(Bgco zpiMgr2~p3`iHY-hGA<0y;E*Uy%HH%a|1m*U6`&z<_)1r+6d2;Fl$YOj4$w=bIvT?r z3>wN}q%j|QY$4SrpQKO{#4U!tZj^`-KTG#BC}0Ad=sV#rJ$zWb`Zc#dG_7O#6Yz%E z3r10-Q}G<)V6F1S!u5M!wv{d28FWK~XxAW@l7YXR0`2460mp!m#2@1??0N(Xn@hL8s@Ek%#kyGh_k%^fDwoeKbZb)7iLmK=wwbYc0R&|C+#mJrItv7Dp|srGPwxuJzGvDP(z>y zy@9V9u~ zsY(J<5y&2W7!J@C?yiwCe<`|q-qoaYdi3LCUM2%4PuG7td7?H@R-oGYkiA)~OagU` z@9;5H;63SXMAGI*8*HKR;dEcURvDiHGG9PCorvdmGMyxJ{g6rU762-x%9%}c1>N>X z;L@-je()x|l;LSeW;uFqTeK476pdLGz22*QV6+x%%yo;L#>RobKibD2E&z1R)r3vo z_bcNL-|C$$ik!u~6xf3chOsEa=hTy~L^y9MZR`A%}Fd17eL>!vqo%UcB zCyIDGjZ{0GShMiiq3;nfP}_qEc1l1Sb3d3JyQ6z7=Vpx)x{pb#luaL5r3Kkee%^f}TREAabm9F~G=?WWGo`Ay z-ige2o#$*7^^Jo_iqhD%(%=1;hG>7oD;CU=gvpgWbCuF{b!eq@yKh*ptv>cQLkCTX1q+ClOY0QF+WN7~D zn$>dD_3>>3LO(a=vZBG&Q*e!&&rdjqXU{(>f)v>D7{}{tY|Co7czDA{k})6(pC^aA zfYFr(Ikty}Niv6qTZSQ8`Y^V*vNttc$9t%^ox=P>7Ax(<1G4xoQ(szy|9_c#xCMug zsGmnl4}rG+X6F1&gQSrz;2bOtu(lgt%&u@)vCuwde0FGqQmwQVRR>x{2eiY?rl|87 zSOjF~q%#r(nnIMS`{Re`!LDUhNc06i^Ei7>(Vmp&>Pj)_P$2b^1R}-pm|h%KZnA?# z%z4N|l)%MN3tzYyZZn*v1bywCHM*76B{#-q<)m{YhIAnQ{L_=jap2P4_!g76zlYDg z%sI8ObCE!xg&Y=r5lDH-C{kccAQ0+UH`_q1NN@KRG6CD1W9%XzwGVzr1F`;4t-#+x z7e(^*8lBplc#y?=g|M9i79ckTAPV(N(FN>Y_fVEOr%<>fC{Om>N^uMjMfC_^uwo%e zV7M7bV2HZ$KQze{t4B(TwE32bL?D1)UgcW60?n#r2}O%St*;{@zvx0l-7VT~ z)rH%c@&%Z-8|$)?Bv9ecG|B7nM3TZ|*g$APg)m%3KXbbbpmeqCYHiR7@2_@guJ(CW z`vPkXT#xkMVz5F+yP?`+c4iB?5* zEEe($`*GtgeFrOSk>T^fqc${WBr)so&d|Pvw&arVMLHkCD={sG3TI=QcQ-S3@~q~( zb@5&_9fZBP0GD9JV0rr=9~W%yH^+s8$fXjc>L82Dk1<&sl4F`E1s^`UB*y$w8Bp&ehwU`1A^VHxZb%z`}&BT`pzeF zrOOr!F|?qYJh{$E5&t*waxTxIHaMnN_j2|;4z4~T)54>8C%>y_*|xzs%j5yr?&<|2 zWY6TcMmyEo_TtT7WrwGzl_&8Wv>2b$pTxH2=xs#_i({x#KfgT*f~H$Hi+V(pZSQUX z@GvMgaM4t_HoQI8>59;n#^_Y~YyK})DtaRDRnng9PQOlfq|THM{>+BT*l_*Xy}2#r z}F^V3h#3hId8YrD?#e2#)Yp^4Uh2Ma~JwnTy&7yM#mG!NxCOSK1QJ9{>f$!|um%7f|#q^B|;ZsN7_DF9CPQN5g4FN7W> ztQ^e2BvpFoQx)xNbLhd1!61p{()c_3rcKk$XS;>*SW+>zp)^WawOgjSFc{>4$j5wf zT{p*8D`PgsoFYzGJw!CD#W7ui*nD) zw4S|AzzO(rvqB*Wxh(q!BFP&NU8PbO<5UTsEVb|>5$WMlqwLyYt4gf@CC<^$1O?Zs z%y{7!o3R>K1hXP)j6Gh%^#QD?5WqUe=z-%Kf8(#(>t7!}--vnMAZuddgL8amQf4_t zF0=|1@xZ|--R)mea;ObE=_GpSqW-MVaTyL2GSTVJ&BU)0*~m960Th~h_V9bV%c{>M zY~AO~kzhEJ0JP_Et~kb40-)g+sBp->k3Mf>rVGcYzOBR zeoIo~;MBGuQ4H2C2Ru$lpi6+Xa&2)tz%=|L@7?Z)*T=I`tvP&+^jw|hQO<{4ofAz} z<1cBdl`9_1-pQEk_jo@Sk>@bQi0;=!IHU3oCr;AM_FTu&cVD$0Z9+A&C z1A%iV*u&}<07}&iO|;#Pb4A#Vzt0r8R(HKt_a_Y?^g0x{K9WoLGn7M6Z)-lvsKY+H z(Q^xT97~Wm|12)b!sYYcbP#{@k@~0CP-~g?srK}p23K7CSBi??j5!_lC3>*|{;SrP zY-@{XU?l_#xWehN8URNRhlcM7z_d%~avrPHy7S%oE58DLGO$Um3JH8Y+qKuA=AUu^ z%014x_M9gT-?Bbp4c|t8d>L6 z7V@cHhk;|h{!VZ4>Dxb!wLqFO8hG{G1)aHNxu~H5>T~*_gw|V9vB;t74Ihcf!?}c! z-bJ*iO}R=3UxW@}$-VW7>|XoJN<%P#k<>En`QW#d_a5Y?IDfuyAp&K=IfTcza^BA# zJ`?i}rX5=5o0X_6h@>H4nXn-twF~&@I`QY!$H#GV903Gb#?hwU+`E`x^C^*E2-1+=aLHy76$U^Z|BOlGp)AC2U}-uL=uG z6l`~ZdVjANyb*Z(!0%gd+7m+bSDyp^v!$jz$mnBK)+BGJ* zriwIn;2hp-+LPJ>OIRBI0>r&^z*)!CUU=v{qzfjZYvuWYwD4m_Y#Bg~Gr@7X`CAiz zJrR&aJiM!naA&xs{QzAo-IO@tTqSy-q7b(3qD<3`>yPVfAppq0E(~anNBJN5+2Hzs z1NIM3H@#X*-nyAu{Xhqd#Pw$Di*Q3Cur^kOgjWmOHS<>5emR~k9L2D2wzP>d)-g!1 z?%WS_^KTU%@gH1cH5XTD0h?J|aHNCC>$M#|s@bIG5knQtSQ+2Z9i3;asq5>;`WTBE?F7i+8u)*N!m`UpxHgcBkvY zrJt1KD53LqR;Xqo{$T@J$zYS#zvdoK{lhx}f(JwTssTXFPw=(BUsVPU=r45E)GLQS zajH;GGwf(n8pg{cbaE?Z}@MY$Y9rx1<{=h6Tb;tS@PcwZpojNne zz<2C_JQ=vwb_|tB{xaPK0#D#?qs(Iipr$fby#3d}!)-f=QILmol+burDrhp1|Ni4Y zm;ZiZj@YWFB36Fvr^{JrslTK`VFZ6C8F{;%e_!)^LyBJlUQAI&wK^M+JbeJ}q0S}D z@@I>5$I4anA%Bh7$1Ki_GSf5$E3Rf9P4DKt;e~w9wR^BB#MSd*ef(Rx3yucQvy5EJ; z|HtD0wATNw;{PI~Z8jRAbhJ(--%4tn)Z$jzy1$_!HYEaCS3W83*hgE z|NH92<$;niD#SpxK*xwe-Ljf;;`V6DdqHYkGutmLB>xD~hXUxr5RM{@1bD{(;J*Jn zF%}c7MNFOlFsbw?IGmhMPi@5x`QLAUQu0v#$AkXAy7)_;EP5ka0s0XI8a5wj%z-`;H%s9wtJy!ubU&;bSX zLWd9iy?y^foAh<~0!Xp*+FeEZ@3%2e1^l{{^A0$p11^J)_;h-izDECm`PO@Or{;N( zfYWQ+u_jZerEYKY-12s-fYv7IJn$s$;2cZl$DJC-zph4LUqtUdMt3vLD{B}z$U7eD z`E4|CQprn2mjEh*o5S%^)}waq@k5Fl6+_O-C1%`sl7GttEe2To>aTZ+fA0kmWC+;3 zqmsS;y%%{@e}5e(xt0=?X*I-fl@AV)wweA_o-UZbKYrtQ&@@}+L{ZwhCvBXBnQ(vp z#~0xZpjXDt<(+0g6@OX=Di}d0QpJQ0zKDnd?zQ@&LdRS+6NRy;rg)5yalZCZ%p_Lt z!+&hgf3uby2*}*V@VJwwMR$VqkZ0<}Kb(274^hnexl)GKBz&rZTa@h@*qS71=rZ2{T-u^>%Y3+mcmI`IYl z@eot8(1LfXWq%&1*TFt%qek;56?n-4TBKkDn6g=}wVUg=j%p*G-J-`$vNFv5ODvSX zRrA-9W3hdY#Jpp=(}Kut$nE6Z?-%9=S?4N3{S&MHv04E#@H+wYUi?P*{Z^6I1YDnn zyyL(m{`quF)@Bz!-`1H{3PapMjW%Uq4OYunyX~Rh8(|5(E-wSBiz>-^`O5m=Y~FT_ z*tVlIB$Xh)q)5n$%t&3SRT~io+-2THZb3{ zVu5D^M;!d8rU{f?<}3Z%qlvL5o+Da&jChEM?E&M3KQ#3J^sv60zmI{NH=RDR%aZF~ zFBelBq$(Ab*1wWlLV_*lw^u=V1+=|>@WZ|MM~B!f;A5bWgkx_$@aQ4gy{|JW+-XP@mF1CN9D~9(~Llxy; zyvWutZsXr=-Wl_31`X-r6~FC2R~D zAt4TrrP>c9>kSsz7bBXlroAHVdjHqXtVVRj)$#Nv(G({**eu zv-V^36cZ{~%S4%|KWlHkrt^BJ*z2S!GmNDZ9~OK8qYgxt`s7dq8)=d*GWNr#kGhyf zRR|E1=x~umCc$NNT;3I-tgzXvC*IcKt67~5Ow1d7^yPFKT9wKKzyOBJB+$uZQd#U) zOxR8z1c0R-JO~iGjjsc<$Cbhg$0$n3#I6tRH?C$W;7$KDi9T4!Uu=-H(I+*(KA~s| zLa)OCtF;5Yv6LJ|1v;Y;sY7y>o6=9R+X&ZdgXS2|<`^w8fi;}@fFL(A%T*+v%DI%J6NZ8GlS$NImd_lqrq6?f z_xyFO(U5(Jmcxv)y~mk>{SY~}N8U#`u5u7==c9M2<>MM9xDQZE`BakHv-is0VGS=f zQ0Z!I-^pI(5y8kTzD0Uw7?Y)%Rt`7d`TnHy91NnmMr(wT!kTXSuIobzi$o9~Hl<6Z zOp}P9<}7I#`sD#AZg^fSsodHvI1f3gf28(&bW*4r{2ohf*#G%Rr0?V&d2n|BZn>o5 zL~7`q8#{FH~uCRhHj!FTNk6J-v`g zGwviF69vK+G|n zpBTL4;hoT!*p?gIF*}sOT2hc`0&BVR1O>ZUYSV#$VJD(I* zG&*KiNXODSOS5`KZJH(cXM4;ZE0#PiT~&yDI&5pc8EXI*Jx6b;6b>%-A(H*?EP50n zkjni}Tycxb%bNr8`jd;J!klCK)Vt$z#^!Nh+BK{&SiyMb8_^}#`1;JH!>X; z2#)w|OeRfA6>>i?ai7+J;W9=50X?(Da*s#~wy$WR(6oH!pK2*kN0VCxp6(8s9-7H5~7$M9bq!nPSie;kCyV z;U@MMe@&Za^$*Bzh}92<@Y^lLQ9dV}*?gQFE-$DRh-BXYaLz9=twX>`Pj2TqR((`~ zBpol~gJ@k{|Pcyt8@rAy&5<+cz_!V)`5S12L#yFC;SOvZ-{ zk!NGV-}I^mIVXiVFP(Lfx=#j&KuI8BG04|hUU{(GUbk3OB)VXaF@MXLwz|4MfEQ;Z zw`o;2k@fywOTU{Hn_#i;k_~_jqGSB;+zO;*d^6lHV}M56X_=>Ay)KtMNg$B7izdHX zvxbi4!W{mg8;{RCoXp7URjWPX#=2cy?Q#LJOqPx5m}Ps3`bjMVuVPEySDhCf{R>Aw+)8!zNLm%xqO>Xc2)op{Kf!Jc;9f;@nN40CiO-hy|ox zwgJFQV!qboN3^WR9u**mfDsr>T|E{2167$lQt!E{PC-=Dfklu8?8-232f ztJ*Fp+Wy=<%<6tl0E_XIMa%-725*Lv*#) z-U1B#TcQJlp1z-cZ*0uZvpD;)prKF*eU_^gVP{)*7@A8a5^7{nNmg!Gh4GyM0?6T> zH*s~bB}l>Ny{MX5 zJ-18avl!noN}3X z*Y0EN`w*(8_`!RrRaT`^v$9u!S?6j@GjsoIa{K{MHqQlpg742;uDN}mV1JHDLA7u7 zM^EXOGP5|rNn7BH97H-6Eo7xE&;9m(4HR*CX2iA^1|UfH-!zcd6QLaaG#*2znT%pF zFB|#{=b!4d%;RP>;v%pWu(uJ3ZNSDp(A->M)Noa!PkSW(Z zA3pYp|4NQ7vnnft$gYFW{Znk;^w$KK;JzLLy3Ve-*_yCsO!^ZPmE>Ig=ZTD9+t)po351OGFBhE3Ep>(?W4( zU+{r>S9HLTZ4m^X(EDS}du>3#O#8?BSy$&D$+OF#Fh7(xhj#$1UcA*{$delAjW{$v zsKmOFPR$hfLLm<#>a~(21$*5OJbQNvcQEN_Eho#U{Z3G= zdm&RB6Y1h$%=IC#B5_H9zjo832J1p|JbB#6kcmvfR^p`ye*BQus zC9krHc)|&Iy5zecB`PE?8d8;BTooH%nEpbg7Q_PPt@tq@?0+0QF$TuFosR4zP!v}+ zuDI#WI~^6rUAYz4f-3L7#u@*K&zcz^Liw1*@gt-+Qf6Nu{ip`RsGEX*e(%!oOB>qz zn=H0s2cTi9HIGVM{LG5A)mcc$)cj>fHIY)Mn4k%ZZxJP=F&0#{9qiS z*KBm0`jMlL+vidBCNMTg(JFD>=F3d6mr@aYMOJQ?i;8Z!1&M2Ov28{Xm7JruefB|bd z?jxnM&n-vkb-YKJCtQjx(~xY5D1RAfnicO%pZb!1n&5rMa?^ZN-5o$oj}RQCX!?EH z*wJiOGSiJjFq`{Rx4y^+NsMnE3m@yF^X0l}bG;c6a+?L?a>gfbs`M)_WA0BXQmA<0 z5{OiK_;g!&3gAyeXr#Jdv@Ph_Nfm^@QLOqAU%c;+oY3=$JF90GXz&0^H9|~uhkiX- z)dG)4Kx_LAZiPdxfWc<^c~@Y+98EcI5jG!yOaU5*i06@T}lJfOWxjOcuzYSo)_RF34gq1 zy**yN`It)3=#oIoFt+h_fxB=#Gf`hRA|8m3?fk-k4!%?@w=v=bF4X5E%f}1YH_hLk zxof#2W|=~AUKO2si+7P^UjJk~1L0YM1G6)5w&v^yspUVpTa+6B>rD}o6Vm!Bpxz%A zd3Y;nCzdWrE0#kr8l~v`EvLQ6In7m%nk>bFh(wcB!2O4XuLfsw{)LVcqwM{+&7uoF ztH{(o172KXQbW@Wl=F|*OYTGK#wTX^5sfAvKZ;D%N*>$>mJR<<2@Ds&g5W1g31lp5c#_6Xf}A@*kS{f!1~V={OPz~*m> zR;b$hT7Ft)zwT9*H6-=$D=Zt(hZqLXT?|{|H8AL5m`xOm-)=nsm=#Anlu9n8_H7}r z5~wZSBfpKt=XSAx4A&g`u>@ClF`80qZYfE-H(lr=cCdj?`ElRs?sE9Cp7l#Jx_{rZ zzx{X`y@iVCFPg8@1|)CLhpY4qk>FVPt)4~Seb{UziE`dRoc;0qnwbseoRZ zOnrzCL{RD%E?3?P0vR?{_k&}Ev_Sh_-y>+1-}w0JF-W-u2mxkhVFs($lHHtP6t!L# zw&hJd<@T!<2}9nibp{CywfVUx^>K?G-5)1*Kf05fM-n3&bPsHvb-3h+gebi@&ea9@ z0kBQSHj4og=>giq(=}4Rn`>aUg*Z?sY>(Z22MTi048SQ zkupz9@1z763xqHpZyuLnxkKgWBgn7KhAjM8m z3#C#zFe)im(T^(B<*0o>CDeubVN4>8t=vpww4sgP;3YXis4%pvmxqfahsfkXtuAGG z7^@3VI+4XsYWI1h;AA#Q8e!JnRyw_3>6EG*zuVh@cN>xDJviXD>wKzL1uC1JpI@i) zm7j2rW>F$ZG|GAkL5p(~Y56pZG^Yn;D2PniAbS@Mk5j`iNT}_ye56jYzU^H(h#N!M zLi@>0bXaqFKiEL{TJ4uLBkdtEC4UMs$K?CfN|~^h`1*M0oxHbM`?cNARFwm<|BuW^+*;U+K- z7Z{#gC>kM!kWd#6eK}}q`LZGh%M%>qk5p8G64Xji>MxB`57r}! z-;|tR+gZz!-$R2kV?qbWAgt0jGs# z2az=fSM#5b?X48L{)~dA^5-kG+wZV;7Mk4fGMpdJ^S%36g(Z8Os_plL#6nmCwm-y^ z0RjEH9Fupf@?d&^FGl+mu`fwuS_I!2H}#V80^=6EE0Hc7uEJ{soKNOE>NAxP^A7J`gROvTNDGvts+SQp-onfLe7wq5l~o0t z4PPr@GF5cHEE`Dh%Vm&%{R#aKBQ@^wIat)g>tVhtAs(nsImy6mGz6J9z70e(YjXyJ ztH@zKTHSZU9@gxJcp%gi+R!uV74Lg=o+|BLZWSD+kBA}ZB zN6SbW9j=)w&J7#~GK zqzO}0hJ?lM_=MK^V@d_toXbl`x4xfDpzvFV&nW{7jlHa3F5@ z#_pr2i}(D(Z*r%(lK~1nr zCc!yf<4uM-7t17~Kih?9PxTMK)tleNipaD3@qDC)=77jj5D(IkE%UYsQrG}Eu&5C; zuc#9|ifIkkRLxmE{KV0uX%Fa`>(WT%n_S?A(2-Oua9vRkJN#ZSV(ScM+U4i~+q z1Rpyq3;fwqC6}R$Tl@CT`%2!aX9U7GoqCD1`HCUVNP8H43MkT*zgtj#Oi{ZGZll&5 z4LW-*R=a98)0CbptTT$a43_F5IZXxDfZ>#q|3-uWxA0H-p^q2xSBykX(I=(!LSw&GM;xrp~M2+s)P;9#j5IZ`p_v?iD}m0 zNpZi(A9prxbC9~}R>Alsp=iYnU;OTgQJY=%ZG+HwrXj;pE5{vk9>|^9OgGa#(8QD4@ z$3j#=P`?TdA_@RcG;lk51gIn$MlR(BONfXB>M!LR<~rlZ+$%;~ml18ZNfMkct%HvFFB;dn~+n?KHL9^Z*hfrc0%==9N8B?V@9A z6!e9CW2AkSePEb7(pwHHRm>KJ&_yk^QqDV8vSELK+s#)z^OMRu=Aw{=mV1Pw*yRJ3 zaQh-vT;Ug2p|vB-dxurxH`sJKG#MV(h^g(GK|juwdZEcf1VXH)R22XSc#tMlzFt$* zYa<*ffS@Hln8Ri;-d9`+hg-1Dk5#pA2*4QqQidSW_cztGt#IfRpY;X4-#{`>QoFoa zIN6T;hP&Fg= zwovi|@n9waXz04?(*u2dvUicmB6*()<4V!BI8NW{nF|Vd$2fXaw|024ST9CU^c-Ny zEyL-m0&XdA$oLt?d}uo2oS*11D;%|NS$VyeJvex???uI<+|k;w+<1T3MF?9D-}G3a zzhBpQLYGVp^u0&mW1M-{8Di70Wg=+4O3;d`QQ!Q5AfuNkH*yi$ua9#}k za-EF2o1s5yVM8;uZ_&~R4Ap-pMU)F6DAK`R?BHK<&>a~S$_kk za15kxxNoh52q2ekMx*67j2`ehZUzNtE{HDH-4JW<`*aQ=dMNtQ3|+r$s3Toy#0PW$ zq_edAXe~ow^n-ptSK~(U>rfb0H8p>SQmu~kw$=w>?$Tu+!%^E}t!}YV!57E8R7VSW zF6?YN(3yogpQsPmy;F-kp_^7}4@HO`u6McRw&}DiVegMTA{@5csq?*Mf3b?=ivYB% z=2zqV)8e7ao^iROCr(*lng_e=iqIWq+e*!QZ&P2*RxBBqS@LiZc|@q^bSS|2_#g=& z*A9#O0L}+7GuMi%GcV2?AgkOt5%VnVdY|t#V&Zqkm`u(t4|?kGcW%nEfkU_q7t?C$ zzbDn|OXg$!&2-S%Lmuj$L=p>b7%n%Wq->cHJK9=#|2%vO?@uP&@|x@6d%5D)#Y(5` z)Ft(jB5fdv-bRP4(LVC~tz$ozVJOvGfHIQPO@zzlGGb2L;UYgU-%XxyZiOP3gaHFg z5J~=TyiEZ||53Uk_?=@@Vv#^G62zhCJ>YZgq=4@dC8zL=z@2|Evk|Y(Y2bt-Vgj0p9yk@1wWTqYyLvjrLj8=;#bh6p%5}GF+CV8BLIO>szWXE$nGP zbpW>C0Q;a3*@-rI0e?^ zv)Fkb-9^lM&sMSIZYA zY3Kq}D7hu!=h^VLmm5)L`J*zrUi72`GD^prJ|E)Q*yS&k^L2jRZJKc*i8vLVV=523 z04117!`J<94B7Tj^shOAs3Ne0hvgLYvs$ zDWu`DUvcqSI($du+EV>W=ra)ibBAf$;_GEcB)!4ZXj5I&cx`f>ye6vG%X&LuD7)t| zrE>W)1vk$eXV60q$>07kD+uY}hMUJlUo9GHUH2VODG7Z5qw-6qQfuxyxRhwoC`B^nk9MZ9BvAo{=NdQJ;2!~ ze}zP+G~&=y+wdsY3T!1qjAf`c)Kh&rT1*E^nNvSm#1>q;|eX<5hOD$+NxJfjv(* zFcr7XDRLw1@fhAEhPw2C&kOziOQq!9pf(@}m4 zrP5%saWk`RKk-=PFO(HuxWab|G^9axQ4&UU1J!M&q-Dl0FfwK%Hxk~ezqBD>kj3;C zlHBRg4)St2^?36bal*|9IaTD7ON;Cz?x-bIdWvEN>*{c2~(o z+juG^X;1zgIpr{yX590DUDv<^U5Fx8C-ZrH*a}PmY;An2x+5(#=Bg~J@7U@n22IGC}|_8(O$ z0e^8yZ`w_@2qE9Y#oCcbH&p-mfU9Mks=8k(bu736GoR0TvPQI7X;4F&R{;syOJ(4< z9W5Qi%_UM4zQ2?pDJBMgssMc85T9i{-&BhgO>p=G_O4q+h(fyrI;GhU%E-I*NN?0{ zUBb~q+`ES?rZ0=x3^7hdwf<^AjMgw~Jj5!2*p2b#jAB}4=U3jAAFlI9$7!DoXO-7- z>|dX>W^3G7HqgG;{-9EEP<6|%P`f&=WkbBxy4qzXyy~u7 z<=>Eu!MK8#$SX5g_xr&}1f^}c|1aADfFZCFvVuj0qc8Q6fk*-VG~KTf)SDu%kK}<- zBVLS4;XXv@n~8BhU0{CZS9Mgt{UK)_da4(n;WIjE(>9=zs zR36cMD|sn!QwO;JCMDY#WQ+9`dPutF@K3k=)Fb-r zs;2q-q}8bZJwJ*((s2mp;NV^K-Akpi_Zi)@Hr2lJ$-hlgx=-Tw1Z2*KZO4KtfeBf3 zEt%xGKNGUX<>X-hHtz4%WPK2d!jg~ks|PH<3bAgl<0`zJ6XM~vh5LiNhv3+qem}Hg zNQ{i!O5DwB4FKA&DZ`gO^R(lSTX!VTXA|jBabKiv*;=lS04_Wl=x2U}MlS${`Y>4k zZafE@=HLf>TZ{KywbkS^-{1KX88lE!&F(P5NyKw$s;iCq*Yart_tYa$`h>)P1YrP_ ze99rCS$>=)9*ZSaL!ED9+dc?=N>)Tg6@hcemEWEDR`S6=;2)!Y1vXE)dI8ofysIoO zogg{o-H+s!=lctCB`pQtO3<^?AtVi!ah&jN*?bcN(H&s}?y(0h7@_ZgkQYH%HzN5M zSPr(Y{&ZEURgSV_3|x5pW-T8!UX*xe$US#vZ4xfgs8-{-bkmH{dRO0UIV&WNjDFF` z$W2qCF#SI`_1ohR3?t-lC{`)mu#6SS(#WR3WEj*@8pSc_$w;X*3D+*B%~T*WwRxUi zD<)y0`p*^J*hwD21~`-cE=P8(@sDR(mJm0@yH}zr=$eT8G0pyDLNv z7IHoWEUwtv?bZ3c*EHm-o|@e;7=phMV7U^404ss7Co$dO3h=QkU%}OqLWj%?-$K8; zJ@+r1-|y4pyxEP*cvXE$a|*cnW7?*n&D4H{UhfWAnd$(gSS)ThG*7l2B@6no zP_Ut|I&Ya8{Jb4~XW{uq2feF6UO@8%t4$N$a7xx9@x00B6x3)frRS8oUtZwfPz6Bg z7>vJ!`Fu2r={+2gS8Jx>X1c&~l@%};gjK{06$YyptzwQx`EHCMXhq>l`Jdr4V$qsk z?(Tlt2zNU}_hVVod^bS%(&1em(Vo(*u6$x{L2Xqz+tNrt_kOIFjk=y`(?l3NUGdUBzFAi9oE|Hwyp~^lkR>>$o?!vT}O_>GSQV7G{FBIpA z8{>Wqej4QCNH}+MZJ$9n)0#0DGkh}3m9qm9$bYl+r{t11zT~b`^*=a)$+GuU#5kSr zY@a-8%D$T>Z7svxPAc?1N(6>dKtf3$Q1W?Q4j{aid_^&hxWBQ?Yx@R@oAY~?l6Xe1 z>>@~3n>Z8M+-Sa-^nUvh`O|J~hyw)FQLOgz9UuIk6VBOeqn^DrZe-{9AFce$xe!C0 zNS}Hh%aw%@ECj2%sGTnJ!hRHBO7uX_nB~~7W*dT{reDB}KoJ)3;y>XL=|e!u!2Mvb zVYyhg`s~hf1V-aH(2j0s&c$)*?7J5li^V(EBk4XtP}k9VJJp-*-HZ_aJUfhRsq_I0 zbUfZv74Tx&U?L0m>gfLQL&$T!&2ZNz{`*P+7*&$Tw|$-M7(amvOw5Zl_|8eAr*biH zZZ%0J;kye4|K;9qwKt9Qznk~#ry1hv#f9y#?7sUZAxMoj`Q#@8{&#*N+&u?=(q)Ta ziL$Nf<#Q2VM>fR%%$qY^3Ivp2%2G_TF_|b3$-iaC{zHGS?g%2oPcTd(@-O!DdTmig6{xwCp(PTBeE=fo_`7ed zVi=_42&Y>(+S${94PGjRz9HFjM?|EoLr<(M-B^Um5#Jo8V|rDVAE|HFn9I#n3cAr> z(y|w-3fimS{Uz~<_jI3k_G)TOt6d!KxIbi-zeZvkg(0H{y!aP0O2{~Dkm~A2>VCT5 z#6u~-M7R>dAtyY*QZ2z0V6#V$WZhSIx?Y=0zBTH3z#6%lru*)XDSzeOG9bmvyxz+G zZGj{DH{)AgiMUvMH>eg`tvfE9jbR%B(2@a%_E#r!S9nkJU3CE$%)7H?C#=QPXrdq7 zNd11GLZ=3jRF36}{rT);AgjKBlaB^Pmlg9~ONW91eK@EXDO>1mvP1Yvh|G7<1?^}^4;`iQetOOuAP*%-R0RC;B=OM2G_jAGwh+8GcV zGdpNrv^L%9pF@&=s}y6A6`wqW;0bOaQCdRfs<)&4I)Z4^Mw_68 zx49^UtvUPal0b0?l+hnkH1feyg~xkA_cm^aG2Zl?aY3ivta@NXa&X|XtVTMZNwMr(Rc}0b>xu-=G=W*%hko`M)1@G^vGtnrziX%*h-~7b0^>%n5 z7x_$pC0(hyZMpa<9+)B>kEt`k8IZZZ_i&2yaP}(f#d?0VA?9G-0nYa6C#05VsIB9$ zWmK2NPXwLN0SLh3(pU9^3XHqyY}1aE=5VbPDOxg{cg=?j^yf;%FHn;Vw&0Y7DaX(h ze7{2xDP;lJwLeYJ1)+_ydzk%{cs8+tHf+bp4LWnoOgob{1YNS zwJpg@JQMR#FY5#C{h~rs%5Xd=L!1U>RsOFc!~6@cZZ6Mymc3sz_Mmf<#7FPs(~AYqdM-BX{0wRK2^53?mO6B zJK)G~rjMr5*iAif2TYkis&eKIQDCu2vkv5T*Y7SjACcdmOY8aVK zUX_~Fz)Q0{Udd{Wr3Xi9G2%q9$p=D}j*U$Tm20e|X?d&%MUuGfGI}qkONKzKVr_jP zepH~iHQrfqaczxq+l&zSD1BV8)Ja07$44G&u9XLb;OwmvSW-FMy^b{oh7ls&0Mp{_ z?&A6GZJ5=KGgA%5((o5$b!^t>@D3!%3T>DfD58pQJ7_Xie(&G}ZOH4?{=Bl*WC{I> zrQz>xaAe!iMU$DWrjtzmgz5Y;sIZO3>2do!jX;64umnYvq9uZuF4~+|CgCT%Us3~G z-F_^O`*X-QiY4|>V{=W6Z@yK8vHHs=sxR^=%js%ehPgaqob4=?P8pAs%4M~Ei~v|W zEk3h+BQaw>B@l*m^LTgocOet{uXi=Gfv+?U2i3j@mZKyaR&Fu6213nO2J6q*Ovl&^ zhbCsoso$;en7S0Jp7Fc_=~ft3V-A2hBKKMOYHXM5rMu`=a8wJ`#5cSYCW||3+|a*RDU{+}9F7TIpY+gzf~tQ3g5(ekpHj?-ZqLS>(C-qq}*P(O3t9u=2qiF0s!Yq4CxjYiBYCc>Tc0W9Ok2oimXIUAYw zPW7=F#lb!S#{bTt`N%S1DUzXH=Wbvt*s6)k^_a4)r}oCpof5=YiY!uSA*8rNjv1t& z(f}W|uAKg!Pvocdj=SndkGn1sB6~L^=aI?8XfavJel9H!pY72or-NDN*^~}ORMC5^ zlbe;1_IR)NZ(G=i7VxRt;Jw0OP({6MMEvUneC80h&hX!kE_!14*O}~XuJwcpTa0Hx zx96g>_Y+`n4B%uwBVY5tHhuJ=6H@e=@x3~1PN*{Ea1gHkY+MCHQA}>wRK`XSNID7? zn+%o*!}0^WZ_hjP*-SQdMw!mDg$p-f85|`;WosaeQ?C6hQBzVjn%1lzU3uJAej56R zAfik6wclFQ*{{kB81Jm?2Qffpkhl!;CEk|4MFphRX$==7wEkw+ULo=B&DC-3;y29m zYR!HZt5Ukd6KeC_*ZIcc3Om@MU5LI>d)DoE99(!j-Ga0=BnNP-lX zfiG(sf-r;no!E!eNNPI2Th4yR1RHT5i!siDON@8Ar8e#vC4283ocD?pR7e9Zi?E>w zZNPp-ZOR#lf>Upv1Dod$Y`=}4!^_pGZy2UnROFt5c$&Kk!74IBM|a5oyCn(E4IdU5 z`u-5N&a6!`)JtROrS!-3rXK8R({_HvwjqH4u`nuzM07+fn9fK^cB`)PDvW)@jzFq~ zPrtCU3KT#$+3elGvLEnQygd$^9Ey7n%d6sZm14PPCs96q`}ry*4PB>s#h!Q~%5SQ& zcU%t^?Wm+ayuAJ?;JOR146F-ropkp&5b{(aH$Ng!FFhOMDe;KxWZ9`nL-_f8%+X{7 z#SVt1bPI@IdE$kg*lj#K*%Jl?ny#2`xjY=qh8jCrSt6~XikD{;`(Z2Ni;lY@#M;v@ zDjQ6QFEfpXJcJD3r0cl!Hm-R*NL9LgL)omBfDLdI1?)KS1?`p^bU`6=X#u?gdOD9( zPEpgk8F_$8J^*p9^K)xZ+{r=X<#voB`L6zZD|*ogYb>mR-@8+U8MGxhWrHtjA0yFn zVtVD%fx85)x6<(kLw_1OYm-r*$NN15#Ek7of!YjjM8+67kuBMWl?H_8j$_dtMG~P! zjz-B%{ACIg@UO)YxM3e)$bR+e+A4TMzD?uAzj3I5q2@H|ipiThGu(}(+rG{pSE*I} zr06kyWJRm!5AR}yf|8N957SwU_{c+9GICmvYvIhEVg8tgXEn`I+NjMhut3$b;r|Sl zzhy|gPdCFn@pX2d82!L6+KHyKOYt^^(U6!!BQU+ zBCk-LNn?Sfn73S)RkDA0Ggd~cRs~mW7;lJMXL8AcpPZ{j4t&dhUzbASoPBLGwofM? zGl8uHp(Tl$^FOc`HP5smlWOq?f!i70wM$SPUYp0kPJCw{Yih`LVAsf~u#c+ivQ6u) zAhCY{w{j0J$U>rAX{)9c6OzZtqY+D7dhhxgh80qY`-Qz2u+RM(Ia}sIz?XFKkt{BM zv?0HIxb4>7`TSb4pqSBb3#`njioiaOzIcZXuiU-SWb&wb@(w;7^E0<2#)GE>g0wnl zHq1!=f-B%!LRW|Yp)Aby%R-RoY)0!PG-;9^wUx&AJ+AgFwtGLnWO?qWV;=n_8(2bd zO3&lsw`_jWCE4)orKltogk!mky2@L5Atp< zT@-d87Th*++GRJ{>}0;>=91(k>yLYDI9L))#_u6>BdvzH%9gK$Ql76!o@X}oer)Vh z{+ei~2s!%@VQZm~q6Twwwq{L`bQ;^&$($Z7^ZoKfGrxi~x>`UvRIus+lDAmRvCnKaRt)JN`9_2 z{RoF4Ti$%N8KF?6vW9(bvuk&b5)Ki$fFF96K?|R0U-^(KEq?gO`1_ibT%Qa~GFsu0 z3rd3OO<-(Ybw@UkRQ(xUO_b`D2(24}9CPdiEndi0Q^n$IF7P zj_K+4C4vS1el7%F(APlpd}62a{Q4w@+-kUnNa`~p$38)!Kwi>3MH?X46P1%x@oF)Q%Jn;1Qq#wjky#izx!^BD2_ry}#4E>intbybMP2z1>iPVw4;RTBq%nXql&$ z+(RK>H$t&Osb*K(t)^zOsA%k1f@pEb`r9TT!oI&MyiD=^jBRLECyZJ6il zgmD)2N};Ni(I;>z3N^bE;{#By+TE)VZ+f3my+nOGut&K(?o~z({Vp4dPPH@ z=x-}HA>*ba(<8{NC+~LK9XnMmH9NP(9OTYwQaf3?xWq7Qmjn0J#ccpq*h=%BsB#vMnuKWR;W`u2@By;*KytjGJLAQE7_tZ~J89Yiu*?tx9JJ_F zE_g~u*Mrn~eNJgLnaAm7m)*geR<$YbEe}tHnH3C0Yvu!&)N;8e6T8*8LvVu3XSelW7fsR;l9BXQOm9d}Cns_Qhzm@3`s zThCN^Ae(wh?)2NLi|rHRe)V=r%)nlcZjpm$>4truCb2K)vd@B??cZZaNT<5t{iwHS zTIO?K6X#_gC{Sgm?q;h`SF#T=88bW?Pg5=>EI|_8xHhz=7*j1C%xr!T7RQ2k2ggj= ziMIWUEE=Gd;Ow)+-H_pazqN9M-jhypBcD34Z-t_?Y%KxJzj&|3pl>&wH>ptJ@c`}BPO4F@cp0AywAD^2A zLg~dT*Iyo}J{)>dG#CiA#0xI-$_B=bUg}UdfROg+imzUqi=T z^R2eyY+734ru6hmgTvEYX0;R>5-dc|FU&a2dq=U_)48N5ccU6ZZAnzX62@X7f&ph& z(}jc&SLO|;=LJZvgQE~7ae1oWVp#clZ4tpi&X2#1EFGkR!o-V4SPOA(HpCt5G+RYd3qB*O75%D+E9051@WwxJsBsLcfDeThD2sl;6j3Wy z(PM~rQLe0+$Wg}d&Oc5~o>Eu~yo^^=-eW)O=m+r+3p1ePV16Zt$Bf$$3Pu4Ys{-Q% zdE9UH3lvMEkc8Q$BrEao=!`_#5tAq~yT_w(3q|L;RYSY3cM;G?y}mK&)Kskaz1D`( zW%W6T=p$b4igmFKIF>P>6xtT^UST?~WIo*Dq80}h(iZZ#3h3ld&00?9i9M?}p2p1u zcML*S&hW3$XY#^zNkjU3otvB#e< zChx=2g4*N{s750FGMG!f_}Lr|xB$*R?5@cIr?`Z*j{ieo^+t@s2yLB8{437JsWz0w zter~H)^MPr3;Ysf%7uiH8$n|0yx8VkE_Fb5e%D{$im~03wLG4iv|XPh5decIM7e%? zR^aw?#%@1S=XORW4;i%|Ex8uYn^g;>I!->(gFWFW6h!;|-u+~a>Ym5xb=<^dq0p=n zi`KFSJxElv@Uhmf;j+BNcebHt7p-w;wnBCt(D=}XZ>)z4ZCFj)DNXV`7@O$GX;m|X zN=+cYC@6bj5!3S`vw|wL<4uYs9nq8vg$io}fG&Q1Hp~>MawrOSPet?eIEX&TgF`?9 zHCham(nzLA=xmLowSFg|$=p63HKuIjaX`RpqG$;U5N+pQ`mKkcjo)%6}pi0 za2weTs%Ee=7_<{H5U26kKPu8-=e2XF2SRt*Uu$p5z=y8q;g3*$!hf4Rntm802K(;T z&vQB$gKQPIWceFbmD!_UJ2$7-2Yo`>)sEoGio63`?n!LslFV)830g%Y>CK3Vz`Zg# zR8HSp5&8tC$fcHD#U7j!KHl0)vb|}=%7oj=ny4RoFEL^9OEq+LmXDj*v-IU1jcgXtt6$dbOtg`=Xf#UfGehFjKD1#sbDCiw4&no zh>#))yQfzQjPK{G6WFnat>L@N%B_)niF*3m%G$)TvAV5mo1F$1fmV+Lp5n1I*%NCx z^f68_%byym z2RFlf$*mrFpiBBHihnF1{$V7Ug>-)XF*R#4eo7&UAU|K&T@Sqdu ztrM5xuc15630r-$X1CTRK03YE0|g>S{7spxkt0fB$IP@A6R$neoYgtTa;%as%2-JO zfTg_lZ-JMQ?^~TFnXO@cluo=RedmU%d|KJv*rn10tB+6g2!Og)VE<-F4B8M)Z%&q8 zNPls%Ft4wXAqWgEQ0`*4Y#Ozz>L#2Za~UPm*zrf8(b)8lnev)=2T!G8s_cACt5Yb5 zGX!2j;3G0I;TCbR9FI=oynHm2AK8YQg_$}SpN4VE#kC`%Y3wO2eqPPAcv#!;00q{Z zuD_rh6+fR$Qx+xdH$RVJ7@ z3UB9Qb3{!^4dVg^@#U7 z^2kREN(NoV;%mX)lc&T&%f=BsI z6J1-C?JJM(!K|pv??&gl5=>pmA3Uc-LC_H8kvJAAu;Mz|uF`v125%Lds5O3s(8RHP zA;nHfX3%fUysN!Y&H2)>a|vxRM~EpO(wg8-*qY$v*sF*eX5rh=4Q9h)f~hy<@C{C4 z8MJG>SGTGfHbDX=rynN@r4gA4S8qbMjG{NQ2rDmuZIc_Qw8A{07Z|^Sl?AktkyRP% z_aB1{%C4s;iwe?@K9>xkJIUwoU2*-LR4ZyJu=&a!}0{&5@F{1`;5UgNtv zvZ!WcrWskNEnliz!KZ<~&u)-sdxCqywYl;!eKi>KJecPJ;%{hC2Mq1cJsb#E*ms*@ z5qo~h4X<6JIx{NNdM2h}gTM6>!0=lo3ZRW}N(o~D2eM>-pR70&7JJF`!f)0~hicvr z4zwSzSoYV>?#n^O^ovHP!*~d@bLH2F*YZMsc3Gb`kOmqA<_41jA=VMQa7q z_LUx!To(&IrQyE7Y|I7ji;u~tM1Jq!>oC^}-sUaSq<9|*l4Y~61Ji|yC6p#2wVuwl z@@RY70-OW)e(&-n3oj{YX|&1|RK`||OK|{dwuN8l5Lt9mQfEe(_04!UUp%EeJL%K| zbG^9kiHI!ctqF;Dqbu~tN}IZy@XQSxawV#XxKw+RLbY6sc{EgW^ZQ$t`yCbb%KE&Q ziY^wIL*|ihBQkxuiBfofGI!d1W*LGU#mK^$T~uC4;CPL=m8SV2_>g4kRkWzARH|c5 zZdp2{Xc~v#owUVA#2fu07lTZIAZGuIChcxy@Cc$WUdyj_hm-8lm6oS$Vg;{3yKD6d zTjKuaYTv!VYxc22i<}*Yb}~mMF^nar_8|d}7R@31uiVoHpYr+%tx3{?7rPPrGctQn z1+zOpNA}ASP2`$}6D6RGf5RY?MSStn=AwhA69w4ak!8bs`E%F#rHHdxiORw2czT(E#@c^=5Oz`+uz%mpo~ zy<|J_oVkIGBzktpqKeZ`6*Csj?;2u;vo@i~T?1WKSH+&K1_tE*dL2~M1s-)CP%yiD*_0^LOc{PQ%0MZI^C?jqt(jT%qe;EXo zP-o;II$PI5LL7}wQ~(K$PbCFeXslIl8R%kNz05rOq5yJkN4f4ji4naheJ3WCF(XzrR1rKePw@xi<9(*613E*n_&#v68|_8t zPH5v46u`aD>X2eDQkAZC={PcCdES1gG12ahWVKnxBpJK~(MmG0(wO1^i?($FWKo(0 zz%x)4IM=4^y9E4(1C zGmF@`fjR7swP@jJs&ht3CCn^<65%ZL?z5%4IwR_vVXi6bRC!CiN#BPxDk45Z`g_1k zhKOApsq^j4Ps6S^dyl4sMIgtt40@?8iK;`%aKKL!hOMQ;CJBvbN z$e@LU_EemVu}kQupPJ)Is-A2WUX@yGbWK)04htsA0y3iLZ*w1QBuCrD$K!Lw*Xn!l z&2M)!&({`F`ARFFfJ@B32QEUs{*@9cYX;?cuYYL&RofjSz`6DP9t(sT#;DNJUC z{ATOr>7~_?8YRSq!&5ecTgb``2dIKyK`DfL9H<>az)TNUuD{XaPeg`##0+wgpTiN& zn#(p_?({W|YP8@>Ran|~Os{s;fn^nILsd56H60IvHAOCf==vo38qBf;0z+FWx0o!a z7---zmkjbnLK4Ctbc)XhL^c_S6~aQ;Sk0x zf&Vr|)7c2wN@JxHyJ1XlP$gT4dv`XQ???1&5jh)eHe5AP6Vm$T#}&V_x;pP^Jwhse zDdTpbx-vr~Y2*$<0BHmSwHX@I{CwJJMuEFV;qm+p65T35Byb5(D79l>6g;!i7$nX{ z&Y7~Alc|BAe_65K>1Sti9aVZ`nuiL}oHxHqrZID=wp=VlAv1)nQwuNfNP0u6s$;E# zJs0PZ(uX=w{bs5N2S+B$9Bsos+-kOpnQ9Ue_r)H+q?+13xL4O%smy>{Z|`SwsX=(; zc}-_Yo!SqjH;@9(25eE(P?OG2CL@+Ij=cLj)dOlB8fwINT84~VdJA=YfgBy8NKV_y|r{NJnOrLo2tLHLf zc>bFa*^g1t4UN~*(SelW z5x>+(bV88d`F(%YMz#_V;jB;_xTVeTDxE=7Dc6Vf2OmmnIXr&w)xpc!)%4=e0blzdRYX_MZJrw5@~LKa8?_Jkt% zbFR@Fpf3Dw2?{O98Vby?Y$&8ujJ>E)P`MQM$?`tCB+35CKOq)^sYi`)i|3zOIBlm8 zErQHGT2Vh~QYrW0eS{X+ zM!vm8E7orLIZ40Jk1Omc>6G8C~e>0}g6E5g0DXD2rN zKLr^<>_?(MJ1Z0>(pl3n9vHm(de+yZGk)jg(@HTzx(R%#HdR;J)jRkv%| zss}+UU_Jd66UA*8u|oPQp4z7uXH(vA!ziMQcB^L)o%>d_iRuxU(XW8r(bw!e0lUbS zqAB3vyfxW`E|=O+7#PAZ$T*`o9?ON>G=MTgqlDvQ%xbe4oD6vucHO6|@@t#dKJT|^ zKtU>MP0JLKPfu$%C_F~`^t5vfAoi`(?4Hw`mE>20>ubsD?afBOV{$${CTI7Lz2@U_ zpSq>S$8Xbn&Nc05t#;XG@oy1(Nh!SCzy!>2R3Z5K+QV$+HSh*R@$uCRO0;C6k)(_t z7KwlS#j?qe=OMXC(>Cm{Io=+h1T5MHqvIx7=9ZXnV$iTWokSrxKWZFQ%K>PstEV~z zL6CGQBe$KC6~@qO3zLb2O&Knk?RRXIldxtLj%gzwR;2O3q)-j4>2!JAy3uo-=yCYobV0j%;n6U@=0kx z{u*^e#Q(9%Dl&s-uPj(?W(5HuQ33pzO2GvM($Ptds4iZ}rniadpfCYIi( zYpqFQW$7MKrOw(!(Rg1&U$Id?N%??il1wazVgG#6gwJ+Z1{ryF;lb)2pAG?yi~R{$eb=!T+bjs0Cm7&)Ar~rgA_qd9Zbz2<2-(fV(up#Z)Nf~Nr8C{ zlodqRVF6h|Kmr=Q360N}@be;Nbhs{f=k3Ep_3O!WMh2&Gbj|2jW#0Z(7-_WUwN#AsrVnM`9Mh3WHt zLYiO;BJsaYGLau@t^C+`+?M)IyOASP#iT$@;kj?{$@lk1tFIdDcPh5+AYp{GQn9^1 za*j+%ydPJe6>Bs@NCi$ZUw_3`YI$E@b#={Us>vPk-%jk`#}^3>F8+7P&t7Bwhv@xO z$EsYFQDt~oMO*)W{W#JKI0g{fivmF%8WHGv?jWexbog6DG?nD88irgNzwo2^1pcxJ!MSi>h2inDX0G6Gz`+qdD`l=KZXtyH17YB51% z_X5|`SbQyI)Vtw0yb#i*YS-55pTQwg8v_b6WrjN!dz|N6tFPuBGtbXwKUu1@qG!uQ z$uK<|!4VL+-CC}6TAQ$Fa9PhWhP9_RBBhsxb*5V&O$ z(&}-tPh~P3>sMj! zm^%HMLB`T+HOjyY_gT)$PD3B5a37~rzqF=AZ&$8r1bE@X_mmd$P=&<+#FF-eLlAMYrLDsEj%>6rGHl4Ki5tl@$8?Mobcfo z(1?t#aGK`uebI0_4mml0SoDlK1ZzwvN14yD(TOH+F=;?fh1&=-w$Hgy0}*6?aaQu6 zNGAc>BGC%jtA`HWU0~g4+{&l%se_4}PZ-H2AKMr5*OAruvbF210p9;(){D7?2Zb%( z-NovFxV*`Epzh_3f2@HREUGyB7HQKJ1q$_Q?aUw9plF#Ss)m{>*9<0#94DGao$nDj z?+iD4vdlUqlk2^oYjPnJjR5trrM~(bF@yv`y+D61D}E+e{W6Arh={-ub6fF$Plf+n zW^MS$UKSA1+2}kbQj-Ome=fPhr?l?5;8ik_*&}a$&>&moJ2Hyk3`Oo1(%OdV%_ z_B%-Wb=T8L)0pxeZqN46FaLE@J4wH17(x^rk@!8>*c&&19>OH;VB9msU}JgLV2H!# zbuN?Tr+;4~~EWqN43p!+TFLdMq+QasPp z$}XjoA$ZI_42P;|zyxh5tUI1C>9tH0`x6bQl>TN9Czw%R#&;vCHW&89xMmf&x`KUE zn6H+|{pXA#tv+4H?HDji-v1oVe?{tl-0c4x=YPP<)4%)(0rZ;zqXx6PyFfF_e1NPG zNt?^86Y58S9d{p~QFZiv)oF7Krxkp};Y91%_d5(mNi_zrV1)KRb7a`kXcL-ki?qrGJR~+gW-}nu#%|nsS zl~EvRoILgC@7Gwf<)u;0^S00 zRH_xK_=%zK<_2eP0s3N<>?sTu2|k``Du!ird;+1-Ru`L$1ZL>of#gVR;wKA02FoJx zQk^lUDqnfWkaYxVQkVy{4Lz_S1(C#k%TRi36{~zCrZm2|)6ITZCf>hJ!8=SKLBS#+ z{!=LZ525uxpN@1YKmeFdLbS!}^1D;O>1-+$24S!h+It>ZvG19`7Q|i{Dq(AyS%J_mygH$$!D}$8dtTXau zq!`+PRopqykJhTQ&c>AB_kC!mX9SRLmGz;MR5}N+3FtNqpmH;FAHQGZ%5(Y(=E{8T z8d8e0>?L;|6Db*b$%$zQC|J6w)(?Jmbew46OOE=G0Xf{F8%PxB>k7SmrjjI55i(Ym&ES6 z-0_*))ycykR>od2Q4nfIyRhvBQ;jIz<2q>0fnZq=s1m%^_6yg;|IfwX3WPAv;YG@OX)0}BD8 zcC#8z-tcSHcXLgO&vqwjvU}4x#9^C>MPgZLBBnaVK5ZW>7A$v0lR4msq358ONPYdN zN(&CbL3CBh3Yn5_luzPM?v_h?d%7OkD5SVAUHTw=?x8lAE;(jYNNREXq^^1%d0soV zJLq`vg`Vs0vJC}DCiL%S2L7+_=$h?Gpm%=Eb+|B;T)T7KH;&F)0NhqzMMm=gavv}; zC&^t}{2g!CQ*pkuXPOyTrRRN2J)6wB&L!AdnJKtJES`)r;=3EPhD;LYHg z&b{nO`HGJo)A;0p82Mz$1gP6Wfs#}CCW_7`DR%Br#lwez38OG$Y!(~*7GM;hVqc}k zX(D1Z*)#H5HO_wtJfgfwXJNJy8?xN4eNYpARmUaZrkRt7rld190OAnxeuxM9yL zvY+|BBMRk02y`}cv9ZkFT12^;2ZQOHwbbxKl7{VpQ+sYFr&Lc`uUh&fUU3es0!9Ih z+FRe3c~Sf6L20Z=*%K^Vh``cGg5MSdN>#E&$E(qWo%m5b8J6xTrtS-49a^ z&~8!uhFMtzc&q=61O8uszzhSJDmDT%h^BfZF`u045#KxMQ?B7C2@u*04mge5HR|-& zpsg|k3Tg^Ilm6tLW~mxle=L70Qmgk>M9yG}G^W24;y`A;at`Lez}*dBHozi+9;22T ztq`Rkudz0U<5E##3uxh^%8k3A!1$2T=|{<(a%#ZqbQ|eML7r2Asw@&6PzMXYthJ8m zGeTviyR`=}RN*y%0~7$=*hL-AV@gia#mhazojwRRj&75qD1L6goAn|t7+T~&=iVv$ z6+2PM{LW)z&bhf6C>L;UVV)XN6ZvKWfaLevbBBXHPP=WO>3lv7sD1K9W61J_3)4+F zmi_{hpZ$Qmj`rc70RMlzum8YW*9=b~z5kPIy1e-g14|@k$z?c1WHjeh2JI<`N#|Sl zizAFu`>~2`fLI-^qhtNZCWtgw?kv4%Nec-{uXQ7QDhNi52cBh^FL0Fuv-@5R3KMF2 zow*WeVUUqzLH(|<3^UKWOUCNmnbex2rNW*>cb;k+$)T6*NZ%%!m&vv2O?5xJ5h`x% zIab+@;}M=q(1Key?B)|M_XYB%%{CPQ3`|yf^2J$MJR%4hf#kpg#41H9@VLUaSZ#MB z|F;+=zXm{u`7z;}@ig1{@_4;gADg62+pJ1T#fhUZ1varNbG9m9rv7xM_$8|P!279# zM)T>GXC7WZyz29nZYn$oAa5Vvdj*#0whG3V>P=r>gr_~1UkgNLE6hmDGk9nM0kS-L z-3p|qTZ)0ocXiC9unDPc*EHtKvhuwad$9B1STb|A^4fpxknVM?ebLdU!v*E89%V%ZEXZJ5C zVOK(2<#wsUH#8VPb?{j0z#5+Xp6_#)@~=|;M(S#-*%YJh5L?yXrLTO)8cBi0&gyY(A>wn*k*Ej$k6F|NEbCdGp|DmxSSYK{0?*;F)EX#U4u6loWp#q3l z5T}Pxe*zl@Zok6UvDbq{c?S*~|Ng}Nh-ss0eRICGDC~53;_h+03+sJ-O);}Cv8|9n zC)ddp%WtaHPbNT?4Njw+IZx&7|JOGX%fNQ{SIcHF{6++pquo*VQ6w(08*@wN=w)|IO}Vuz3k2 ztC6sqQ@o*P`1U{e-D}WO*iP8jEhUDx+I?#NhC@Xj5g71pJnfSxE!gARvSRAx+^1Nz zav=+GO|I0x>6FhsPjU-pp^`tjb%o<^0tRvM?a`3GW;Fiyh{Kb zqE5J6`u`Yv>!_-}?q65|rKAra(%m85-5}j5C?Fu+-2#Ua>6Swuy1TojyFp62`)YuUWw{B%sLjQC*l{-=Cz_kS)jyIJNAKYv7&u&Vu% zwhmRAY^b^tV*p(Us+L6m{p(>cfukr)MbP>Dg(D!rw0xAAtjqYSJt-a7`QO$D!40m3 zT@KQN@p%v;Nk(A$FW`IseE(lZB&kQie%f^_d`$r7DMMqS=e{g5!;|#y(=R+fJtr^I zUsaH8%3lD$FL1^p6LI1z4{xrp=e?Zx!FK7t{qc`5g0ibWReGQMg9PwD%i_H=M zwrz(8w*80y{E+bX=jZyqe(C)QsIhZqN)0_)jj1iqDKozWB4Fe@_LC`GrdIx4uD-ys z&G4-af@o$KVICI>kfo#2#0cLVlh}2v*}-)`+u(S zzZYM)kNh}C7b}i@KtqBO@t;=%u(s*X{WpK_hog(-hv2@^qXHsSizsG9i7croNeQGa zWDB^z$Uoo_0s)W?1b%#2eVgXy*%NF0EfJ5#ER`VFoZzpIfnW~TF!~gK$lvlirZJ7g zl=a>C#~j7W2)_T>ng6p5{$3IEI=I^hj*!FVCfvG+YvF?vvhFNzH;-Fk#X98wteG$0 z^H+n)K}_ecxntMhanx?M9}RrK4Zx&X?_l!um7&h)?^+#!=b3N_q8xj0L7RQ0N#iY2 z!(fqs{>&nwt01r^X?`G?o650^PF2{CPi@A|fB3CRJaa?mYa79FiI{p8zEb#5O;Y$A8I;=6AC7N4K>+kNF zQ`iLk=Rw-?p3$Ye;9k3J>*b~oy^871sqeqrU;hBYaHi#Bx$QcH=T%Go<;8r3UIJ2} z1bw|j+xYjUJJSmKgRORdzYF|n{me!U#{dL|Ms_m}=Jqq~kB;iYm-<7di z{9eQe2dL6;ir)8rtBP$CmYT=ZZ65#b&$d+Gl?hxOQ5t|p`r-CE(gcPy@tJ^hJr-*# zc_twH{x1aNfdRkAWvcU$z>c$o$@4RkmcuQGQA6POD`&ZdnGhaTS?E(DC{DwxD?p4kD$mpmco!(2coGVz0Ff<`T0 zNpQvNa5X^$c<7k~5mMW$b>Ky78IvdY`U{0=_}f@PtGyQ|{}Q1sA}?Aa+9+i}3tYTi z&A^2s?mLP`{O-*mcn0zK#40j22=ZI6d!o)FYcP%Zg+W&i;^Z-wT{EjLn_4%Jq(zfW}7LTh)=ffrD z>(Bj(ewbZR+nDr*gZHbg!H%aH6X!>BXCNIcd=vSM$O@BwX`o;;uPl^`%E%6mBASzz z5-s^N$9|G>!21V>Q>Mvti!P1F#}7~mGf;J8%SQVHb+v*rM4Yq#fcV0oa{79-)of>I z4jDiYKgdQi(3(gm#Iu@6n;7@E;TBeFNpTykk zx5^TR57wv|kEk z5;g>|b$RGP>Jkw2kP-p*n6fxg1@#w5nKVT}Cfw{Ej&a6k0vHPeDL#gMmsn<&iHCH- zoJEPj`LD*^_ertjx;QDjEvdgYX4yR zZ}o!Y2XPtId`%UJER#)f+^%=t&-?7K#L;O4R(u}#7*8p^aeQC?=}NHNU-*Z3Xw`d# zPn8eky$ZjwdZTD{Ci7zrJp>UC4||4n&jExo`4<;T9KAkS-4W`N&#`Z0hP|~!9>8r{ zOk-!wEp7wOWAG<3o03!zd4rqa1%DS$@V493+N`L6D{3zih_ZUyDqT1e)7VGpStsEq zHy?9#@Z5MJ9@Iv$&D#(gnzyR2UJ=|gp)={#wH;Jx@GWQBEH-@5EM5Aw3^1tKAsDdD z9}K?&o7|89`!J>!0oddUKmMRV}zN$V-AInOhlVAf2(Yv9W#YFWem1 z>2=~Sn3G5)Xl?AmfSCG~v>061 zt2B=X*~UvEgzp9=YKZR^OY?@K#$Ft%JKf|%NXXWZ354e1J$Uz)n z@tkYb2+i&c^ibJCNFP0Ld6EBhd8KgKnD6~@>##2*5D(eda(ecJBH1MQp26`qI~On- zVG3V)!|o2%BU@A*Zx}2U%6Z5pl6d>FE0Wv#_>r(xQ5^@W8+cd`-+owk>(C(L=K{Kj z@I7zc05WmgCEluXgY!c9siUrJjHK7m1gU_%3nr%pXMF)M!;a@p$$fUpaMFd^e`xUD zpxPRVj))&gv!2HdS3EQ}>8|`WVR+{FJ!Pgv;~~cxlK9cr7ZF*j*z|0D-Q` zoprNB9%&uD`l4~D=isIO`i1~zZUlZoZ=naZ1iVG+n2^~3H=PPg>-+f}76w=V;)=f{ zfOf(jAYaq_e-AkF7VZI!JjfWPagPa>^G&|*+$ca@`io>{LCqwMrY83j-)`u zC&Ox>)7C$u>~2^o5!a&upVN55hZKp4vLB6hQ^rQ^atFwQLvc_&F$4v4G(YPmSG&Lq zD%y`HH2{gTx>n^{FG2Cf(zu?3z9Nc9s2mgZXsIF+i0CMER=;kxOYIoYf9MgyDoU2w z9)5qK_H`>r%Gr{x?pDhk zQWuH)%=`>Rhb2SBNx|xgQlwUVD%36(q_0@RGdZZZF{o`)ukuvyXfFI0SV@qt-Q&m- zAL{^J##|`LODi9tq1%lla?fWTPgY^TM<>n(APNF$5v?}kD)Mg%v`W|`@DK5g2Z1RT z6IF9(-9*ImH;o0@9$K$Tm&ywI*i5B;p!ZHZ@PVE}ZvPPV9Y^0hIG>nj!`{AM`_f1A z6t!0Nnjr(;ZW%h-K>qqN2Ov|DP{#rPT6Z=H#XMh&IsnN$mRnN-QU*AKwbz!SMLft4 z-M<(>ai3lBC*iJPJy$VYuDm>!Atvm$U2n(Avt=+XXOiz7_$U{20d z0Z>0s8pP3QalbL6_+?LsZRfTUUn3$2nJ_Zh#6mvF*aR?GAyJNhf7(sSV?UWxYdHCn ztL_bF-_x&fF+MdWp7Thr-h6i)87asu=`hNG@O>o-0jO#IyBVntFc2Bep7t^s5q3nZ z6Jejc0wlx{jGDQ1Gva7OFV{N$E_cw$5LPK;f*|c?`Q?AK>-VaIw9x&7L&<}8aLSHF zvdjxnMb%!sT>BOmR+LUl(l+$Hv20db%SF_U4Hrsagsy(L6lf41{P*ThVyQ`Wq{P-lL+=)m&FhPXuDO*{rx#m8P&cgQviDdYW zhS!gm8>|jIND1Q-tgKOs?y9jNywnOQ5*xWg=u`N`E$ab7aFn(Hg_a|^a;G~czW5Js zc03-Am~~#>JH9;3o{m1a+KF5A8ShFNWPcKMONt&p?`=Mc*8fL|puV(BfTh^25!scj@&-((R2)F|RZbYp4jhU3Z|`iVSR}Nk`Z*`L z4UY?F;DI&o2(cyh$A1YpXzYDRF}vXq7x{jFNc(7FXS+MFl7H1^L}pnjDWn9XSo9ei z%*kf%j0$mN12*>AV%28TRPMToJ)*1AEjj;VyT>2ckjO*A1(glrqN5CFdKcC){Y;v} z;F+pWhW;4Ji|hKK{u17yZ|{3&J0tLTed#o5@PEF6i$mAwAY5*qD#TfZWycA`aIIsTDUNrWbj9tguwO03ZK{t0L|GtxpvOTw_6M+aG!E~k@{jsddt^skz3ib(! z9QO|D(IhD|^Lv^7m81x_p$-84$m`e+5JEOQJ*m4M|6*(S+?{X$h|xtghFzr)wca1^+2 zApu^}40gwJSBz~i4aT(SQ>_u3z;tBFJ9RothJe4*yxKB5J1iE4LU9V|EQo053zTy( zQSd*ObJI_3sg$ET3eRRX0Qz?olMi)>T!2##s-6W+{uA%hRVTv^@JdE*mfN`;FGm9E z!{VQLe~BgPr$v*v!-x%#@gyd8E5^kJ9`QCsD*Y!iq}iK|f>~K?yJQaXpkztqJi2Rk zBx&WSW=C@?&`qipv0L-*a*LN7E=Tz_&~wqM4{W|HTH&>j!}hAD0|6rWm-@}lVhA6H z80Mf>SsBEFo|7dXGHC&n(Bj9T&%0S}XmoKS)g))87o*;F3RMWqR3;VMiL33_rD?qi>}dR!TFkq!^>RN7Q5 z0vLUu5@V9-4P&~qkYmrTUPsVWF&o5io7o`O3~-1ICBCN#qVkNwLMVu>q&uWE|&YQ)$&ceUX@dbFD-~*|ffvM|_u8 zwN4HaJ5ae-o3ACTi-frUR;cF3dexULvC7}zw9N!4qsAs#3$*bn>!=m)5k?QjvZQhn z-y0{IVAy>@8+}_xwc-AbDfNb9-1L<-MPGT_31g|-hz3^T5mt|29XY7ka|@c-lsj!A z$Nv=sHs*NQ6xMd|bjEBk+f=QCQm!K3|Uqvcb*pk0AQ2pJ_)e1+svU&iUFCdfAWl1SGU{J;)1Ut>L{os$Q!O zZE{7ez0iF<-&J{Ob&w7=qix!5dmCCym_fWuHE?l*`Ip_d6R`WvzctU-ztm{(J?n17 zb-cSF1mlsu?v8w`YqPpM=rIW>cggg)jYOasHIeDg`!`k%SEqs^Z{BfMZMh^$l@hCt z3Nd~|_--fO-VTz`wI@1EqoR1&UNbL#)QY75KZ)njCU1?$JZYESQUDvh6L1G`|5tYa z*IfW5EgAv;A5-(Iup57+s*isB^JtqjKC{j~M|Bkc-aQV0rRH;Heh^Ch_BUUv#~)h_ zWp8M&f1wttS689E>WLZvq<^^p)rCVm&+|r5Qn-c8G-+0`bYj76VNM>dsW$o~I?oU4cojVwwzA)sw3;U!7M>^5-odDB=%$ zY}%||#uP3wtZ>t*PNgC;4@eYL z^5jK$Doilkri4_4Q>Zmjbyz*1>2PBzxlIxhv++NrhFvf6$|s&ZU|f|J<3)G_iSyA|0U=Ph_ZC3)vBB$Ev+GaBL#{1+x;LgZSttEZ~Iv?LmvUykieIZ8>qn1T^-4 zD>F#%i;^{ON#O=nhm4!iuiD6yb41O8f+|pTbwl=SZM08xg+<7_t{77|Ds-r{mlU;* z6!H$J2}*>X^Q{(ZighLWf9MEmkP4bbk9UwwmkKl}0m{Ggl2xr|ZJX=kFLEI_Ta@ni zPy_M^H$4;&vHzqU zBwvj2^HdgUOQh3Px730wv3I<{fCV$JBkn)%=ag-$D z>F#6CshvAs1;qE+-@BK`7rBoBCCev^oF+gO#%^A`0EOHH2ZBWYOzlZt##Z+pxI9#d1&H%?o5Jk&*7@h)XK>amZer%Ub^hfV!ZV3In56V*cUGyf}7;gXXK z?J=B}Gm`06A9Ia~hffLoC4L2`l)qWF^NFZ<+o9+A=9K-fHz(RHpwU@5Uu_pdv#@QZ zG3Yqk9;8Hiblb_Fl6pU5>Ch~m%3V%lNaRy!STfT_`5*X70f4U>y+ipkq5ryDL+68R5`WSod5ijMMqjgVq3L4BIo5)5qCle{3}X#XnrD}f zIu1eDH^Fujgx9Be9;u(z>NbLBj+Wvm|i5XMICY1^FIA|<(;opa!wyRl$$Y!1EN^aW7=hD z#b1AfRmNl>5=A#QRaRhRegL#JQ(Fgm*o6=)Eeb}J67cmk>PyT(>G8F<-_Vgq`qX~= zCBhrO(OJUK5>^S3@9BjCa_!9Z?zUMf>DTnNnw#|g1og{ z=`=Evj|)Ft0vLS4IAAKl;i7W$U|UQcxU(Q#Zbq&oQD-J|$_5wVL5Vvx|HDTr@qiWTW|MP5NU+iqKcB zAA0OvFWcBcDp6z9Sn#xXFPib}dhYPozbEw%StB%`cAVc|L@8gFo ztC@5SQQWLD_3HHkTs3~i6i&?ebv^xess$airF3N$_hR~c%jLxes4&CNZgQ5QYd>0o z!0!ULD5xYzZ56*mIWh|wgV9FH&^2j%1g-QM=Rgi^dl_T)8AVvcdbaYjm`MYkvkmm1 zAX~`OuV~R!BugC=IULQx>it&thi~Yk>u-Hkix)_XbU++B6=J-pphMB0WhMvqa@p`c z4j?AV$nMKz?8^8L-XIPU{+E^?Rp3Ypi8-z{p*rPFZ@_lnr%f-UyFVRq2kk)Rr)(q^ z(DOy}q2OPCLiu8;QcvCKYFLqkrzF)gx97#!rYNBCrJ-5|M52nHl83%9MOi(7wxs)3!He! zaQvXgQSEZYyCBJZi@``@L5rJ%Ov^is=L~{%F~0bWV44p)ctO=-Q!42oxtd=kc4e~& zwVoGG`DRb;9cYE$5?x>9dG`s~eGK+y{tto$$0nLhUkuc!p$j568WmLczILy?*yzJ+r=5qG8)~ z1Ywt{?!zotWowD|fJb3HRgGFsuhlNbwxn%sIix&zORLB?V4H7Ica?<{zC*}k1W3>w z$Pn;RmIp^Wp%4h_Xi+#*fb<(IBCJj76o&U8LWzH#J%4+AUjnT&<(o~{uY2IIxG%Kg ztUfIO8HLI?+gpBC_!ly4Hp@*po|J=O9>wnWS#KB`*WASQbqG#uU5N^G8vQ;-loJYM z3t{)Aq!_fiksm&&AS@S+p-pO6GFUpQ(9mtzd41Jt<)oY_QFiTVON?Vw_XlW7%F3N- zIt;&l*6uLS__Bv6BB?ik?_XG!pST8?Oqyjd7()I40Q!YxRnW_6@Ip%CC+fN=#BlIB1p5;M&v}0lsEt04$ubon^V$xlUw*|aa--h-Z~LrAwQZaV1w`j2F5q@$Qn4<)`t99P>JZXGQ z^`-C1oqyYG^oNXmUFTW2ooIn4QHR4om$F!w1JYqI-_;-LB2JiK#JBtL%#L{;F9!h7 z?FFKgrwH6N06EJ88iX(k2Jwq=9V)dJ_ormuKb7*<8ERjPtU1)cQYMP;%)Uyyt?Rtu z(?4yLCy$EAA!fT5zFF7S$l`f8HcWOMIOP)@2poU>0OSalmM*j#Y+n5?C>mLd2f_kF z{%cqu(dBmE*aiTLz@k|q5_SJAJJDt?#o>1!Y5qI<%5U|bitR%-7xj~c}f0oQM>K#6r8i*JJEM_t1G`q%M#H?n?qkRV>MTHS)8?$$3u&#JawG*9%o`vq1o@o2>m`amM01ZnD* zv6e9O7bIwKQsWl!&)Q7Bjqvy^mh{@Al;uRoOS|^yzTPv;`6M9ue8McL) zz8Xp?SMHcLCNq|j#DNo1^*!>_>$_(2YKeQ}qRzPIs9h6NKJ)33O?!8z){#ap#3flyV(-HjSC^V~BurC0Qq0h+tqn^#BwKi^>N{uoNl3XGBm`I|@Xu-OcUN2O=g5|qOWE!^w z`bvj->3uai!63V0&9lYhPmnB_&eq0HNyh1@I_dzxEHI~g%0~encP0k@3t0Drsoe0%?? zwI$skU#((cY_MnuxA~-!U54h_+lNyfYfmak!HZ_nQyUWD99$N zg*LcoyU%5ndAW3l(AorFa75N~W&SyK#{Bwext6hwjc;8a$l0rt4L^gY{ws_$o(uQ} zY*A@hd?CS6RPXAqH!&l41r-8=ao*Cb4>9<9XE7QXa>|%Tdp~W#?%mD207QO-fXGj! z>!8))J5GA#MDl zgOI5i^qeLGKU_R?XB&7k+9JvLn_pJRD z_fm^xsWs0l9Bn`=M7@_lynz0lcv{>)*yma3@JV^HlWCrj2m~Z*rwyi-=I_AA(;IR- zRG4Q#CvOcx&`#`diQNu(fWQLis_RIsUGfV`A72ag=g%KtmEle|?>BkV<0bMDOCmv!FIpt0=5+pqw9q^sW^V(KpjwC)f3|-JaE>X)= zrT1){tw4N^qTA9Bb5mV}0+RgO!xSicoef&F1ZzhnQQ*NI(kr04dUaLNRD^#u z5S*Ndr}6c<1MENM%m)&!uG`2DNA7BP@nB|7>Q$*j5d9LHsy=Vo+}<&|TkY3(#0jVr zi|WqfmzFxeFrw=EQ#ZY#Q)4seUhb6R{mFn0h;(#?PK&9x7kOs93V2hG97bn^;nme9 zn5=%w?T(fB=UlRK76o_r>5o2qDySO&VW-)J8$8~49tje;pAc#AC!rx37l*=t5oA@t z{{AG=(NyYiud>OdHQ{z`&%FtnAI>UFnfSOCT%wvAneS)&v$svC*c{y44A;9P>zIjJ zggix}&R+AuczWqZeHRLW93WTau;R(}Bc=0ui4y;LE6a7bk}YbEtWrysW^$dC7gcbV zyX+kCLI(6%x$Zc)w&1A7?>v-6Duc6p*uBjrbKm^rgwolqNBuSxvs;d$Q<&^k(xiT` z_!vU=wRcDxSt2ktr5zZXf+OjRfxrouNb~M1`Fil>Jv}Hpl8A3N_=kUO2!FkUvS64* z-Ky35+Hj1IaBp8ql2DQQM#)ow=Oxbp4ZVs!s!xazrM!4L1{_MxyUdjT0)c_R^@Wuug2-%|y`mPMD59)}(wbLT1ruO#pguV{tR&kN#UzrU z*#x`q;~o=dsK}1!FQ?iqXG&FFudR3)dQeSmu{AWrG0;hqkvRmvi^c}XBC3@-<}qLI zuchB&x4$+${%HCRb+a@yOG-()rYO7cJUJ9HvS;s@wg=5O4XWRf2UW8&m!?FbIZvE5 z%(*4592_@92yc81*YB>E1F2iM&>S5f7CR3lx)Tlr)+E(!A}gyE2-As%8)Tf)kE4w^ zLGlF^JLD;(MNIP$zzAH-;5%b?qTfCWrqSGv zwY5w(xM2x2s?WI#3nThzjV|9>rRWC*mJ1 zH!@EgELQijC>9qo5eeCW4XhVMb49L)%UBAGk&RzUR}}i_GRG-q`a;tON#r|*YV8vn zrJ`yv^6i?dtfymzp-k$KM8nt&HG$hPVsT}T-p;R{Gm$oLyU~aq>oakz;E+Z~!+!Tg zybVhzrpVXoXjUo;A&i!P4JIDKcdfO%T+Z%U;9n_ZJMCi(9WCPOb)i!WNHwD4dS#d=t2NK3pRh&|fC9ab@(V z`0wIQPc%0Kvvj5mtHQ3%yKo^id*cgX4qvI5m>)GkPhmJrU-B#>Tn!0Vh+D||ZUXRL zwzL#W^=d-CWNq)M9{j2Ku%2(!Ufx~x_~*5@_L!qYzTBF^_>&g8#EO$BsQKa;=VIaV zB?|KuMvlzqg}VB~KSx!^vx=;(w_~A@72-#~$GSRIiF$rkWp)^{7Gkn81S;YvIhKgm zwL!q4_D6XMO!Qm`xh?><)RPRC_2RjzdAqv&-ef_(@y&Sq6pb|sc^d)?Ot^57=nLW` zc@U+)`ACf@Da>!HxXyJu$;^Ql4q&B7Ux4XSUINk0!}@n#D`(6zO45shwF!}T(|8gu zB%VY+=67oD2wpi|}2_rCKF)RTE*F4sADDa4F zoor*wNR}f_nM9X_C@SaBSRAf=$m}vK)y9{(hr4-AL0^g7>Xq^u^&wW6ZfptPN@sjz z$%CT)dTE5Ppz->sP?dsA9aZgII9n!`Ci9J`hn!|HGJa#8=2TAD@nX9t%7& zCVYqlJ?=fpUO6qo&(vL^A#xg+4nGzITunAuCfKIylen*2C6Ig`{Z=YNRln~loAMZH zIoh|qwN>KxGfU@(oM9*$b{f0qEQ${RIGV?`vP)aZL#FGdldEt$-XHkee$r_@q%3>9 zb-JAX;bhyIk8LgFEQkh*Afz#n2sMxrS56!a#QRW}hOeQzr&gebvyso7co#zh?Q@Zo zVB%LQKZHcXMe9+6=}r^FjKjZtwQV~?M$O$85f7T^hm9Np*LW4;2c`2dPw?F(Jw4Pq z|E`Y40n24Xq>KT9@S9n-7u$GYcv@_^}D z)HHv{6>}08b;_2XP7O(L^VhnsoPMJLBcVQc1onJLCYzEU#x{n9{r$eMUPEyoRoU^- zzxxLR{r+Ng_vt*Z&l;I}@q`jiabYBM`&*VJZDI&Sh{-@Uaeq~Z)9SNSO}7V&-oo_o zZf8q#4zZ9agl6&wFp!;WLuB%BEGLFy#$}&P_}hDBwT?ES(HAcbe0^U345QQcvIz)@ za+A`8?d9`s*0h)i><8?Qus&bEy2n5{y#gRgCoXarMW^i?BvGzOWK7Zb6qY z#DN?8=1&79K!A{d=@NL%sov?i|KzV`6)267A6=;z?tCN=ft77hoQnzW<1djPjan2) zRtU~ep89_{_3!841X5D3CL}t#fkXZRIP0zvF9caXAt{59@1lqVaJt$ZPh0Uo`Y(Hn z0&~^Ae>dy%75uRiP3C5wg&^_Tby|F^9E*BlM%Ap(Ig_!uv6)aNT8@^JhgJ8h^uUB1*7MJgb?F`fr)cS=~av;rrsGo!?N@Gbd<@yHlKIx8kEQXsXDREwrSA zU*J}@h80Wr;#LIi)g0DgWw$;Bty=fKUF3kR`0J@N$ydst-)##nyQC?P-DVj|O9|w$ z6ly;F0u4X`F!Qse&q7_31gIM1;rPhFk#El^y|^q(zV1b?_++vdSXtn?FThHG)Xxa^ zVAdAnEGa>7PEPXKS3xx3dsmIsq?dW1n~%%*7JaT%ZC%ya<%*`qr)Jmr%m`EyYr+a} zH}4yjvSsOUW&wCg(e*b?j(Qpm_*^#Pq|^JTKLTe^vp5$+3_f&Q!`ouEqL_kY^ud~S z%KEb^krO*t0DHA?V(v!9k9jgh-m2!bagOfRiI#IR=1`LrfjIvb ze!)s_?+z^7gYJdazub}8Q+w$Ye!ur?FfUsvK(CIE0$_@#W|PP;m>ebl<*zSEhVB; zCwn+KgoJ~VLLoRG?UiE5+K`Wxk!tl#_5>#9t~mQH%Wi*=>g%{OX)4^fVBCAb9fhQ5 zFjvx#reLLgM~pj=$72(xlWY#qvI2+1&Pw%D=%{#CgDs1+Ye5VcT>*|ti_QaU{{;~KyJ6!wQM6qlOlLq6*?!hU%@ znt|i<#l2+zrOTq*AWn zzx!s343zA?z)Rkk1LnFfoK{>};pbE?Qo5(hVptmDV+i=%Y=aJ%d$gf`!gVf)`*9V*z=SRI(iV9YI2f-moE z-!dAssF+r%z^PC|>sLIB>72Nvpg(VWV9)$(Sl15aF~%^I&x46^-_eDG`LpJsks~3H zjL64vrJlv+8?JFK{`~trH&ZG<9p=Rj)!07k$wHXzd&R-CrvT&v(A@Ghv z&O4icr$V)Wj=BHLySV`));LoZ(MeVl^^9a_X;inWi{z7^V^IA#Uir9sJ>Bw5J@VEL z*k6`WEv_{3_Mx=IB#pntb;OZQC;zAH;h1tX`*EbN%PTX53^w4|A^aCi>(bR~M;X@M z3s6Qs3h>@lD*1(K)kQ_!v>oA=HA&3`d1N>_u;A2n2;#;aB5>&kBZS>k`MecFAxiHBsAH|x>`l?i7ql*p*Tf1ok$<43 zl2;q!(RweEg7;*rCaAnb)VuFZoRMFVdba&qW4#_lv7}Ll#*UY!^Rz2~n(fZ0;@nP5 z=6=s}Kto+lipER5JFJ5y{4>6OE|w7TlxUT=$0>4NIHc^^J(D~XO&usl7c#Q6yO!)R9lzwK7Yw!r8Ua5Jb`5x0!fTI z8F?$@?RgVEu`jvkOWKJjTV(tDN>iYi+Pg)FUnFcok_+zowub1vO$daeLOn~pkCvzvkn}2VKJake-9LyY9b;d+O@{-b3S}3?RpK_1RHwC zHLtW<2~ggQ-tPp!qZQcB(XlQL#Fi*LzsQxB*h{hJP{JxnNZS31U~*8n(NRRcwHu4( zoSFpj&bi{1cspW!XL&+ck10Kr-_e#q5>6vQA4)kv$&ocz?5Ki@(Q5ns43aR_e;$-p z>8)yRObAxX62voB55#!=qpd{XE?+tm26Y&`w{f@JsE?41zErGL{mmWaEkgi7G>e)$ zuEZsSXHURyE&n8>a3prFZ3KZlZeJh2$Z^k>#?kH`@>FPev)6j_Fs_Y`8wMvNcBWB z)$-IzKKtSdwfrd7!{BgI$xA|qN@xGJbrc)To5{qI)-MQ!5U9i7FY}_?A;pys7t0om zKpFBWGFn|_MzHEo(|FR(w}#H|V~N%<=8fulgK?@s2svcuD5XXz&&BF0lf0ryVUN|u{TJd!E2H6C^R>5D zw&I{EnOqI9ulpV0jnjB?UhcLs)$e%T2;K2e)x52HrHyX7*Smd&;?B)LN{DrCZNpWx z$cn;SF_ug#=TB6gj9geGi%q{uPB)r2E)V!BhWFf+H-#mB2Dn)^eWHP9J7`6EC0cj; zg}8}Q&}h5CN!EH zg{H98Wp<$>>*Y6DD?t?&uzsOD3Kyyvs76$T;Ea(}K{HoTkorb&`743~ZvhyyPl#<~WPt-)-swuC-8|JipAcP+J#l zPwaNRxUGEDF8Z_GO)Y3HFTBAx&oXx)UVI~6VbWDjW!s`?Rucb>tODCWG zKw`}lyyuIATStE-zto^|h9VQ^tOMHZ5Fsdu3(5BuGAik0Q*o(Ver_oYttNz%qo>IDMiSF&o^|3x^%;*Y~(m4PBQY6PQph z9X_kOv7u@J*H#{(tEU%cF^i8Ctc>E|M^p9DIa_NH?%EJ4;d(X4Sg}PYEV@ilnVoq0 zaEk?RK>o(}e&&gf?adivo7Shi4JsBqqh}N-@8IV0aL3t~yiwVXYd7lnrH&CcWJ8beh)faT!^F#${kTXGNZjgO&RPs0LsN{%eB| z_fz1BKv0xgAr)1)Us-e0VRY-K|BV%MtFk8jOxJUR|6KcPk^4psC5nQka04?H*gTJ4 z45Zw-$+Wa_zIRMu8xQGj@R7wqmq9a73?6t^ivzg^q zidq$TWcYn6I9}0Y%mgxb_O%5r#Y~XG&Pc*wRKJT4QHiT(0s)jc;-Q#ORbJa;VvF&H zW`20{q9`R~xgXr`{ocGc9&$}?{8%1-=Qc*b(;_Ju1CM+fXEDVVf)**Q+LzmdVfC;X z@TjIvGbo}Bf?6N72r0$;NjzX9dzX=yBty@2l+`rNEXT4*y~s-RD^&-afUr8;Y?IZ? zoiXwPk`POj5%3=d@-8%--N#@B zBW51qi}_G8%Vc#4qj;h&MF;K*I!J!f8)!##PfSDfGA=-_(R`Y&jmh^+QgQAUQT~&2 zTROm^IQ24(@z);mxYEeI_keh#+v_t}X)Vh~^1UR)ga#h_!g@)@Kae$`wZ+NI{PhNY zeQlFjur`H@g?ZZMq~S#G#$}W<03FwPKc3_(N30#ms;~5CPNC8m_~8RdpV-|`^bjgg z+I;gv$=4KZWwj_+Wn!xQVTX?ADE+MHtb&Fe%`_d3&pfwLrQ*u5)vj~0dt9@RH(NV+ zg);{cKEpbGGae5n8t7ZY;#(7DBPs#$7@tfysf+0cA?RMP0SXLai~j&*fttMfD0mi) zB+#TKz^?jb*6h>gGPj~(^Cf{Rr$d#C9k^HMpgZKVebTv#0k_BF=&W^KJTafcW%`(X ze9fP$D5s1BAVl~pA4Ngp!xbOlyQkZfTf}wvLkzP|C0NCozK9%J+)W;ahf z=I4dl{`w6~WR_l2*wD2Rkw^soi2Mu5x11~dZl@rF-EWa^B~ogvsTUnG(C{Jtv_>6p z-yobY&BJ;07@vqFQUFJ{Bv+^P*cTDKU|z<>AsZ@{po*NFmHVtH>h;&nD>2JoCdN}4 z#_J8Z$kL`>VjhP*SyF6sHQ7YG<&|E>QWAsRHH&m@?d*BkRh;+~(3F0TBtQxFKUS@| z9jp*UH_ZGF1u?ykq&Z62t+5Hq0H{_NXED2Lj``PR7u^3vHI$|4dr|CcGJ!Bx1gxz zyQd$c{hvCzZYPg?Sl-?4e)oe5WBp&8y>(m^+}1X%h*Huel9EF!Al(g8LyD9LNJ%#c zNOyyD4IP4XhlJ9NNOyNh!?(x#oco;bea?Bm-}C)7KZb#s*?aA^uXU}pt~H>2zB{d2 z=jgsXJ01MG;AmM3pIVjsv?j142&a30Z9rf?-e|!k933;9vogP2n{@ol_f{cX9+D7o z+Cu*2(&5XsrHIRxo4V)vcS*d3jAHwR8~X(*0J?6he=z|Mvvq!ZfG;vY-uH(V;Z4Jm z=rv@LcurV4qv9&7u_xJRRcK9erXwI662Y3uUtp`Uzl1&iEwg5DopMqfDI4Q}h*VWGj>YaJyu3ub{%{H6~H%h)~7^*Pd z7?DW6fNbM^BTjmu^8Qe2W#`+puqDwS9`yy*{f#3Ug%l+S5pAv0_#_vn}%zHSO@vNKH*Hv1;6qrJtvWRq zeqQ(-L-3X%Z)lKmw#w=fa+_GuZ!2P7UEf5TZ!0IUPmeLB-pE?Niyujy?MFm z)7(UYuqb$I6XZ`QKO^V~kgSKNP!{k8J8_YmG2=1CwYvwpa2N%zRJvSY)M24|W6ea@ z&Eu9Zt_rWgXD?Bt6<|>&l&CX!P&BUh#!Lswr3*594dtXL{6^%F%^ghE!pc<~)lkWM zb;_3ADR2)bVb6Yqy64(NNl)exuhT7zT8F-k_b4F&I`<@5bUayhPviq$9tZ=Nz8j{GQ@> zWZ#y>K#rQY#ZxF`Y|lO>-LM!>V{7N%gES)c0YgNx8AjOcm>$$uU#q;R55JN2 z&tQ%gJM+nEo(E|`XY$-t!`?wKR8m2Zi*39|UWZUc1Rs1IK;^X;(muf{)zpEE& z4ewTREtXXd+n1w6u9#;egQTaH5AJpf^rqb_@*C60+@A%*SWdN7PnXC)Wli~p0xdi^%iFGH7pQmm&bJpN2eBV%`yC#aA5et4%_g44ZC2w zuV(rCET%*%$5o;BTofqXJDC&wm}&ysoZkoeMA8O;4TGYC?FpHAeb zM~xF=_(mjgDDPq`-fw=Sn$f_F4bS+M6@#EeOVA*~Ae&5EWrR`%m*RlN`1cX3K@|`{Mc%O{j!aO25e>h`CTqU zReP^p`rkCbdgEB=W!}}L_ZkseI>4lZ(juQIgc#>y-OaDkKKUc_IS@p%l z_-ufbG+O4`CAID38XkLY#UX^4g|JHLb*t~?yTaUgFI4D47>@GDa`PlEC}KI8rlDle z&kfYj>{CK0p3#@{RSlVU-t$q!0v{nSi_O`MzKjU#RH))loYl+fEqC@H#u=?fww!(X z7S%P(Kqi&1C}uPud-#h8ij4Ro=d+2!;JX)%I_plmYphMWvsSdh-k}fdHVQuqe3=A4 zQ0i)Y;K=)-jf^xBjSs~WA9eC;t5hcDT-R8q__^d_;CM?B43o?M6hU?u$JFc?X2xN< zBfW{)5kWV|$oNhqqS;4UfXjZ>jNeCA-9=_#ymi*>LF+fMJLUGzC0xcCcdg&Z2PW!X zSv|N6ydoAya%V>ZA09v12dU;Zl}Zhvz%x*acwZsrG~EhbK%Y}vSxl>WWziBsYY zF%i{q6ldvsac22yj5YSFtiJtEtmhzRi-NvMJZZ)~i%mIoN~}KR)h-79biRs>qs3Zf z(gfQUg5$I+=`67do_JfCytx#~XS)~Sy=Q!(-MwLNx*Eedg$nBXen@_q>R#vPT>iwg z3;q$t)*|skA}zYP1$V^3`#LTftmY$J^WEnC!#CM^<2P^>+cI3*QL7fKF&`S!%H!nS z{P7}r%BZh=_Pg|IZ+F?axxc-q)5fh&t~sE)wEQ_EZ7|&QN~*Vxy|9JulSF))`zbBo z32V|#>WuGwMl_{SpV4(*JIN2{^yLE~-4LItB2;u@yv$*Lz#h&NUb*Ld(euby(5md~DX z_Wa<(pHsO$y$xi$xV?wE^N!&UU;QB?5cZr9v*NI)s(;>J7EMAq_1b0s(EW|`hZh!2 zUv+5M!!=`!GWR4Jl!JZgA0M9tUY~u3Ual>0)E{qzNBz{n1pX#+>A(7$Idd9M_@qiO9;o2gEATnfyV-oG5=&@6-bWh3;nTOeu-{K+yiN!&wAui59% zVAN=*KWUWrdLdt!ty+68=FCQBfr>pBTVgy11Gg^EFNst-MxB}>Zr~&0=E71=Z`+I& zLs>Uf3=ePqK&CdL?W4Z5Z!6}FwKlV6PROTSf1;m}8asE{zEh9SOw>0mZW zk=ceuBNLh8YQIUXCZYD!0f=}7t7>Zl>I5}9WaQV^ND2>r5Xf+|0~Di#e7zHbf_NMs zEbV8_r1XFhi+-^<5LPQBqU;^yI(y$7@;!@8Nb zFoQ6j67xKaSe=BpM>d3eIwICc-8xQYKA-SizMOq}hGWh&!bjQgjx0c#QEoh0r-~si zo9HmQGbAaiQ4oZIwyH1sg2giN&At(_8(P=W|41Pxrif&XQJRsD;;-YG+T_{WMyB+1q54p;ou2YqlSX9nSVqpgu5n=JPoWfq)i${8S z2_~pgLsw3@psH0;%p-!%=Yh6Cep7H_CjS$8S(n?E9K_GCpHjN_XJM~;SnE5^Bd@^p zS4=o=velBeK)Xz7YmA=$RjwS_>W_Dq@>n>z+Y8SpOIx{0KK-HztBYPuwhvZao8H@2+>3)h_?2*%S@ILISerFQW`mpw*^ga{PzV^+6G)NOCD z_k4<~W}f~b&k^9;iiDxX!gER0dM0&3F1F`o0N<1pgYYl-W!bJ zBm72!%J&yj@3kO$&v3ZOGc_uVL6=)RpO6Nliy@5HRSZkb1)gSJJsx&L1X&zcz4nU!x<4e0bHay? zjYY8>`Yq#WSb|zZshvijD3#;cBZjX^?046_L5LOA*00t)So_DnTN>7$!IO$w*tOP& z{@2sexuJVjkl-(`ZCVV-5k7i$G{18FhAS9hV!Gg6m22o=o_A>(n?PJlKoL1bcmje8Q(j@De#)Wow8ElPa< zlojq{al2d=a)=EU!fx3G?v~3gPF6N?^B&-EDQKHTHPnrAkaYjK8$JkUEO(%`F`||B4Bqofki(m8+P~+pG35iK7u}>e z-`tGym&PikfBR}37b;vSw%{lGa-}Kv>0H(;x~<>8lec0c{y^VAZ}9CHSwh zPI!(OoOSpEj1fW134_pcy9G}tdEc=Cd=P1|-p96l0(6G|e9aSJxNrvKB^irW#cD*> ziE4JCDyNh1?GyK#@A9bV0#e3+Q6=ev zZ|9#BHV|Nlt={35e2w}=l|}LEOIF$GWmXtG3NqQ2SVy(TXIINep|_PZy{l#W^8vlF zy%M*jMlK(O_>`HdHksg>X*GGmR|20s2=?Bn9Yo%_uBBsZi|@hVxkqVzHYebEvVol= zoyPyE%6j;JZZIi!f}5eB1#b%tFXwC)r$)DO(3@2wG!rtf??Hdo9;}TQ1^f$(a6H-L zFsh&kZd1c}E`mfo974#7i-%jH-K21~Kkt<1f-y=h8yg64ju;VpcAi`!8&(%==bsBp zjsQI+L3K2|mcWw`I@6wf6<|qHzGLe(_Ap=kl8|YcI}*MNUcdZXhmVm=&b=2n4*BvY zIeKDpOg<1tn~ctb9PlWZoo473g2yD>9ZeI)X;EXgVQ|>g{Ps|}-iAF?wETT$dCsdI zD~qB^lJ9>l@t@K?IJ5t^QF}=(IRBD)+QhY%Y`A|c%IYd;RMPsO=jGoo2o)BF2aLjR z(X}%NgEMf+Jd!PgCGx)>Sl8QKVa$SIx{*@kL+t^W=&R63A%H@JgK%iFse^E#%4O%D zmGhYZ(2tI$QzYP4sx|zxXHUE!VhfrA0kC2pOZ62+7^Kj*d}H`)mi_9S+NAeM&?q!5 z*5$R#SpVUIA>1t7u#hFypz63`0u$tCvHvp8e=OzS4^qe-_VCv^a2%2RL67h+DozeB zXLkQCTOEtSJN%)ww(ifKcRWWt=P@K!^2C)e_+`{K3y3^$yJaAUYEGrz@>U6CIMix6 zN2RQ8Hu*2l$`5S*{U(2XgTGG4Kc0N|903>eqdZcnmKIjXz${B_?mY*_DH>iUuj#)( z#&ZM&P+2Ki(fjE?eG1y(?_bf98`{CP3}bk`RU$B=88&g6v}!V7uL z*f{YA9^KXt|7pjYPmIW5-x+5Sp90o(gz2exgCBt0V}4Apz!H)#Vk4<0pCssv;@I((s0 z8`j)^jQ9niSH3fb1kwrEV^YbW>8^hn_CJ^8|7Gp}@kwEDn1^?GkvT++7o%5|B~$}w zsI>@O%p^#{N_>aEYSnBEEoPPL<-8)utF>9)(h0Bf_)hZ^L%=Bo+nU%*SSVn|vWs1z zOMKXv|DLwMzaOsu_;&x{$=Wb*S&u+?+C9iT_aiulblBqBqj1F{ZPAZ^H1R7z4%2xyGAXooHEW2 zmy7aWyBli1J3X*lC%RvQg}h?d_2m(w3?(S@?H0CX|G(MwfBRi44T2n=0}9ld1{qI8 ziq5lM?E0~Qn?kfiT+c>P*p_Cr>`mC*%tN8!&R6j|1VvrxuQaYfrZF|w7X?RYqGpQt zA_be0T*yNXlZ-zb0LAaTIZ)%;Cktf(z?ML9l9wxn1ea1Gh}#v#?a^VMl2oOeTgp^JH_Br#MT0HlAL$(HT)&fjX2gyKHhv(4B2b~e*^X8#ERKWN;?+I@=!w1x*`!vu?2< zP?k;QjSDX46U4XQ(OO(YT(Skj?2Jg-ShVZq7Hit*<&(zPT6A*n6x!OYMq~06AtKj^ zvD7l}im2I`8j|lS7T|Os6 z0iZyb1x~A^*$+_IvXRzGr90ys%cMCXeTXc~6JM%Lb3!i>yrNt-UdSYH%sgD0tgnx= z42&_TJVq&LtblnsW8FXqEGOcl`<_Ap2%|l%@nEYb%f$y%IlZI;&Hsi-|GselA5VI{ z75OATh}0`xJBi_mYi|!T8FZSnt-$}?eGT<@4+cgQ*jJNvSxR#uNrK}yQ|D6OxI=}9-ZWDseySd2+^^1#`Aji3;Ukb z!^$~oQrQLSIj~f-e0&yZPhBh%&+7=`=@NN6nK9MXe5%Vzk7WX&6@1^py{HM5Gdv)I zBnv&c`l-7*_QesuqKRFbFN#_uzxR3l@3XMa2HqfwWf94F)%-R-KoP7G#R2m96%XDy z0aETG;C&uxu*CiEP4g|{bp-I0HxZ`7uTHo`q@wuUp%21jkB>nR#DxsoAma*xg?ui_ zK*A&&k;ptkiI>dxp;b(iyTnDoF#wg>uY^2=k7lZu6-DgV^PU zx>lZKF`M9OuX9bKR1JxrtaRfh@fuVY6Q3IPC3r1$hL}q=GHKOQtBpy2@uCb)6SVtG zz^X+*jl^d0lPOWWVQ;wZn9%Tb_|CJjua=~ff{6UCCxL6A>=NMgsKZw7rgL(ZSg2YW zA)`hHPG?Au^DR8(m@n2kKbVxH*b<|8uNeEQv{rqV-hY3* zX%tHr4C?|SOZJE5>6<5sO5XJ6T)O5WHcK5ZlJ4WIP0SBOuGhcGQ^519H$KiqM{&2F z_?FEl*Fa^p9=`i{gzhL^z{!i?x>An7h*pi4;cjJ^=?wmcaD%JH3XtB@D;42^0;)f47;PJRu^%>E#>S8KX4~Iu1i|| za(JicLIeHq%k+~F7Psr|Jqv-#=v$s+IvotYR}ty_zop7BdISFl#(OZ0U!`1x7;O-jR%MSBD9g4e4DI}OL<%Ms zYJM!lx^;KhayeaPs$i;|#~CLb-GwU3*j21EZ)VjY=8n%$tn|`Cd)_|)o1UNVc1BF= z?ian!-0loCDZRxBj7d!6RPh&a$M5-4mp-_vK7Ud^ISAJ6RtlWeXLmKv&14N>CSwbI zRew;y0`fls*XlD(DN_Ve-G9Wc8AXdn{~h&%h#VWiE}}0_e!WIKi-6C{ERHEIUu|w} z0M~};U-m7I21h{5{`9b@TiT5c@!=yQS?EQ14kd%#=ox^QhO$=24Vqzcxnp!9WWKif zac;MDDXQ5@_lZ`mU?#7BF@wa0c99vC-=?ojD&$SY8+?X0wQsXeN)VdUZ>V&D@QVHM zQN5-sRWT+}XiBuNSWxM)mTl-6E;1 zWkOb%6!%|}kk_LAGmiY*ll?o6@iOsg?RcO!`fWP^Chs;WuD-cA6G;0lc{L%zii#}FC1yH*`k3&zR+8ka&6^|tu`oiu>;4!ObV~snP zmG_d|(*DzlZ>w2A=+>FQr#)}g=Kr(j7+A=UXrOkZfUpfkPG|o+ zi26T4C)O2Kps6fu4cpKN%1-(5@8DEi=r6#`1OT&+8V3k|T&tk&HA=%WFm(SaBR!=3L2iRk3$)p!9I zh*tS-{HY8<|L2$NFU@CKr7QF**mesdUP>Y(4L zg8F_1xExg*P4p4#?BNO3=vAT8OanRv<&u=iO?Vy5b^*KLY%n*2V#lDMNTGI%eg(h9 zL@rN`j0O98$x;Lvp9rJJg<9GcLs~eV1gma6Q<;>1F8VeK%-nE%GF{_N@{UY^EC_NL z@|@gLIw5NC_#;cHkvBWrW}n`Yg%}~Lgpnb5YT8f zT+zL0^@mT}F!=?ox7{z?QM&Bdgedm#$FfTd7>|mS`~hWN6yg+5#>MgFiWv$c7vN#V zAE)&{AIdPj5=v+bC1cej@Nqu=%?ZNjK!_OjewjepI~-qA_1lA&vb6w~6TRP3OW~D# zsL3%TK0ICHXSV)0+02+Ub4pV<-!Umw`A{y2I*5Xy8it6nlpG_@dj_)N)X+$YMPXIo zbV5#Aj@8|U!x2X!(o-AGMm}5ctz1l7Rp$V*iP+`M%b8l;xb{Tg zds_Jr5iUrMN+bqpGL6!0b?XwNZAErV0gV@{FK8?+`uu+l8 z-M#|5p}=Z1pK^;C2w3y~77Tc`Qa-m|w+76v@>@m}?~#9Ss;J(dt#SVa<64Q~1PHp> z;B&|KfKjJvDf3X zKG4$0P8u&#zO*-8y#R#s=F};18_6{aD)#%$I8#?oYzcV$t&-c%(N~%^0;q$bS1|N? zu^UG9Nj$OMIC_~?-)<)?1|Vt;>2KekshW`9!+_!iwOqchFD69P9E+!tLhg(pjA*l* zh3R?du&N104ang&;gc!Yt>00D(ytozFhcsgt|H{L#Tu*8pqT21cQ8LR7;@0z#W5kh zXY-7sSw3J%^T-KVv&<(-LJm}cdNx{OnkQHRiY+YU6FbNjz%BB(l)<7h_S>Bn3dAZe zR354mI0R!!0h$QVRB-bD`br^)3FpaDx6ALiR*YsVSjqb_{)4$vX)?@gM@kH{Q52rZ3 z2$Jvckli|EK>&jhlvrl$y$AovP920Q1T+brXk@Bi)F=T0+hU3X&x0|A*Xe_CB(VeT zE(57_B!w@-ne1*-tdNzZ%ND4zLY=NO;@h2S&{Gp*PU6gFN@OQmKlr4?V?HN}irK>4 zE;0v*3lB4dS`2BO^X>{H+yMA#M& zURBdkBPXzpi8LKXMFwcMlMDf5e{_CWrMn!2Fk5_$&)3 zLR?=xNu8U`-Pl(UNb&!#W)Jptjbg~bAR=Luh*037a4Vig+4|owIU*x)8R$QwY=%nS z(rk$1YuYy}#qc}bBH$Bdw{6`;p^^&I_;7uglXUw{ngM1!sT|Xyhi3B*S7@zs<*?-j zf23CBn?Nn!05Bt;!i6K5N66*!G3oXCSL)F%L@4zmk;;#g%KlGt!FdMZf6k;3OSHv5 zz2r%y8+^TTr2>JAo9Bb+F6t5-sslFn+a(FA^ACCa^AN}-$a%3i5g7znhRpQK zGcTz8S$h~c!eY(-Fd&B@nj;-}th(9}d<*o@F(Q!@r41HMAyvsQDO|o#+Tb_Oy7fba zPo!EW>KH-dQs8e#RE&+>;2rU0z+!V{z#E$lwT)O^a2di2i`DC7dJ;#`*gGWbv|`pmS= zuGz6XO)M+z1uxb30#V=?16$8Jd%4BHrh*awqqLbKn`1g~?}FeIVc!@6;0?u9I4? z8{biPDdu`u8<&Xt=W55IMotm%lrQYalaCQ?d_a3rs|HGf`>CNo^+$Y2tZn5ZXxQ&{ zTp&@5wEPn(Q4pnH}3~<;e{XE zwX?x*={7nz%JZimw4?l$?4v zHwtA)c%Y1lSA%)&uEY@V1K%*q`{Ec{M)?pO-?~WF3C-aM$f0OS5b4u|5N1`HDig0a zyDFsc19>Ep9MD3BHP(Q&Lyjy$qH2LYmAKF)i!6xeqYrqCSoV)Sf4?&h<8(4Wlk z^rXC?5{PFEP@-owova3dKi1gtti!4}4}J7B-qdXWvSod;eoZzdpX#Dcof{wwf0KHS z9LD6)U;nn~Nfht}t-d=^IDC5-z~^p`Z7LNkrBU0w(-^NO-DjNa(ShYF;5-zu-wZGC z&7!p3LR7+%$YcmUA0%*!a);`350BPw+h4veb7w-iNn?YZ~{`SxFCn=df&kLBA3db0k_# zPo>kl*H@CoFIqnOAnZcPxDGP{szw1v~!Y8=R|HN&kslKirv5gtqWH&B&f0HXo z#OHC>X-P$jY;1x#H?ioEaEY&MRm^+o4WA!p*HF^PfR8k8c3Xu*?m;=spKG+Kc~uqv;^?QiS*$ z_HH@0a6kJi(h)uprl{u+KnSB1WCM99lh_-rThJ|=qkAJ1>n9k`js)idPD(Xvyas&J z;%@2n!a3Vcr^+C~oo|dSFDLYrS5a3}Xl#g(#=)pI*C%FzN)doS$xvc%dWPatc#lze z$v|YuIY)-E?un26sh&%s?P{OG4@B(a^_S*G>XDR$gJ~??WQ9z6;c!I%>Qv7`vjeE> zgNzEbBringU770~j0PSOOLFrALIPIuh5axVVqFWO*O!na? zsLXhIQ|;knBX95AgpclA8W1Jvl0orur=rYXISUmj(|EOwN0f)B0`=%(1NdN4(4S$x zWvIlVjV;l?7^sr1q@$*a888p})C3b!6z1N+OrD25uA!-?SlFJ)x!eRr9UAirc{VY* z(jybO z-%}rr_@ImYda^P-9MU?zHps6|K`rIO>t^uq|s32hgR4>68CG)mhOX$@R(F67qj z>G=vYdG0d2!s5E$q?Z2xUsg-$mrXF$a^&q#A1#i<(r&z`mREc=X$9h!OJlrxuS6K+ z%@BoLj{+U_CSS2*)U`n8x|sg7C;9x>_9T|6c0^Lbdp7@o+`_`x3+s{Sx*rXJ5>!Tf zk{(*X=J%B}zSO8DBYIh{woN*U%QCs*LDXcbjj!_;eXrG7 zqMk>fR59z#l&5Qqx;+T!qWn4(@z8TMJe^yDmCN#(V&YEPtKlg^})){V`fGLgUAy`HRx$Lsi;BNwxkH9#Oj!%$x0 zk%Y0mgHj3~WhAA72LAZ=Q2Q6;+^!-%wE!}L#~$t;*5X(w{*Lu#K9t4JNR!i?{0M$r z;lkbZH~|Qppk!TCAQH>y2*N2?dSI)1mI_?$&9o=o&4uULp3YN&TgGKgzc934tqWG` z%uu}DKnA(l-Q$}p%zSB{YM;h82jfjN5q;J2qSXI>evG0X&!;iHiFTWmQ&viP@8(Jj${vqdC^ zM}5`UHp67J8@2ZWv;M(-BLv?Q3ixoaL=_VRi(;(;=x}4I$~^X&n5%3WljaJdf@sDs zA_4+QO<&i{78y)l=!k6MMyXFgzRfn5;r5!`RZ>qZgMK9*+Bm*mdBNsudY7jtHw#cS zCZ*eJ(}7TFYJvO!kwetIp%P}tTnYRO#Nb4Vwxn5juYP$3e)m`k0YiEVDoqcdl4ShG zxodwhlK}YyQQu?V%7-wB_V#=EPD&@zsmfE#r#z00kB@yJs8vHoj2ffpHnSWBcS3wd zG@1$LUO2dYdtTi45&R}!nomOulQ;|X;z4tgO3F*HB1n>5Xh<(d8tc+)WY?fi@MO2S zJi{`ar$Ja=2sj<|YZJu9O9xQQdGl4)>0qd3?5mO1BmujoI$Z*X`OGJO4Cna*7uN`0 z!>C^x<#7s2m5{k-M5=TjlTflDKQtSai6wZQwx!;9@?v>Jpp>7xXOf&<+wtsS8Fhan}{Ql!_qh<>As7H8+xU zx}-%T6as7mwr{dhPn3W!Tkv`&-#{yk$VV|F>|I{l9Ynu?02LrF2hj-Mc~k-_La6hV zvdF`yinr8EZT2wj<_onQI^KtZnQud&oP^$es&a`Ztvj3|e2Z5#<4>*J>byer1yeY8v;$3R4r-&_5$&p>HMy;;j{|NL=6l*cH zLgWdQ2$@esUnFrY69?${6>_dcoote@CcQEG?FTUf?flPY@-o*4RLs0g3uEcEY0kKt zK~cK$eNxnDEx&H-)L zu&pc6QB|xD4mkJjRAaabBjb6A!J0~7~aik#F zdi8EW{(B@WjK#4z2vyz0W!={^yT|sMdqxOE93I-!^ZF(8Eh0X*Us13rM)OhAmD%*c zoU$m2=v(*Q42Tf3A9XKn`@wOQ5{rQK_}o?u_GW84P$Yf(-xWz=0&+t(_pzk@k>NnZ zyYGQ9xzH&^iz{LAx;5n)LB8=os+DmX=^7Sa%Vc;G+EJp*Vx?&^M&;eU4~OfyQUM;v zR&P*t@?nW;GZQ-Lc{6qA`Lg$|$M1-f?tB~DDA)bZ4pG4!2v$H_&hR`i(+Bx|Lmc19 zKDNl5n@*bOOBJr;{E_qRd;)u2tI5zuXEpSnwv1SHtD`T`$!LAX+L#r-Dy5eC%8Qu& zLb`#M2%LTx5%M@vO`^EPWBDe@j6UCTQfwvCRXYL<<>?n9mW;ZUU!xw&eg(XEQR9qoG}RP`6~jJh z*1g61reBo5xUwM^)|QSHnu-^BEY!aS+AuWoNgaV`zCVCNVTa|izk~`5K#640$KeR zTlxyW`S-_mM-5gjn~_h7V(MCMm+X4d>A2i^FJE~l>dl`16|_h`DsUsCBlgr}=>F>Z zW)%rqWIz7q2v7Wrj`zuOXhzXdogLycw877S4G4)PS-C2)s>)08W-3aVQ_Oc-$G!1w zXMfD#(rU4LB;ozmT&q~rIjHAl4#FvrxlrC-lUId$r#SdEC*Jye1T_eE$JeEf@-AV5 zAR6T9*|vjwq_P?y@#w~>hY7(oFgw-F+G@wifi-MzhA{w}PGQPbO-z>abV6PPCgWaW9xA))UoQ zN@z|{EH@hyRr7@fH#LOJSXv$KR@bXL4e$e~wtlz~tZ~m&SU-M^jvNix}wVD6WS`VaP2SS2Mci7}?QJdSDr z8Nr#TaWhr|4Rf{MHEhf(wAKTPjpyEE>*$Vux_X|0t{zCHWVPAY#>Jz`jbDnDi!-!Y zL!51LA9MQfS9pMqZ$(+&2`2OLeIvPOkxMbF^c+Peca|HTXyZH&nt68VJc`fWZ=FbK2Xa|UUDFP#4>7o}Zk+)FOi z$(RYcf0Cy+!=(v3|3$$syg+zuGFQHwaPH#+E|}hBo7;p~z&Xm{;fH+lemhxsGwq00 z@fukjZTQJCm?t+v=Y#YM{f<%o4N6rFu471;BT5I#?aqV4y92!$H5YTqdV;Q=cD+Bo~=sH-ZGE+mOs8W%S%h&IS*i|^kdcOk8s z|LRk06Q`DwU0hLuo}pR%ku08}!`e?k@#KJ!Q?^@YlZg6CX3=P@vr- zj*QN5M#f#M@78Px&BX;*XnnW6)RuH^;f{hxU$J&WGw6Q3k0MU(G-H#wb8fp#z_xj& zLd#8!Q>*g1h+_{&0)G)7?YxL!u!_oilNvYm$vtJ+ZzFL=xPoM3@j!GOURyXE$2bAe z7}$Z=OBAea6o#dBT*+43iXVv+r$mXU&14Sgj8HeJCCAz3t38#tR~0>-wU|Jho7D%jU*0Ld}auwkZd}hyO$Z> zIGf+T^NpWpwRhO|mh;DE;m_AYdgZopG>>p4-DMrj#v>;k-o;(i<-}vQ{Tx!1>ZV}q zJFQGR7lD`!9Xa$m7TO*ZUm6|q8`$X1$7Tv?o$#C<>-*&3;P-rLQyJ$)H?p}*@M3z1 zZ+)X9HeNt}lk+>2%{{e2wV{zFxOupa&tkG!4Bx=XKBwc0RiUt?#61{}!(~;A6%4K?()pO2KQf8Sl;Y;{QQFzu zE+vNdkm=~|AprL<>J<$dPT4cSm$S{OBmlmc(k_zz| zvF2#{28xw2jNXpr2?_O05OWrNyttrq^c+OwZ0+jdaeMETA#@%yxbdU&)tB;~=S3G# zcftj&2MpQ4u^(6rhcV{?PBhiiZ5<19b=ZDX_c2AXc z7f)_m$s(wgTBa75|KQqrlY=WE0!yti3Cc8?&oo!O2;F8rTD&0#Qjd-Yom;rNpDzWwk>UE%Huqpi=5yNyJk2z$L?`Kn!|gWKI+6prDB zk76NaI;hZULrqhq0uM?1h<^8t#h8E-i5zI`b6ruQ+u6*-ll2@O$s~QF0O=eh#1Ad! zNd5f$0b48i^60kXai(o#zR zVTDY|6OYHB-9B#*^wY}msIvaa!51ekf!8_YqlEa90kSfSZAc8c&hNB8_O7jomjw;# zzNjN_3Yr5R+N^$cp30i1Xn6RJy-ZExQ1#-(U_xOxM>!>rmgSUf=5QO4F`xVotA&o( zfA`XYc`!2=MQ%~pmxTLdR669UrSy&HB;xRRRQo#tyd?(Is)9wIE0t*KpA0cdH|&gO z1#D#t-sWxC-Ksh5!&)$iv=Mm(33GQr)BLVnRbfj$;r5uPY=Yk-7lMgZeFXh7r^sBi z;H+s+2V%9izL~9rmHgZ#Np(bm7qTb!)LdnwgC_+jIpq|FmS==d+*YY8?^>QU--y;( z70$f<#0~Ep4z`{jNT6A^wi4B;%U5zjYrv;nf6~X^vzaaCyXo!-1pY%Is1D-!``_-z z3nH*bPKAfqkbogCA`}iMa-%`8a;(D#Y?cBda|0A%Z4ozH#zM7Zj>!Uosy1zZW$)D9^PU-lG-SXB74m!?jB#&5FcuLY%)*4oH( ziS{2A$_GOV2VRsexl;rrObZVo+BB<&nZZl(<2sa5#f8)NbXFz(LFK#b@lN_jLG|Vk zDvT}5mqlt`8oXFHhiOGKK+w6sxCL{ipu+g)9~OLx6bWPSaU-!o`&9R+u?Z08{7&-H zZE8ZbS`{S`Lns)6Dzq06Mea^f%Jre7ttLd-db||+|8Vx!aaDEOzpx@5(w))`f^y1tp}rL2}a#(wlDS?rtd&>F(~nYkMBg^StN2=l9E`c_3op9m(5dBI6{MnijoLB#bYn+HNG z=*Rw41pzzAGA72PlDh4XQzg5PKcjTM$;@VS@2cRAD6k)2sJsLWj7%a$Y;-IZ+)&_` z{AUgnoS?~KTR;B*0jC23YL=@0VwL630;KEWZsl)7y3v_~iXXP62V%!eOb}fF7653m zKWp>NfWLe8(`7`I9qZDd?N4Rif4Bf398ts~CS0tco7W-u`$4r7bv|`lLoV_-4jQ@Y zbD=Y*)P^h3>{`W>S>Bt_Cgg4YBEb#z)V)lm#iWVrUEL`0Vi}hW{#a8nJKmA z>`!XVGFq;7!sW6XB|wpO065H0unE8?D<^Y`OQtO4&QL>^#K82P*<)*rZ%VephE?EPzHay%3_^ij(5SO z!Dz@w-n8{L@p+{}gPSI!>g{LA&jA-JPr))LycAo~yyyIcEuMD=ODR%ZQ;p zJYD)A_ymaqKnWe+*kmt7NSKNHUAsNCxjAjy;g=#ZNXe4`(f1~Jme+K-Z?#<_fu|ZT zNi*>FEzA~nHJGDe8K-Dd=^IS?BUWZtJ!BW)J(cg^uE|F4jn<3$nSsP>-*MExlat#} zFDuilsIIbLIHn;ELcj6g!r2m~H6@VsaHmynhIWpXOu01K7~OL1IFv^Y`tsP!ygD^n z?1Hie&yjLCQ^7qh&?vXrA9aYX^nImj4DGju#}FW=g25vlOD+XX|HP3rx}@~%-KwNT zFh2&PR;oPt%&hQp8o7XBm2I(EOx*E#mN45{_NJ;ZU1yE{PeqYC0nMAK(JRLH44x^@ zC-!qKNcL+RAl&s6pz#nf=zlt1YC8_cT3W@888vVnp5pyM&#us(=Foy+Lhzqw;`C$R zmh5f4#eilzcU;$EVRV2_g1i=?#g`oP01;T*YcWm%NjYl?n3s7@4y7`h6zyT8$K`4u z6_b~lpDr{4Yv2pIn~qSp!nMRwQEBZ0&%7dH`&A=78(KxaE4TW}x-nHjj4SdLI0i&Wew6{+)$`(cM{DYb>()#>?qo_6V(dzkU(kaPAzRfx{sDnr@_UXQc`a7_|4Zd=4TyhJ#1vNHXZDY&F_E+mgA~uiK?J z^?b|jHDdQlWK;JbQJ4K%L7%)bEUf7BHQLCO*n*d^Cs$_cMpRY~WO7k?aD1rok70uG z=c+c%^YFi%3T)H3L29kF?0DuAO;O1zG(jIOyC1j4AhRpk2UMIhih40EQ@2D_5ghYx zcsh2bOJzN}66FYE362#jh%Yk@n6=6aslmy;v5e@|VL+5~FumuZN3Bjj;Ph!q0oUB( zWs7c$D=AG7c?7)Yk9ox2I?Q|Sp<>qJODc+(-4GuPa=ClS!TLE#MwP26^XYtL27EqU zC-sOccFC{p4~K3}Z)>cgI1XhL8XZ1S#kpW=Ch5~f3X8TNjees*pjP-@&D;1*=kTS+B-qRT@?bDZxgeq5g0ts`oe@mmaks z#;PLTfmF_eLoL-F)e(}JDTey)OBiOyy`PpLq#xdSdjUCz6@82ERn^Q6x0*!^fX^wG zbNOPOO-uixKHUKzqTi{D6~mMT93PJwn?deOYO=!b&%1x1`&}aDm<&sdJt2ODOtXn} z6=Xj2x~10Ro*Q*TUGOuIcX!^|$-FTl1c(I46REsjx)dmDlkw$8DCeN-$pm*RULMTH zY_4{rjaa4Kxx=20tTd$rJXu`)!GeVf`P4~*mj7<&uHs2(y4&N=h|>9HMZTC;xe`0B zgk^Lxk?a})fd+LLXbrX@&*37ZROBpMw1d>+q>h#CN%E*=mU{1WT@Im+1#EXPrgVUh z1TsfKZI8s5a`u%AVt0qE+Z?N+8Coec)5i;y7UD0FY|4*N!3`s(!&~o*kJtO|=0hm` zyZIg{QYU{JDG_n!AWC03_mOLij{SG`kCmN$8^wX|4#P{X&Q*{Kkw`9BdEQ||)vq zQSi6F0rm9q2`d{_0C!`es1Opo)5^W8V?6bn{3veAdC>rb5PC+=%InGx-DWoy->qGK z$Q8&bT~q;V=cyj1;ufh7<&y4z?1>0LZKN z8C9++@k%L{9`l|#Rx}W)w#u1SH0W)$b-d`WDOu_eKP=7myG%%rdw*i-2XFJr88P%4sU>{pc7gCTNy80%;|6P?yG zxd~nyb9}NLl8KZq+nWv?29Ifa1(qd5H>MG{uF2bGc8M>+L%)QHW>sGYc+Q*NbaFwOr&Ual5uD3!7w}O5K=txnFH57V2)F?Dk zIT9rcgPjQOwDS%{$Qg$ktP?h^lO@-}K5D5Vhr6O6PnGqp+1IzMaS08%{9NW3x<0q& z3xx*0N8fAglnRKz72cWv*?az{DBm-ab{L~$`3>th^C`PcCeY;0FKae2I6}*H2h~+E zPKLJ;Sqp&_texw%sgl$Hbu;DZX7iQl;DrhZ_fh~clS1CNN~PG{n2-BB`>tqGeA&q3 zE~q{FZP8rm;f-T+vJvmMFa-!sX2|sXy;Tt8>Y~l40+1irsF(gv+tX z3f!vY2gVs#erlt=<%X?KyO`%kp*ia!2oVi%$YK+y`E%vX@G1!7aroZ;x2l~?g>Ujoa1n-F__X8JR z)meMV;n5W+RG!Z{YTH;;NAWn?L$>Bb@V_sF+|G@-@dMl+^!#^%en!jLLYDY+)$r3$ zp)lYG!In(@L8<>^GlI%%VrsY6*rF~|DTy*unK_8`AmUEnWOVE=uqVw9HY3q)_d=-Q z?(ogFC7Cs~JXX5?VAKPjbdSR|6!W1U^Lo6OM)TXDn44wngf%q-WW+8bly7~6fWDeZ zE>SEMcu0p|l=vL&6s}8Wv2D)y&(F(0@Tbvj7yP2W>_e_`pI0m9h-t2;*21;tm(keB z)5RC~4(+JiWM3W(?>46uYhGVBbT=R0B6hAC<>^h$XM}!tSZA&Z~MzQ|%&9DvVMtbFJKKj7BxXJzUD{RLimy*Mid%l1rzq zq=efUFm0z~hL@{>s!*YD_3moCXI$?~Oc$&V*R=U@kg90jzj&PFyv%%WEvaq=G>V>g-jBjoCNEN`$e8(2uY8X{z-kUUpL# z+|9VPDQjI$+cneTOSvmIBcox-g~}cG7f*s)kR-;~Oh$R)B%&>}bBy3z%XS(q2a*ga zZwN3xE#`n#-=i@ZrGZz6e*lo!i7ycyPCu^t9UNC12gtrZh%Vf%P9*1E?6$ zvC&C|ZmC46IH8pqY!Y`5^fgqQk4a$3p4*wVjxJ$VIbSo@Z?((8sdR_PK=MoTEpnb0 z@4Ty>!hfeg#1*^1s`>ToI4Sij$4PRdH3J$EpN5IYr$t3kSW=1ImW59Oo}l}BJ-svQ zqL;-Y5}-AtimfUwJJSWow?m9G@qHbxIJq;|>kSWJ6W8HeE4791EgH-2@p&ynlp!Uw zt6POxJ{Xe5E|0e%J&F%0877~(nGf2;Alb6fiAr$pdnh0rkIyeN#X`Dm-b!d>Dr^~% zyVrUjACMLnL$J6XfE*Ok)kizxpB`4Xx1R}y zimW+6IMdhrHHV*ux=ecx)pvfCM?ORG-UY)6Iljlkot|Y80W^iWk144D)-9b{Z3>C8 zS~$_FuYmH`Gf^A~kg@4%UZyad>wq}Z^eKP;+1)uehwOd2vaZT|LJ=1HbBgN zlbTr3LeMfO+R72(7km^&s1De{Zug_5%oJ)hY=767tsPktnpa$=5mz2=_VE%C5=huY z{r3(+lNxjjTH~BgyWUn(QJzoo&NV?$~zB$E+mHbKMXhpn=rrl4c5O8EGnPbL8akOY$QQ!bb6fB~W z$>1t%(3L5wyW!kp0^zuL9|b$XD-##&K+m)1d8-Mhx6mDT-tn~hk zNnN4=tL}u?<-H}0p$5;|%a6Y#{84z~cF%Y}M-XpLz1bGB5U=%hUU-b8DJj zap8NvWfxJw`8xoh5M<}R-`+G>zps(Z_e$e+&`uNcDmQun?!eMeiFLVx~Dt3yQVjlw{u;1@5O3>7eeb9kG!YTI?K=-#ESrP0ZE#m z_jJbxX?LUB@1lUt+R6~NJ0tdc7YbRo+(btLw=WYZSt3Y8w4zUJ&@gW)CiOw>|U1h2}w2&jtZFH^T4vTl3I4=NtM z$92BizBHX=)Z}z!aZx1Pj9?1Ni0I{gTq%?(tqNem}$X12AflAp^@eipP9Uo|QePI(DzsZ|^-23LER&V4&h|efE zQ1a2u#^d^A?YUhT*c+jH^riT1Am5>qw{SVyO52_(b_b14zAS`wUt1Rce8W~W0G5G6 z5GIi?b^fJVdG2ru6Ru*WYvS8FzUenm`LDv>PEQF;NzuM1%LfO|Znm~M)kXR(rG=)_ zQet=OMXl74#_xzV*>V!}-9--oDn`jOZ)AM6rzHwrQkpDZS#UFkj)`gyDEibyWG;u4 zy?wVY31#R^G}|a}86;Z`@7*SDrx=qf&#!rvE8|sZlaZfvsIIR7j$}XyqtW)~D|X zD1mi6^AIDxX2d_Bz`WjZB{K`Y4-AiMw8DFz=C`8~R^pnT)UWH9 ztwoiIFL2}60+=PiS?3>uE=tsvhN^_;Cg9%Mgsx6`%?f41MKMyQlbe{<=NB6fct-jt`BCs$DTqLxDXmE{De z0jZX1=mmrl{7Y!sHP_W(6%aCJX(*@4+BujRqk~vgRR&Rmg|QgJ$^=1O)v6-hr#5$M z4D}TKW^?&5KSZ6?M-M(6lc>|{3>;K^sH61GYK}E~tTkZGV_ungNsPmmr;yGPJa=1T zb#~2n6i5$tLmrT-n;yE~sv%ueov2AQ<`OB;1hg4Vtx79w_JF_}WuDPPSt&P(&xIro z=RR%5etJ;Eqc%92T9!HMN*>2wZgFvwtxr(DFLvzn*v$RyB~7O7TrAs~ivZ0>J5mq6 zAGZrpUv5;+2UzisG+go}owg84R+gK6-160ejb3@Id`j}i1)Tv@zV;_)gswEZgD3g` z2?6dek{;|MOgr=|AnSTqYsg;K0nnfVEmZOYCCQsecC@;RsS6Wep(s>n~56 zBm&Ut%t8jFr+s}>Djn__fnwPL;s*-3(#H)Q!i!n-S^5QR9*DK^jdms$p!5}2s_5tn zRr=y8i-U<(gn`vs?`CGjq6iAG-bRCw15(+3{4=mT78xcQ4Jv4aCej4f@=M+ANtK(3 z2Vx-FpeOPh?k^B$52zK2EMh5fgGiY0hip|N#C76IPFn0qgZqsXSlu`j{0{LMmFsOc zzB!~8)LP|nv*f#EMa);|KAzL=e9wwNMH%HX2K-$G+rYUxSr`9kgI9vFw5r)D99Fmq zaz(il+18a*c@)BkjO#^H(I1E!-G{EfMu-l;w!r zDZR`6n1N`HIDsqaaLywD2!4%lut5dClBY`$Ic-8u_JF)@zZ%207cFdf^njNs-+gH& z-!1&kV50;pdM=!QZ}Ivw0c9(jLnXKfyX7^&7}#f#MW+}Sf`nn2_DOU5<-zO6>_s;4 zT3(Q~^>XOT0DyL~#RH zTmI`3PxV~C$D{F0{&`Ob@idD-j`iINN|NcsuWtv_=T2pETO}uKLFu2+jUA1bnikl! z!zM5g3OfnJo3!$uJfByXCr<0Tb%pV;33iz)Tba79s#mL+>JQ#YX*my|FI)|J$-kg= z!;5iVpnFOs8zA9za?Y5r^J?HYf&ONl_Pr zX&Tqti^4lXhJaUgJOy~*$Vdx2h)1wZ;ZjEz_xB4Im$TmsHwg0fAJ=&XlIb)P;htz5 zt0$@kLpV2BaZsXY2h0v`E#D_D@@KGWx5_fPkhK;xr48n^<&_Sm1OC86Mvo~a%5TR! zwoGDdoNxj1m95cJM=G3n)Lq_OsknAT*RRH_nafz|>zgzYyHjQ~p{1Mffk+CW^P$Bl zWdwEV@obyu?~xtPLhq#R1OpTocxfU8n#aQR74M?wcw%J2V99=O|L6aA+duuxZ+5QT z!&SK^!614~ATl6#G>L7t(+mPC=rzQ0`BfLC#_pxxKsU(;^bg85BcR2=Vo;ar6v3Y# z&P;vMj2mH8l2BpfZC7cPNaOcGDxHbDm8~Vve|??=0+#Pu^~0YI>73U7IsD!>?% zOXNU2@IJDKAH^6HiU0bBgx?hgklK_>yER*Jv3iLu$A zblT@o@xxI9Lu86{1Kt~Gmiy{V3V)Fz7@#+~{9=s`@CZ{-$9xc<;{i0tFiX|Yl}|79 z);Lk&Br%-qVFDDEdedL`Yw!n8lsZfPcvS@MU=a#R->_cG3WAt$xmy+oGF5h*nbR%pHEpoPyB=aJYtD_t^nZP@nuY0}>+E-_Y(PDTl`PM&v1F322 zYIdI(t9>g+11fq$H9YEl8qRIJyk?r;hxy*mjonJrA@N|xiEf+o<{@_;5$C<`j=D&!HRxviggNn*SX&Z*uy8;9dzWp`jkERM&Je< zA4WWI3`c1+_q{@#r#`4F#cLh3~+m0(d@= z1w#f34qTQP%;i_KZ+6sdLH*-#<^_k5m=!@a!^En@$BP5@5abbYJ#5D0Wx}9TWnA@* z0@O%2;_4lW^4IQNpC>cY>;pZ8)&i)bSM;7u^rCURzB>kxJbSZaw2R*7q^}Rv=$Q_2 zC*eYrV&z1dFy0Af?*X;?_UAhe4l=!pDeS-8=Z-`z<+ck{a@hOoU0VZf-tinOi1y=9 z7XaF~goli$9SG;89N04IaQ4w92S6pEY38`q;3dWZO@13A7G}?E+g`{_>0z!UXWqae zWn7+!&XVKC-lEhvAR9(-uy(vq_LlX`BU;c!1z`5`2`y?>E$+bxvi}|JiQy8Gr#)R@ zF!(Wk-V~Z~ZwSeUhd(5Oo}f=9zdPOiK0%dRy_0J#`#oV+%@c9URU*m`1>ykUIpVD{ zOa#A~h4-=P=);#B{O7uZ?ahn+prPrqu~`pK;U-D&s-zU`)kBRX7x13oR5$7BLNwtW z9tI!pi=NNdv_7~+YLFU;YsEAvke>RvzU6h>CDChk3$vvjRxF3~Mw=c8HA(L~IlLUd zWcnGR(rf2|BIJDL9j<#D6WygKmV^~h$W$h9jqBmznibWPOiBw5fOL(D)8i@rT6MHh zF}KzOoTfHYfYf8sl%?bRuN(x_mFk769_EYT!2MLtB|i1*GlBCA-_tTpQpR~zM7zC4 zRAkRMRNPZQE4U}aj46uae?qMbD_(#NPeY&Ri7FO614l^fX^!Ntq%guHt{wN>Fm<*j z+ax{U;alFyb%T1L-a>Y#AH43)4!3m|!Pi=PwPs`qoyelt%<%jox`|+;ARhO&kFb|* z8u0j8R;`-{;{@3tt|Y%#j@Xl~o)1`(4jieaGI^U}viJOG$%KCTDV(b?9Q|T1GtpN< z;tGPf1rZEbQxBz-%fVL9Z?j!=I&mvf3zPZ6_%Gt=&1g+BNngj;QQ*+UX$e`GtdOtl zd=9$z=gh_0Aw>n8qIEPaRXV2~pna264d{Pc1%O9M=5B}GCceN;JmmO+ zBN7Ptn-uyN9<7_wMC=w-V>RY@qYmceRomfuB9Ti81Q++{Zl({>>n8+$mwO%l#TBs( zG1xc`aSSkM;iA6L$Cb?rbc$)Y44fttJ;Spf)FS0xvyQ!?dqX+;(Afh{m#^tb_C_*cYM?+tZaHb)}lyh1OJj zs`&^$g84%VWRr0T)}vpRV8w_g!I}De?t9d6YSE(^XT>@|CItzWj{xVv)oGs|pK7kb zBg9j{Ifzy%-MC5o2TQUNUq$1jh#J{Vb~P?Yz5BEZD9<8mK3C+bb;3sU0~i;MVu#A? z-qM2r=t)X@lFw^F(3k#FCUV>pV_IN#Unqmgp-4hIn`=jnwVe!}%cD zYSn`Ufe*I;zsVN*YrHv{8#LoOX|`ZVSY#?cHx+%jF~URFdk;t}ojr|;S1=^MQ%S6! z1UbJ@pZ-~H_;DJ7%RTNGIm3irdl7qMiObv?TW%luhu8TOOycv_R)r0a!xTQ3;*v%u z3@(&d=CWwFlDi@%Ny_s2M;;FMif34#pNZN|_xf(UWWG7U{Bq;>qBCC@cmHUxv}B{0 zB|@~KfD!TDEHt!gdptX;FpcqP&pRL%u%|jzO6E(*5ZepO^eP3wCc^VfWz~bZ%ChC_ zCq5gym9}={CD)CEgr;L&@r= z!@#h6eD0BlB?*!~_f$Rac0(c~J+o0s~Hbm_tGcx7CfKqe*0$d7D6g1GDRcy5_zn}Abi-44A z*BD=AJgcZ(ZTUqZ7aIu&C@-d{8{kg172WI4$>j^<=~Zs`F;|_`;!)W0Rf`o&YJ^Dz ze?htj(i{Yq_UgPl(^;xIjCvJy$jF~iDp>oJ7ZQ_>GRD2Lefk|eAkSict7(}z!;edb zxuR`DGYkEW7*qgQV4A!KkW;F#oEE*&nOk|Cib`FcU@)|TXX%hJCwwa=^;(#sxcXpD z+{9FpU)A{ja?uN*gK^j(`O@WMM_(4FTvce0r$ONBCwDt&)vEeN6el2zXfC2q-L~FY zbF+D7XCO~w$1UwdS*}haThI5X03Oe?Rfg0N14XO`)8t#rsDxT-P!}2=0LGR85wW-j zTCawQgOZpYr&sV%xjRK_&)nd zg{#R+!UvmEZp+I|{n8ddSxYRc)O2=4>cLg_v?Ylie3}*{M?u#9`qxV)FeQn^1h<$W zkz7-nLP1T^D(n|}uwW*PuvrIAl7~M>PPSZzV34;+OH)~K5Zr#l1?Bm|_qd`l@^vPV z;>A>($EXJWQ_WUby)h6v&!J8M_19HrHxj7(1nOdT*fTA{mK6Csv!EPs77M@mEeQ5K ztnpj+a*K0q*-&LzVTb3JNPRVYb{{lF<8|s_4ri>s%|cKlU|+Z|;K!iGspxr3lGBs| z)QxhKcN_Zxp{`4MXe+#GJi~JBzz%qc_p3oz&4UX=0aQ=gcoF1ufNz*&Bz8@#NRnjZ>ZV*2?AQ;UdS(7# z#8W{llkr*SRlHo%hI?%76Xqw{wH7|tRql^IRj5F=#Ut_N!C{X#EQxnm*<6$GNzq1_ za4tXjBqFk?orYnON=i*X$N`k?F3FK;mK687u*52Q9t7(3L!#Hd)&}8Lqt6ND{mk+&c z2EVVJYEI2am-HfLRwWZZ(tAqd_0u zgm}_o$3&}H?+8W6+r^?!Z76?-k8%L?xy(vtxf;jioI{3-0nX;XJ{{?7tXlcW_{-yk z{a7YAU09UgEV+?}2AtYwtrTJR*ytGB!uu-5QpB1;rs!(H0?6%vvHmaOL?V!y&-3;C z39;el*|JPnk>HODMk^SWs4+Be#J0zCU#2@wzQhU2D21Ia1@tRwQz&W+*~g*ESz= z`?B=3G_mXCLcjU$5Z8AFcO_3DYHoVvE*yOYHs}QfrbLyf=yShOVje3{z?o@IMSiU@ z3^4|rC~LLq+jDNVB4=oA1kku^k@^Ju9z)o03YjNLCm+1g7dgrc?}7sl$>%VTfyiJh z0LjN^eCAg_gAEaltmA%Gdlaz`#L7J5iE;^v>n_!VhxwtlyrIW)<^XgRLyU`B?5P&s zMH3)*mcW${g~P%bapUmfv!c*^@DWr8vYb0p)nC-4pSd8i7K`F>&5DR^f4gimtU7Nz z3{#bffI}%a>Y<3t29R0$j@LoN!j_ai7&+LnuU!McbV0G~Oc44srO2=)h(6CdwC(qty5AeRL?538A%{b z)g>8&B|GCBoGy+*QLrx_>#eppVKBy$tDrdOSn?#cEOSsrfi0H#MCx`H_x61>*#{*i zaRayM>X3%D)zSGoD~`8ow`4;Bw1)5^WE$moT8}p`;); z!OPZa6c$W$XoF$7>$OYcFh(xxoqhQ6bTy$BZsw(3PbiLvr=VBmF~8oH^KLHnN4huB zUAt8zQJ6t;Kpb&5VfqHxU*flni>+wK!ooCo0VX3U3>~*ed0!xI49m2c#MIB?vS+qNIt3_) zwS1Xey~2VanSIBn7-0XHi#olONg`c*fKknw2%sKt&-V7tfKagfBHbs=AywB*l->T!FY!UM9ho{kZ!RN$%^ba(lf!c~^xC-w%$ekvRa3 zG}Uei6R9>JWmo;g93yPWQFwNc?M5;eM(ZM!Vx)6CTk#E`3#2k5{S$9(VSs!xrf|uT z(FGI4`wbowb?uB=77NAqldJstN)SD<3&cGVf7GCf-r8}ViQ*;vEX;nRuO9gb+X>|p z6=WQ8U^7wfNG~w0eg&GS+fKnxl-fkfSVpJ!(O~Y}oxfo91{eRHURxkTV5S$6hdlrk zbERDWw_>h3;XkQjAWP*8`@1Z?mk0az)R6?Vi97~;??j03JJA-)l)<0a{B&RmJ>z~$sb6seV|%m0Zl$)rF|YyH?YhAc!dV!LVx=Ng;y3#INfsSRfk|B z>!bB6pSJVe7qGZzn5%S{bITn+nA7B~?FN6V+r0iDwbapVeo`Ctsvt&cV{oZ~69&`w zi3m9+4AaLQjNhRq;%|bxDe-F;YZDZ^M&3%jIt^%o4HcST3w2!5{HDWZV> zl>12XD#6(M@1Z|LoU!9p1)sq}IR2HGoQU5?WL@G!N*D*yS;z87=Y+3N@cR)3c@UdG z#i8y}Q*gEBV}9B^=Go6({&(>U&=a2@0s?-wI$k(+3LWm<*;wzhI&zM<{ypwds5plQ zYjP^v*T3@uFrv^$VcD$tp7Z!{{5Ed#SOqkLYAn>V9P|7A38EvOC0;(&t8@GnmGG6@ z)P(5QJAbO(o;XS{SYj;gKJYuVDvGsOop|)#of4NtSDExA9{70@@3tH-R@L&8IO8`e z)Jjr7Sw$AQxf(XI`xuF`Kq(AR_V@3B{k{<_ijU_le8}Pr8yu5B??w#2zS)lEw}kh* zy|{q7*&jY}KL$o}sGpJxmlsx56md(aRlj}}t}&X(Gr zK`EM_nfIy#d}n{|{+nzOkoBhcc2#Cvb$VC&?!)?)pj1!YgSWEY0vg13U5t z%Akb2JM;eeZ6FQ%7N|J6KV3K2>Z_*G=vEHT=A*Y7;9(xMq4+%|qr_02;_UXp)a}Ar z&Ece2F1>@z5?RXO^9Q$eMp7Y9u^&9sMSS!C31U?4fd;O})fOg;L3Mno9(rcz_5>&s z=9=E2FjfP^7y4%;f6vsvo+AwgrdM2XJl_D)B7ZSrWuK9N_0a`6$QJYO4U2&Z%=0Ts z<#oZoNLPS|ppc`&0PLr?FQCX2nPq=H(u!3ZYon_Cqf1Lm_LbbCq`M7tzo5e?s^J=Q zfxNV%C;p#r_@Dp7sKyA|DTEZ$5>+2)w){&|kHBXW8z=-7PTwEV{CAfNJIqrG3=7Do zC+f@D|5}hvh@twk@tz{py_nOfyZ)4u1;1dWC;gfJI}`mAsv`@`M0;yS(gw4A(Y=`; z%-_cCXa_}0>}nC2u@(PuuTc`{08VL_kpCX+>km*B_o$NYx)xvn7*iP5z7_OL!BW+Y z;Ie-t*#7yNff@H{!wfPTfD}^`T?w`G{rlGxp8UXeL zh`=Xn6Mg)Eig@cNDSazF((deNtP`>M7jR}M7j_YDO)0?Te+rj_E(}DL2+oiHxjg@| zSc6g!NznOZ-Pj%g&5qj;*2Q{-2r?1yD|{>=ZF@OF9-8LpSH!rAszLg4DKz7gslNyC z*D6Q@PdmBjJ5`?;B&^8afp34HRv zud6-*;y@o1(pL)NiHkcRfO=gYl_V8WX=KF{(+l}NCVq##EPo)FZRCw^PhuWSqJf-~P2tz-8{m`wK^y(|9XJ)xDYOkbe2EMX7`Nj7p{ZGS?P=pN+Ov!G>_sSM2yO&Hj z)XkNSAea1#5=_RzpA(uKtuOmE3^|WMf{kVb%XDW17fPQ0*BbpVb`~%SsMI9CpRi3; z@-M4en5Ugv|82b9Tp4IZ8E$v~OSAF+bsmmLsQ%ba`Y*48?Yr|8YqUWdu2*7zZtVkz zkpa8yU!Eb)A5Zg7*Hl1_@FBx7NUQZAOC< zMs75T8KHV)o)X4(gZXcJw`2-k`+32Rk%M0wmU-XITT}McH+-CijE77@#^n!u+|Je@p_#HT0NWGw0M=%@f5^|IV(Z_M%AYZ@ZA?Nk}}!3h+DFduBarj^&k4wEmaJ^!rTm z>4WODQb`N=7p(8H)cPTX^m!-kpJFybB4qsdto}6|pFY3W--01|mMM^|7t-4&sa`aw z46C^r#le+OA1p}Wo3-BWDGgGFP06P%WKD#s0W|$%rTuxVzs|wmb5aysh-a)0@`tth z^E!O`f}w*kY}~(HR5yEd(56~)eJX*|>~PCH_8!7(W26d{-lQ{*=)RqlSbDg>wLe_& zfP9ibTIr3j$9LHr(Q~~zdeI$(`DLXi410TL6xRfn62|8pmZVq99SUi^V^_sjzUYmN zCWggtg1tV!cf6q0KRn;me|WzC(|H&47WQVJSRvt|5vSarm*Ns|r&U{hn@Nj^$` zyX^UaT#?`EH#YOx>ns;B{2xZ{pZ4juvBBuZ_*9>zhto)TJD8+m+jK80{Ey4SrGR-1 zwYS&+ZnIQS^P&Vx?X;QE(&fa53#OeC%qmpFJg46CHuH9Qu)3J3BlGtx zNKnFBE;NWokO@Ixk5_Nb^_GBkAZ*dIzL|S0zWh+_B$2;a@Ykd%zPB))P_=3P+fu!y z!mwSf;l+I8tPTE1>I1OgZxTH96i!?1@p=v1W5s=|dQZ!zZfH=sG3?gCT|#HoD%5IQ!$Jank2Ml!Oc4 zynNqfJ;&v&llin$YT}M&aQhS~D_^01Wq}rje!(vec2OLw zRk!zWIiSw(aD(b`eNHP&J^#%J(|GhII&@G1g!Jt37}JNX^_Psn=U?|OqDTRL0CGQ*8Ct|HEE-+` zXZsAeM|HZfG=CaL&Fd$fh)C;ci57+vTEubVCDg!*(%(wmLCLA?$_RY zp;gNV#}_f{wTQ4l=;s_YU0YdG`7UdVIf5Kl1JF5i2b0TIvnfJN`cwK5fo1X(?$9~- z$w58YJ-mF*=m72@_5;)G0$IPMS-{o)`9bCb1z6bm$h*d?RY%{YRMYO~g-6u-Mje2c^V9b| z20q@&vlcp^$L*cDmTEF+jc3;+ST9X~v0pE&-f57FWgFe~y)#J<1aIzN0NgM3Yh_vX zX8`1w$o{lBmIej4FIk#Z?I^Za{5b7y^$3&yWD|6}z)!a*%~$a;D}}E@8nM7EgrYSO>ndH`M2KNycNWM%-Vgyvu2bqZM%jMV#x6`_jpqx;{y}G z=*2IK13OkNGD2a28>LF;?MsiW4oV?!DfDk*#tnETWa&Ize1guVFOh~`Z}a6O0g;p^ zaZp>>3cmT+mDSEVoA+SG3z5a(KBsv1(evSj*iDtpQ&`QD0xD<+6C5-pi9&js zZ4g}G!!NC4y#{S&5;w^vVt}lF-HKaO$w}0i=}IqDbO=vC!@~82os`Y|w%=F#BfR33 zS|805TrPaN2zeY9vC7=gO2Ln~TM`OWSDd1ES7#=fFd9?wh6J2s*pG%eVEmlKm+uGe z`)&{xJ5UlzaZqU9tImHtl)TwJt|dLQ`gU~EcX1+r=KHqI;v<13nUJTi3ayf*0Q{4K z#)~`p${=z!G60BUS8&`(>q2r*@Qxhr0RVOPwK{~3TW+=YI98?bE7&=5ICddK#fP73 z6|&l%ijadcFt4#JFo6~ZBBK8p3Oy>oYo`W(m4y^imetNd9M>-ZT1HVK>-!9sXja`O znF5vENMznbjN_h+2SohQE74bLJ#XX^xVhH*@4r$b{LJyndP`V9q*bedwzF7ip7_aH z#Pi-Y2z4}4xMca}?t9cDre~kO&d0mj3i(G}ylETRhwo?|0hScc-a%H^@hfGp5Ks6| zTC-Lj4LBZ(%09$w?s=YF0+mHOzWnc^kwrRYXUGE|vjcrUU;xlNA7M_fstCYujg1Yo zJ7c>TXX*0U{d`D_xIo2(^#kNCKo=aR-rB&kXj@hKE zYlW}uQ#l-Pmy4&lN*A&=01;Ha$fbG4Wom=toRzbN^=Kwpz5d{fNtH@a@!Rrzophh7 zok6sdmOJBVjX1wr%%CTeVw%NTbn*nk89X$yDL?7aM(2S1A>tah!ia92Jp*80Tb{Lk zA94x#K-hV6iH9wmxlRao8cqyz)#t7s1ko(j2hd-pfn9R0I&$@*wO>xpsG~{T@AvV{ zW^*(Xe~Hn!o-I89v^>G=n;1u)%}Q{=2a)T1xV&~Jyo_4KLHuWKA(vBq$Eu%>Pt*-h zWTFHKf&Snx196Om8zeBLKv}h(>m~kL8+k`cnQ|@;+V-^k8C`Hk$|=v%#r`9`(%ASi zZExc<0v*DhPZW*Jx-}{-UJp0M5$aXm9qbodLhtDJ@3&tky6d~0BgT90w~Dv0r%Lnazk!i!(XKDxX=Iq5ybp!L%lB%VFA{H=)&pix6B(?F*}pRqHj~y z%L)!TvmXryHEl(GT3!4To}(y}1v{zQXRZ;G_1g{Kl&$l2u_}ea9qAXGilSZ5`sxW< zbspc!))#WE8)3)6x7M}+&Hln~6x8)PXLnkUor&bDcYdZq3pjhVZ=KwUEd~5F4=RNt z7RkPoed~W8fZ6kHG^^eG4M0xd?67_Hx%jyE++wu`sG$fqJZ333KZPFzP8rV4e2cit zFhS3`hp<_(1_7tTfg5@@0TdI3%nqY=Tw(Db?ya_&g4Znh_V9@<|Sa$MF1Tm^4VC@#bKt36K} zKf>8@T#!6zq(uNUX1r!JK-cbAUfFVF*9wal1u5XVHEXWkk zl!b4+*O}umGXT(xES4z8_e5Any~2FTs7W#By=GWLq|PK8I^6ZcQO`}*>3ikIRP3GVJz90CNlqAj$zOK>Uf#VJr+E4UYTibHWPt|2({^gT1zHS^)j;ZF$3 z+Iz3{Tlf9v%UmrR)8Oh?P2)PgR8g2Xx6fR=6~)G9{ydzBZgi7QHeF4Lnm_ZkR^4^v z{8|rMKWnh zecs3GnRCd)Sa)7wm>=G0PQ+$=*^GZab$A~x?IG)hFt1@VxGkpFKuPEY&RV%vq(+V? zM`&f+rJ#)u9T61~^g%z{1UpDN+N9pOVd+M0qGuk;p2woU6Y8Au*y2agmvHL)<@Lpw zapSf%EIIAN-}JQrFV$L2;pW`4O9UGLUmiT!@08A_ZfNeC#7*7-%)fc{+0AZ&p!dJ= ziw%n#8E3J~>wyRnA(x_;QkXV-Z;jUIUcaB@B~yNxa(der5(K;{S_vXM*XqVSwUR5a zNl|pm%v6(|2y7LJQAO%TQ(UMq#A!q1sO(QW9#K#~7<@(Z=*y_8UdF%D{C8{kR2W@V zo+6{=q(CeXxs^j74ooF{g|DG36z93tqCPRelhdBOM%7vdcr2)zmeO0Gs1WD!LIvY; zADRv7vSK|QAGA47bZk)kDpUP=PP%S-Qud*^sr~uFXg#u|FpXb4N;%Waao-s#H~eWM z)|kI>59$L?qu!aNL*!qbE{Ax$Eh{fcw%eD(*OFcAJI!;?9;p{`vHc|Nm$l9MTWqkA zwAbQB4W#KPJA+wzkT?X!2Yx1;SN@2gnf-1$`p#^@MhFieSw!OB#GbY0{TN&F0>@kz zpm;Gwvs!zP5S@*8qPN`&9xZ&Wy~%yf7>N0WB=<5v-{7Zr%`$#JykQg+{j{<7I$Dt3 z{ImQ&NC3qzn!@+9fH_tvt2{rJQq>w3Ul)a|m$*aFDd7M6%e73U0@ zlLX`x4!L~_+*-xWy1M5V^}Eb5_NUxd&x|~sWEK96(5r)QQW1l=r{se zh{PNL)Uw~5r>GlaQj9_m|Gn`w{&hw*J`ivnY(;^Lxcz=`GiX+_L+PUEAE%k3$1_?J zBNB4oLnOkT6Hw;!TC&KLQdDg<`G_TStrOX^>JQbHJdd0?$A zxcp39kS6+%Sy5rMyfYtv8@!Q&>WzMpA^%clh8Fs*bhytW*I)MHTZ<#4E1Gr_*u<40 zBw;f*G}AOJ;1w8qV`G01E5dI(#ZT_EyZv33<5<1zkabNNy`!0*Tq_;W zCE6JJ1ct1Oji6Oi%$mT0ZZz@K0!Lbs*G>xj4s+n`mGQL3=y&zumhbBS;BJ@mGR6=s zuiV?`eJTuIuKm??n*Tl&Q`Lqxs;m7N0PW!>3wHl5S@;2*U96i8885Tj-$t?LYc|HG zN>VoV19=FSP6=Oz0KpfPsU$|*FRjkgw=M@ zPg;5XvZn$D?2smIyBV;hSXvMG_&(DCMoG<1AAwC1rnKR?E1s zY^HJGTDh}%gLy!`R>xr?8qs6MnZDgb zkPfTasO~F2u14Mu;Y&HvPluKjcBa78w))~KX_8-EHla$2UB&0nG2aX5a=s(SUDXH0 zt(@6-?Rf1ypwnQGfkMcO@h=I@MJ7#$yGr(zNv(j(wl#qL&HX_bN?L9060oANkt9Gu zP7Irxm2vr~NZTg@IBU4%@Ehqf=&Kzoa3n@C?|q-&D!y=$mFTJbXZ)aU&BMp%kfc#V z0b&&p(+~i;6X5->D@7SFMnbL$e(3(g8%(ZUe`J1qd|nHD9)b@86eSx8KX-e@FLU_! ztGHM6z#??va%p&Z@yZo%c+2IFOypLXjBoWm>^3bVdpGc8HYsSfk zwdd2x4tdboYvo(}klR#cXqKBy*3z?G_1;ERN?l9K8xYja1S1 zPL2F6I_9{W=H$I1(&nsJMcP}vDY>uppNlZjR{-W;{B#bWiaqVQfj2wX_Z7~r+q%FWNvjG%FbL|tL&hC+da$%?y zY^#x=8^6dVPAWEB8n5#hfL~m#R-5a%$`Jm>Wk4(gM99BM*8*EL2tNdGDaIM8Y;r0Q zbu}3z$@1<4uV=fiZ<8o#+y=Gd$NMP>_9M^-p690JQa|Pj{X^(ijn2n_Pp|ktIJ{88 zKUxO1w!>NdWul6%nbmCqXdOb@$|(+VBx*mnq6pWRfA1P|5W@J8-FTc2NYNL8)u&qk zVLdQ6Rvzx$c~I#?AAN9p@7syC)p1{E6efq2FI zXSjsq$y$Ic)zxNkAi%SxoH2Thxwx|n?9ZQGlD!WKpW?lH^)QHCY%O^D;y*>B$1;2< zluf?|%zD16oO6advA&$F8&>4Hucjvi%GnAZxIkkITJ0IqQx65uK8>$$evO~RmZ<=vg zA)DQRAuG*HMu*_DvG@b{%u}EM{Gud5(p^7t)-={vdsKhN_a|=Z$Kn*>>R}yub-r?) z|A<)z2c~_B1*5%JKPNQ(;*YKUCuT7P#4J-WTniOzf6~Y?w64C4r0=I1NT;$`ML4H@ z)Y4>E`eiV6q$@p(+sphCLppESV9Reyv%n}-Sd0E&1A<(iU@mc0=L>Sk^W+wDv9F8o zcLN;k{`~d8=O<(a5;I22X4r>M&+EVB$RphJcE{?=-EUTfIh6c?peBEZ+^k4zb+Bqx zM#M1v0c`#|k-H9ii7G4UwhhqZ>VmDd-zWc$ds?g+uV5!38*tg|)%zv0WXaPn!qeY- zBT#%}tCr3gMe-P^g9b7noq%@;?KwyJc6i{B-s zvK%q1S5KkI64wuNwQ-A=zU#BZD|2C1&H=UkmHZOfO+ozoToPz#M^vu4Lf*V2d+U#I z$uHRD1L#<&r90mXHOPr;dIIeS17{%P#;gIVU9?(eUPCR{DNc^jkm$qh7l}1?Ub7~C z3|bKztf6F&ZFk;Jrrg_T--;{H?C}ce=GS9CghvYb_z(@47na?1fNj>H9UhM=9`8Sn z$!q1@*bOvZbVM|!`1g&FyL|7F*Af!WJ4DV4^76d&13)jUx}zDb(w}_Ql22coj)^Cp z9-j?g?LO2W&hPkPLZv!5xaYd)RlSpX{1Z#zRI3|%eN7nq-){OJ;$bBZXPal21k|$r zlE6?D-so|7D@#1~nSrf-V)_rQ^J;)|_V`+hwDJ~10kMl*U|`$T8skBu(>L~S1}#G6 zW(~h@=Q^EoOI4qvni*u!;>aaRV%=aT0tfYtwOYTDobU=zx_88nf&ndy%TD5;l!%R5 z;;&D9x}bFGhxwJm6qhMmps`)hb@t!IC%v_3*Z?R&RK>QZwN{`~;ozkmp@P`;-`4>c zYYbdA`^#K7$z?5qAA!DSOuzcAELz;lg~)spOyq(e0O3a)lc1=1Q9gb2$)u@cxTJ8zfg8iG!o*rwuF1l$(p#&M*ZH>r zC=Uv-Psknn-!Ml26#;Dae)}&vgvoFbu$&hhGb3BP`Z>~8yHbO=-p!_hZMeo*a1HkqpnBaTJ;CUU ztruyq`>IzrK#oJ7sGmm7zGXzjzT&cqrIGx!3SD{}aKTrO)A5v_ls=u8K5aF}f0Ch@ zabh@(y2pj*E;eAmEyunzky#a%k>{?{(1^PmTsd(P8r*+YUp|4hP60tvOQg#ESUZ)T1f_Se)kFUz$YfXx%nNsT`jOiU;eqNc9f{}bp9T~Dfm*L z=?etwl}G>~i;(RgNeuoS?1)~Ohw1O5D5R$6_>Sjsg{RJ(>n`7ydv=lC(Pn=O+u2L$JToZ_DpDNYdRfQz@z|Xwzkw@q`y! zYVrAN6Dfql@T1k%1WCuaH)sw1_i{SFzx8@!i`ld543RcSNTB`kFQ2C(@Wu-DyXg;#^`QTGRkWc0bX+Mq9foH-hH z+>LN+$#gg^*3q@o4*nRvIt=sm@^s1NZtKZUMqh5IB3j$cG+Eolm@saudcZqf`^mO( zZ$f@j%w@}!xP?zr((qT#CBX=m#2OD=m+v`s^E&0VU;*IUvg(zlH@O3(!T~>hDox%O zCe$aA4)3VShV34h%LPfI7f5;H)V zE;ePWC8Yxp(YPo&Gmit0Qqw3rc$4?6GbHwL2Hpkz!hbb4hEU;+rfZ)bqd*mQVBI zGexVsyh)G_VqVYnqqqTteEY1@y<9L2kHy-yUOD#jtbkyl#T~7_zEb3iWB(jP<@SK`J4v>66 ziBD0$`cDL!3D~wBEKrNkhCCKm)Lkst-<_Q1zA1r)W#3rZt)&h)v#r@H`ZcfBzI9Te z;!0bV0`_ik7o}uR-f3h+wd@>PCu+#BqyFOmkeps_mDj+F_Z0hNBTj`a!kN&zd#q$g z*c@Oi?z2T4cjFUFF!4X^-EJyCt3DO#$!qW#&X^~IDy-8w$#m0BIycZLJ*}S|d00p! zmaP?r-zNW!hD;j){R|ubT-wrBNbM`<+xA#l1QfX!{niZr}81b*41je zAEeA(;TD;j3BeiK5=uz)7OJLiI=^b&^==4s&17??pN~bf_g#I99@J zVOy}H#rQAu#623?qB7r*l}D$Cy>y9y|CJK5O-W<|HQ^u> zJQA9`x_ewhLr2J{24d-XTRU!iwb z&T<#IuROy3EMYbdy=lbQM3B02GHdK+(+(1;zBMT4uqf;jZ$LQ5AUXpkZ%Rynp$CP? zrbSf~B=QLCRmpI0wu2>6GY7_3T2yF8t9`k$qv$d|acTGO1Q2r4Z?I~UW6)owSLFxy zC|1(`cd|5SAFPBjNp;@gtQSpI40OKr_&`q`*~ zL7Htl)9^L>oKM~zMnFeUESdRWBMPTtoJyqCyrrnIqEQ>KKKd(0zTVzd8$?`UbnP+i z!@Lf>BUGH}bXEZbpRYXT!P7X{=4d@7Ps7aH5d4p>$J175zhW@e(;9S@ORM(F2z%4I zl~jE>8X@VMQxhG->AU%;cAmPXHIFYovS8%@Kt&jqa0HwJ3}m za;MwWp&)g8d!zL^=B0=32X7;TpBo=kahT#MWl2WTlNJwpSug!mxyZse#7DS+FjrH@ zQ79Nv?+G38t?)mqxwD-mv~o2wPc7&)j>oQFZd|(uGfk5P%Wjkd5L;doC%(kue59HL z0Z8WE+=;PH!q#y>J~W*bxXk`#9$T8Kk&vqRxZJS8;&K?nng}N7f-rdp%J!M)_l#b@ zA@KOKHCGi|0T=MJ!i7$r5}ao%#r~~X`^1g+;ZI2lMKhR-5|+b4Dj1=N0PL8*!YHvv zOg58((oBf0PDiIo_-;b71gBw3pL0bYNzWxB;Nl;h0byL_8{OtwuJ!$ylJJK(6#&Zd zjQaC0%;aPt-(2?jYs%ZP`S-SiVSp0b*EM{#=Jmq%q=UehmP9`^;`oM7uF2@|oSv)Xt> zzp%`MQ=Xi#sMPGXmArHbx|Vq&)uOo-9apr#V>xnWsJJ_+nSM>-f<}74mL^N^ZEw>o z3%*BRkQ9u26d&s>pcLoFs zNu$xD<%5O6iSox6*M$|5L<&wZ$_?U9pFbNemD`oOj$rp?rEH>)vs=S)Fo1TE!swqP7x7h;QfxPTsv+wDe7tkZ6NXlzsWk{u5YzK@rL5b<`5NU~_ zbM;>#gFV6sSW@=9E8=vH*6UmGzVHm)8XliNHO5?xnE$0Ns$*>c(0tk~MR(;*Kz1OiB$PNs7= z`(jFSaaY0*z8E%Z=Jtsp!^5bCAbmY^=KtJ9$PsbL+cWVFS^pT+`-{HI1D3dn@6w__ z)i{(tA}75n}3 z7VXUl_(XsG61rKIiy8xp7Aym=DCEc)g55auit-u8PZ#PH%R&>ll~`?I(8`v7e4HYR zqS;x2f|;dq2kdgenA4i5XU;(*an2oMTXvPDs|8CN$tprmy78_kc0a=t7_Y4_54T!$RiFMYW}^ zry@HR{x~WhDs2zf0CYvXMCa(%%Rtyi=g&+zV-jX>o{{B7xb|NZME1a_3trJXV~~O| zOyTZ+Zra;C?eMrE{zmdf*`KBhxVx)+NS4uclH{A=TNY}Qqq2PL9t4M57lT%1U!+P4 zhj19f7-6s0>1k%ljFdUWrJE#^o&joGtXC4f1TEePL0MG^(4V@VbdC{qI(N;vXgY(u zIor_uSIUQhQoiUG7~^&4kQV2zP;(*zAcTrSRTyy`5RtO!2ZE12oyuhRn9w1AdC>Ak z?}3Rc`JB$)%1e&45DG)MTxwZSxf3g5It?>`gcxlOjYNW;%gA8mVliY>F2P zQOBxF=Wv;q5ErW@nJDl;mwK%Pd^)TUtt~)(4v6ObZ6?6gP+=1{Q&q7%DPWb zI_0vHfl0U%S@C+s+E>=^zSPdKeTHYFA$_?9ML{iZ=_qlaycc*Sw}7AsraRB;d9kN$ z`f_;N09=#}-0Ar~@i5?Y5`C^U(mAnes~Q|qBTh>^qX`C0Q*~0}2{!Hs&~L z)>*l8v!xEV#>rDdSkkVqx8LYQWTTQx+u)~v`2K2A_QLn)?h56Og7c@cUev3_@vSYx zNX+S!@BU*fsu(J*4NybX-bslB7Qud(nfFgJiyY__%y2sKN7hi5D0j93o^);gb0_Vg z?{5ND;8!JyenJq>{|ORI2Kx>Ou*yjciO)B(RzJq|Q_<#J_E%lNm~u7DW^@^kr#2OJ z)n0V{!3rmD`umfwzK}`^2XygDuZ=A|Brl-O|K^NfXV4sCYpT$s_3HI93yV(5)q#P- zSeODyyhDDN#CE|j>OMk+t{z%CYwfOAd06J*G20w#;0h|O$w*J1xSAK2lP60F#9Wtp z!@(mYk^b=Sv8@IT&^^38CaPKY#VY1evp+<$be`5c98uPnSavjL#>kv~cRZER<3S&x zL5zD9fP2;Pfs2V(@Y4{7O~VSI=mDfsy`7|Q1R(m-yljV{O)REdeXhK% zH;%s;9A@zkM=`e7Wq)j zKkriAKkw4YKkw2nhi2x>bkG5dW~G}ODQ8kxlxnvPz-20*#yCaxF9W7e9xzkHtVF8&Gmx|E$_=TtFyqefr`nG^8JOi-U`V# zV7wKV-Kh1UfC;mwJx|i%l`<$w4QO`#p>3SdLMnS>5F_ud3H^)+> z<&VclU)-G#)k~o@X~4eJ_&(DeUBYV0AhX6Qp#!ilA=d%+CGO%ZdjKO(^swuksq`>u z8vT5=Qj!k}l=@HzbT{i!Z}AzVGnfm@P8yaER`7N0*njX7z0eg|U@gon6=v;No&OtM zNc%QFkX+O^L?%a%vpPvnpOvo?viT4#aL90uf8XT9?f8=q2srLuty)%a|Mbf{$LnjI zXzmnq!rq(p8-HjIa=W|lI*@#mBRvY-Pdjc}%_lff`VNpg zsf+NXJj;EYOgpvXVUS!v98e;l+SjN^_FsafJ|wg@xH*@$3e)*jcI9wN;{^IYLQk9L z_1?eI2tfGEK%yS$r5oo897aE)Peoa9GSYnue8_| zqka%r-bl8)!bH==%6D#lGNL1+>#F*j&$ORJ7w}R~9*J`4k#>{ALUW*J9OiGx!z1dD z^I;0z=D<^eAq*?EiZ*n#h*-kONvYYl1AK}i!Uu#G>l7XgVwIIaYE?v16ugcRqG2+9Syzx3Es>7Ui&Ry>l8q4 z2L;29C@W&iT_Hs%VuYW7u(DpepEPmb=8LwiRAV(zmcV0Ou#7#A=7VgMRR@?kbY!_> zMJ&nH2Wv`miBkd>#@19ffMPG7k@fA(D(!Yq#@B4%7vC+jXZC1KoG4U^(LKBWGmxT& zxq6V^H(>RI%b+Dh@Z&Q3ELuS-dSkse+;O!bwB?$db^uKK_>su|k7q>@=+KTp!DCj+ zBd%=i3=!I$sNtSI@TqbO&sBDQ0_|n5u^3?}YtK^kEAwEGQQ>%6CPwoh`JVhxV`ibiXOqS6sKNEK#dcoxpJWO_n^}*gz9DKV+PDqM!Rx%J0Ct z{G08#K67`*y|Y3-kPvKZiPXx=ZB>LhN>k>7ur$$BZgE&W$K<~_Hq=ve@Z9wQh0=p} z_HGAzA4t$=$9#S)(jMST`9NUE?7nD0#-u}V1~8zn^!g4ih*zb&@%Kx%>g^{#4(DF# zKGs2wQ1I@Av4U#=TXCHSmQs=VpyPy2Af9MYTZP*e(c(5oHpQn=u)f zZR~M^#XF3e7Y2=UBel2fWbi_F0$(TCJVH#I8vilrDFaCqbbae#pJ&R}j9lP56(N0N0mMYgxPm zVpHZIPY5JmY$p!s%Vo7XnVh&Dsv0GzLFLeO!MDYf_AOMwW>L-cOH zFzuiJ_7cY2I(vZNM=R=#@MyY|Tx%uR{%qCX?dGE0LEp@K1Na##oXyP2!TNXsJ17@g z_|(Oq3^a@ts`6Ed-LpG~fZc4l>5Vt77+{PFp)U0h{ST!G%>Ahl*Ns0vq}+6sgD2qR z(Mqbt6E3==_QYC0K5IhyuzoIQ-}>{bF{3mgsv)uG0f=wB*Zf5+0qEjS_EKy6!|tVfG3oDXm}Fv;o}lmNy*zsK|6v&mCZe_ zAo}|HUXKUQMuh9EdgyXp^@l>*@Lpzj%BLX5w63JujuN!7rN43r@&Mg84t;-P_q1=1 zx9$+sWE7d!yyY1pYMVsg5zjY})RhO>+1_gFZQh`?@XUW-hL|C7FF6^_|7lILJW$pl zgk$-~uD8K3{@)wu&D(g_Aj4ltIG-azBs{ER0&xz*qO;BO%SNd~|LDvrp3DxXy&SdY z){WTnz_CrOr3RCam=&NYLjW(@k+fDLY}TQ@M=>xJbJSisI&e$Q)X(ns9I`^Q{6*mH zR7iO0<0@(HS?}aTS+D}l`W8d!1A+p6C87uQ4EDfrd&*@ixM!Vl8d(9VPj<{OvvWrG zl;{fkbjQGKNSi8BHjx;KN$vu*NaMdP_>!RTWBVQcAD*UN)NesB^8GD$DI`1IHj9wL zf{T*D{ zkUiZ=wnmGi zN5tgkM-AzJbd=W83&xpUvwn+vs|qQk-9{nPGJ zu$l?irgJR~hz_)geZ#gb54yPxmYb)-WIO%JidWrdE5PCmBD7%22 z!P*HwJN&0U<&0NbU{5GYe%c@PlUe9Ac(}8Q8jI{ur$27$Ek~>AT9Ye_X`m^ByUeck zFJk!TG>5g@j#b<~*QS#6e&EY5Xc#dd8Z_sb+j@Vm_g8FPBsl8RY^B~f>Q;u!P6H8` z_>|h)v8yUT>RJw!D2PZ+LwXRKcx-r8smzI+@0jW|P^pRZqxb4exnZb1q*7LQHjFw| zU&gR0AGAty=FgA#v7>Y>3X_nyuNV0WxnO%N0*>CMSb&dkDXqmx?zE5FrKnH!>1yTo zfxgl?O68D-ZI1J5<5-hM<4REBpqxfgmtcRIeOaf`L9J|a;I?*Yzf0rp3XP-c?--gf z#`RgJ!^$mEVh894%D&H6>V%4TwWsFt9}=pjGj&0FdA^?yOXep);5tnV@KySB=kI)Y z#8lbA>%Rx8wNoy0ltYC=*PZ3_w_i{c_Mp698vI-1@OPT8q$i~beBg5V?1gq?t(=qY z0&Q;RDqU>B@7WOXiQ^jBHrM@gf(n)Tu}I@k2Ydf?9nyW_0-YfG7d_@dvRnS6FCa=KO2@RPZYJ**lRM z+5Kf%XfZ39&t+J+!bE6TfIgkYqXXy4v??tCm^G_A`%V74`=bif=@n!j{BtX%SCHeHY@ zuL>^!N3PMYq=oY-S?l7hN*)s4C^wS^u!`u?#FpzvQh$Pv-PPeywasIKuo|yliubM` zsSA<9*_xzpo#1)UtAp;wzXM<54|@kIm<;rQpG%g=v(>4J~PYzwp*5mLHH<;KDZk^ZI1^_U&cx-nx{@wECiwdHr`$Hkhj z9rI1`gZ}G+#Pihof8C4Ov8@^xv==Gw5o@e9sB1@%mbfDt5Nm4;jt;T!$OcI5{Li!Zinz?^CYTRkRy99n~?azdCBwK$JM;&AR8&t<%fF(D7r4cKPsv~hwmM# z`u4BKx#x3gnTkIbls6sNWW=a-rdK~k+_l58$)=)Hrv#ctL%#$<{XC~>%f6m{2b$iC;quOqaXW81;NdG~Tz`-muaF-kD8gM&k{Y|M~L zhCC?+QBcpiM{`M@%R%?cyB$MEk%)BbL)5m(CgqCJz5m#*c%82(e!8 zfs|VoqxJ?g#}Wg#c~y?Y`9;*2dcJ zlnPuQdim#HfR-DrXsHffOl_|-Tt^})L^8m>j^o#-PhxVvQ(J~U{i5=u>IlTujMYMxZd0WAugiC&kem!-Fr+&z3Fli}c8<)? z-SPR-0|?dCWvI$+NxkMR8UYPdI5?Tm&q#Ju&xRJ=o)HxN4XAC|zFzC=WW-B%h|uAi zzm4mChBEUm`#(r#p365xV@W{1f6vnEbZ~i>O^bhc+LR#gK7@u0{E~~Tx5R19?k$i? zwIBZMAcg_wUH-e9E=H3Hzpcabw#wAj3_-+O4}MkJ`3n;y`UZEK2BMPiQQst>87+Z( zfdM!F#x#v}&~&v$9dn)WQWjC6Ao_NI=AHY>&x$~836>d#@a1cG^Ul$+p$Ve6fw?wy{|p09tXBmY8y@j~RfnmPH~yef#N#8olYCUp3|^VADM4 ziw`g7$P&a8g+{zn8{`M&_fQ?p;s2VRhM4~}Jn3NibI!zZI$zGyhV?tpAQ~URBO{Kc zXemFnie`UNUorHsU71z$wyhsAk1}k_jjvR6tXnY0cwrbt+U5;{45D9mKj%St0a%hV zVX@c(J#@I~9Wrs+d|%DU`KfD*J65zS)oA50hZ1-OBAL>ebSiR`lK=isFU!?Kr}?Bz zqbAZyU$uAFY04EqN;h$MfkR{?p;LLo*sF%S)|OJ{)~0sLJpj3QSh}Sg~@1VjmdQF z(zl`Kyzzm={^e1-&j&v!nR1Gk8e%R*$?`#axH~FpFXT)OJMH+sXEDSZOSlPBuX$PAj7XXS1nGgWs3rSI<8OR-#|%4uCMBvNnBq8|UW zbL>?0_gkz=k&9E_B~reQu$%mlRWZA7PlDE^;$v7wpnd)_kH`(hqnj_ zXvfO(GLQ#HQWns#U7=G8bRNB><5wj%Tk+TSw_Jjhb0(sQ3X>huljKYmikY8L{F2@k zW9?j7ICdW8TZuGBFF`UnYiS+h76i`bJQp znAC#$vFIYa{nq67HPU$GkZAvJUbd01cm=s|;G!qu#G=|o5tLr+;yAz3Mv?W7a|tYz zGJgcz^d52?_s~JZJ~I2%73IK+FAQ$%!k&DNrZH{e3y(CUU%d{8{HOF~C505msrG{X z_w}CSf5ump&R=s~Iaw8-DTLb@ttdZ1p+XFk`%;?sjm0B(?E}|Z{fe1a-nRo~%L30c z7T1(Zs?$&?^wjX#hs50)Ms7JY!Z(gcqk7rZ?jY z2gdc_!bwjB${bDMd{8nnd)DmJO)g&D~4Cc;Agbl)p_O?&M`gi%Y({E);X(sy5LgDflY&ApPZ7D*x@Y zF63@bd&YRI-^MDRNn1gysK=S1hAUNgoqo5-)y?~2hUNH2tD(PNG5vJNtJzxB##Hu# zL&Q`ft@vC&h65dz;?(a5gxNb?dv=_Bd!t{Yrv1+l<2Qr`Sc10jVA;=RZNj;tP?bRb z$e1tqo~M%)ra0KZX|OV<-w4xaDf(bg+t9HF7L)=7IeX{{GA7_Hn}bf_LN(`PxT)Ng zvv3)9;RcQm%`|xmG-ZX-tRs{6@e?0 z3=1@ThRtOAHYCE%IPHD`&(t4Yjycb5g4ww2JmK)F6k0=~U~YURh)XVF^o1Idp|*a} zJCp(`XwkG|Hf3R7%l`TehlJYma8dJ7k}WYSIIv7aLxsYER7QTu6^yptg^l%l1iNDI z3EN~E`A#s7d2<^zDD(WNfd>@-?)3}{kF)y@iT*Yg>&OfM1t$SJ5EFy2Xpw0d?$BQ@ z?;f&Vrq}E-#D+C_>D82n%93NT29*?O2FnzKYb?iv3mVXIH0HWe_W=@WK24}3FT3CE z(kp}%&I}O~GgY+xBJB5nGvoH<8OZ!%enMChcwpCr}^;Pcx zf0sXyO1L{vo9?C@F>0pRN;ZrIwNTlcEw%7(z6DF&`ynyW!rK}`C0yva?W<2bhpavS zynKXRf{3obF!Nf-rUR$S0(fTGtnm`gUw&m)J7=>xS^gHi9fm#*ly0U`8}u<(ac0%V zd{Am${te3Ee5KfIwQ0|(qtD;2r?ZA^p* z8eYRVdJEalqjI4C^G1wK2~503JiHCs{8RpA^QlW-#~=IKfso33sxG#**6CR&@lsjv z%EZ(?Il=(Ua`q|BsZ*nPrrqilG1r$|SjZD8{o3@Hv*%J$P+^%4SP%fzLep3u-LEEhrSc4a3D#&zIbt|{Ss>G=K$>v}lE)4C^`vH6cU-r+7Z zdm6)QAC35N|HkDJFZ7z?xQU;VB1c>$VdHJ*Vqls@k0Jad!C7Sl+pi-nNWZhX)_@`Z z{ir%_*|7uS1bs$8k=9BbT$b-F)neemlVn{eb!vtA)&f{j~H1kN*m#)214OAnaOA5 XHjle>14CYfe}Bpf8uB%=Z$thUVJieN literal 0 HcmV?d00001 From cf7cdb15219651de2a8195f02799b4e4f1114fe1 Mon Sep 17 00:00:00 2001 From: Kemal <223029+disq@users.noreply.github.com> Date: Thu, 11 Jan 2024 23:03:27 +0000 Subject: [PATCH 160/166] feat: Upload images from markdown files to CDN when publishing (#16033) Limited testing results: ``` # Test Addon README ![Troll face](https://storage.googleapis.com/cq-cloud-images/kemal/6027b3c3f2afcb2cf2c9405637a40690adb9a675_troll.png "Trollface") ## Installation ![](https://storage.googleapis.com/cq-cloud-images/kemal/4b0b26dd0e5113344c3d655dce252c8778ffadd3_tldr.png) ![](https://storage.googleapis.com/cq-cloud-images/kemal/bf66c0a36876f9854f80883c609694a9ec653dac_1000.png) ## One more heading ![Troll face 2](https://storage.googleapis.com/cq-cloud-images/kemal/6027b3c3f2afcb2cf2c9405637a40690adb9a675_troll.png) ``` Newly supported: - ~HTML `` tags in markdown (will try to fix this, but need to make sure it doesn't replace inside code blocks)~ - ~Reference-style image syntax (with ids, documented [here](https://daringfireball.net/projects/markdown/syntax#img))~ --- cli/go.mod | 2 + cli/go.sum | 2 + cli/internal/publish/addons.go | 9 +- cli/internal/publish/images/images.go | 507 +++++++++++++++++++++ cli/internal/publish/images/images_test.go | 368 +++++++++++++++ cli/internal/publish/plugins.go | 7 + 6 files changed, 893 insertions(+), 2 deletions(-) create mode 100644 cli/internal/publish/images/images.go create mode 100644 cli/internal/publish/images/images_test.go diff --git a/cli/go.mod b/cli/go.mod index a38b8d245712c9..72153fb19a982e 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -26,6 +26,8 @@ require ( github.com/stretchr/testify v1.8.4 github.com/thoas/go-funk v0.9.3 github.com/wk8/go-ordered-map/v2 v2.1.8 + github.com/yuin/goldmark v1.6.0 + golang.org/x/sync v0.5.0 golang.org/x/term v0.15.0 google.golang.org/grpc v1.60.1 google.golang.org/protobuf v1.31.0 diff --git a/cli/go.sum b/cli/go.sum index ad426e1f337d63..11b5bb5445714b 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -387,6 +387,8 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= +github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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= diff --git a/cli/internal/publish/addons.go b/cli/internal/publish/addons.go index 966db654456a91..2a3e26331e1b09 100644 --- a/cli/internal/publish/addons.go +++ b/cli/internal/publish/addons.go @@ -17,6 +17,7 @@ import ( cqapiauth "github.com/cloudquery/cloudquery-api-go/auth" "github.com/cloudquery/cloudquery-api-go/config" "github.com/cloudquery/cloudquery/cli/internal/hub" + "github.com/cloudquery/cloudquery/cli/internal/publish/images" "github.com/cloudquery/cloudquery/cli/internal/team" ) @@ -69,11 +70,15 @@ func CreateNewAddonDraftVersion(ctx context.Context, c *cloudquery_api.ClientWit } if manifest.PathToDoc != "" { - b, err := os.ReadFile(filepath.Join(manifestDir, manifest.PathToDoc)) + absDocFile := filepath.Join(manifestDir, manifest.PathToDoc) + b, err := os.ReadFile(absDocFile) if err != nil { return fmt.Errorf("failed to read doc file: %w", err) } - body.Doc = string(b) + body.Doc, err = images.ProcessDocument(ctx, c, manifest.TeamName, filepath.Dir(absDocFile), string(b)) + if err != nil { + return fmt.Errorf("failed to process doc images: %w", err) + } } if manifest.Message != "" { diff --git a/cli/internal/publish/images/images.go b/cli/internal/publish/images/images.go new file mode 100644 index 00000000000000..4c37945214bb8b --- /dev/null +++ b/cli/internal/publish/images/images.go @@ -0,0 +1,507 @@ +package images + +import ( + "bytes" + "context" + "crypto/sha1" + "fmt" + "io" + "net/http" + "net/url" + "os" + "path/filepath" + "sort" + "strings" + + cloudquery_api "github.com/cloudquery/cloudquery-api-go" + "github.com/cloudquery/cloudquery/cli/internal/hub" + "github.com/yuin/goldmark" + "github.com/yuin/goldmark/ast" + "golang.org/x/net/html" + + "github.com/yuin/goldmark/parser" + "github.com/yuin/goldmark/text" + "github.com/yuin/goldmark/util" + "golang.org/x/exp/maps" + "golang.org/x/sync/errgroup" +) + +type reference struct { + ref string // image filename inc. all paths (to replace with URL) + absFile string // absolute path to image file, to upload + url string // result of upload + + startPos int // start of complete markdown tag. if html: start of actual ref + endPos int // exclusive +} + +type listKey struct { + name, sum string +} + +func ProcessDocument(ctx context.Context, c *cloudquery_api.ClientWithResponses, teamName, docDir, contents string) (string, error) { + ims, err := findMarkdownImages(contents, docDir) + if err != nil { + return "", err + } + if len(ims) == 0 { + return contents, nil + } + + fmt.Println("Preparing to upload images...") + + reqs := make([]cloudquery_api.TeamImageCreate, 0, len(ims)) + for k := range ims { + reqs = append(reqs, cloudquery_api.TeamImageCreate{ + Name: k.name, + Checksum: k.sum, + }) + } + + resp, err := c.CreateTeamImagesWithResponse(ctx, teamName, cloudquery_api.CreateTeamImagesJSONRequestBody{Images: reqs}) + if err != nil { + return "", fmt.Errorf("failed to prepare doc images: %w", err) + } + if resp.HTTPResponse.StatusCode > 299 { + return "", fmt.Errorf("failed preparing: %w", hub.ErrorFromHTTPResponse(resp.HTTPResponse, resp)) + } + + for _, item := range resp.JSON201.Items { + item := item + + key := listKey{name: item.Name, sum: item.Checksum} + for i := range ims[key] { + ims[key][i].url = item.URL + } + } + + contents, err = replaceMarkdownImages(contents, ims) + if err != nil { + return "", fmt.Errorf("failed replacing markdown: %w", err) + } + + fmt.Println("Uploading images...") + eg, egCtx := errgroup.WithContext(ctx) + eg.SetLimit(4) + + // Iterate again to upload + for _, item := range resp.JSON201.Items { + if item.UploadURL == nil { + // Already exists in bucket + continue + } + item := item + absFile := ims[listKey{name: item.Name, sum: item.Checksum}][0].absFile + eg.Go(func() error { + return uploadFile(egCtx, *item.UploadURL, absFile) + }) + } + + if err := eg.Wait(); err != nil { + return "", fmt.Errorf("failed to upload doc images: %w", err) + } + + return contents, nil +} + +func findMarkdownImages(contents, docDir string) (map[listKey][]reference, error) { + imf := &imageFinder{ + docDir: docDir, + } + p := goldmark.New( + goldmark.WithParserOptions( + parser.WithASTTransformers(util.Prioritized(imf, 999999)), + ), + ) + if err := p.Convert([]byte(contents), io.Discard); err != nil { + return nil, fmt.Errorf("failed to parse markdown: %w", err) + } + if imf.err != nil { + return nil, imf.err + } + + return imf.images, nil +} + +func convertMarkdownReferences(ims map[listKey][]reference) ([]reference, error) { + type pos struct { + at int + end bool + } + reps := make([]reference, 0, len(ims)) + posList := make([]pos, 0, 2*len(ims)) + for _, imList := range ims { + for _, ir := range imList { + if ir.endPos == 0 { + // return "", fmt.Errorf("unknown range for image %q", ir.ref) + continue // skip + } + if ir.startPos >= ir.endPos { + return nil, fmt.Errorf("invalid range for image %q", ir.ref) + } + + posList = append(posList, pos{at: ir.startPos}, pos{at: ir.endPos - 1, end: true}) + ir := ir + reps = append(reps, ir) + } + } + + sort.Slice(posList, func(i, j int) bool { + if posList[i].at == posList[j].at { + return !posList[i].end + } + return posList[i].at < posList[j].at + }) + + // check for overlaps + var ( + lastPos int + open int + ) + for _, p := range posList { + if p.end { + open-- + } else { + open++ + } + if open > 1 { + return nil, fmt.Errorf("found overlapping range: %d-%d", lastPos, p.at) + } + lastPos = p.at + } + + return reps, nil +} + +func replaceMarkdownImages(contents string, ims map[listKey][]reference) (string, error) { + reps, err := convertMarkdownReferences(ims) + if err != nil { + return "", err + } + + // sort by start position, descending + sort.Slice(reps, func(i, j int) bool { + return reps[i].startPos > reps[j].startPos + }) + + // replace in reverse order + for _, ir := range reps { + literalTag := contents[ir.startPos:ir.endPos] + replacedTag := strings.Replace(literalTag, ir.ref, ir.url, 1) + contents = contents[:ir.startPos] + replacedTag + contents[ir.endPos:] + } + + return contents, nil +} + +func uploadFile(ctx context.Context, uploadURL, file string) error { + f, err := os.Open(file) + if err != nil { + return err + } + defer f.Close() + + first512 := make([]byte, 512) + if _, err := f.Read(first512); err != nil { + return err + } + ct := http.DetectContentType(first512) + if _, err := f.Seek(0, io.SeekStart); err != nil { + return err + } + + req, err := http.NewRequest(http.MethodPut, uploadURL, f) + if err != nil { + return err + } + req.Header.Set("Content-Type", ct) + + resp, err := http.DefaultClient.Do(req.WithContext(ctx)) + if err != nil { + return err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf("failed to upload image: %s", resp.Status) + } + return nil +} + +func ensureValidFilename(filename, absDir string) (string, error) { + u, err := url.Parse(filename) + if err != nil { + return "", nil // skip + } + + if u.Scheme == "" { + // it's a local file + if filepath.IsAbs(filename) { + return filename, nil + } + + return filepath.Join(absDir, filename), nil + } else if u.Scheme != "file" { + return "", nil // skip + } + + if u.Host != "" && u.Host != "localhost" { + return "", fmt.Errorf("invalid file URL %s", filename) + } + p := u.Path + if strings.HasPrefix(p, "/") && os.PathSeparator == '\\' { + p = strings.TrimPrefix(p, "/") + } + filename = filepath.FromSlash(p) + return filename, nil +} + +func sha1sum(filename string) (string, error) { + f, err := os.Open(filename) + if err != nil { + return "", err + } + defer f.Close() + + s := sha1.New() + _, err = io.Copy(s, f) + if err != nil { + return "", err + } + result := s.Sum(nil) + return fmt.Sprintf("%x", result), nil +} + +type imageFinder struct { + images map[listKey][]reference + docDir string + err error +} + +func (f *imageFinder) Transform(node *ast.Document, reader text.Reader, pc parser.Context) { + if f.images == nil { + f.images = make(map[listKey][]reference) + } + + type refKeyType struct { + dest, title string + } + + refs := pc.References() + refList := make(map[refKeyType][]parser.Reference, len(refs)) + for _, ref := range refs { + key := refKeyType{dest: string(ref.Destination()), title: string(ref.Title())} + refList[key] = append(refList[key], ref) // multiple refs can have the same dest/title (but different labels) + } + + src := reader.Source() + + var allImgs []reference + imageDestinations := make(map[refKeyType]struct{}) // referenced dests are put in here so that we can check them later + f.err = ast.Walk(node, func(n ast.Node, entering bool) (ast.WalkStatus, error) { + if !entering { + return ast.WalkContinue, nil + } + + var ( + imgs []reference + + htmlBytes []byte + htmlStartPos int + ) + switch el := n.(type) { + case *ast.Image: + imgRef := reference{ + ref: string(el.Destination), + } + refKey := refKeyType{dest: imgRef.ref, title: string(el.Title)} + imageDestinations[refKey] = struct{}{} // mark this as an image so that we can cross-check with the reference list later + if len(refList[refKey]) > 0 { + // it's a reference, no need to check further as we won't find anything useful (regarding byte positions). Leave it to the reference handler + return ast.WalkContinue, nil + } + + p := el.BaseNode.Parent() + for p != nil && imgRef.endPos == 0 { + if p.Kind() == ast.KindParagraph { + for i := 0; i < p.Lines().Len(); i++ { + // we can have multiple lines in a paragraph, so we need to check each one to match destination/title, hoping there are no dupes + lineLiteral := src[p.Lines().At(i).Start:p.Lines().At(i).Stop] + + // these checks are false negative if this image is a reference, but we handled them above + if !bytes.Contains(lineLiteral, el.Destination) || (len(el.Title) > 0 && !bytes.Contains(lineLiteral, el.Title)) { + continue + } + if len(el.Title) == 0 { // if no title, make sure the element ends with the link + parts := bytes.SplitN(lineLiteral, el.Destination, 2) + if len(parts) != 2 || !bytes.HasPrefix(bytes.TrimSpace(parts[1]), []byte(")")) { // HasPrefix because we can be inside a link + continue + } + } + imgRef.startPos, imgRef.endPos = p.Lines().At(i).Start, p.Lines().At(i).Stop + break + } + break + } + p = p.Parent() + } + imgs = append(imgs, imgRef) + case *ast.CodeBlock: + return ast.WalkSkipChildren, nil + case *ast.FencedCodeBlock: + return ast.WalkSkipChildren, nil + case *ast.HTMLBlock: + sz := el.Lines().Len() + for i := 0; i < sz; i++ { + a := el.Lines().At(i) + htmlBytes = append(htmlBytes, src[a.Start:a.Stop]...) + if i == 0 { + htmlStartPos = a.Start + } + } + // handle htmlBytes below + case *ast.RawHTML: + if el.Segments != nil { + for i := 0; i < el.Segments.Len(); i++ { // should have 1 segment per tag? + a := el.Segments.At(i) + htmlBytes = append(htmlBytes, src[a.Start:a.Stop]...) + if i == 0 { + htmlStartPos = a.Start + } + } + } else { + sz := el.Lines().Len() + for i := 0; i < sz; i++ { + a := el.Lines().At(i) + htmlBytes = append(htmlBytes, src[a.Start:a.Stop]...) + if i == 0 { + htmlStartPos = a.Start + } + } + } + // handle htmlBytes below + default: + return ast.WalkContinue, nil + } + + if len(htmlBytes) > 0 { + htmlImages, err := parseHTMLImages(htmlBytes, htmlStartPos) + if err != nil { + return ast.WalkStop, err + } + imgs = append(imgs, htmlImages...) + } + + allImgs = append(allImgs, imgs...) + return ast.WalkContinue, nil + }) + if f.err != nil { + return + } + + f.err = func() error { + refKeys := maps.Keys(refList) + sort.Slice(refKeys, func(i, j int) bool { + if refKeys[i].title == refKeys[j].title { + return refKeys[i].dest < refKeys[j].dest + } + if refKeys[i].dest == refKeys[j].dest { + return refKeys[i].title < refKeys[j].title + } + return refKeys[i].dest < refKeys[j].dest && refKeys[i].title < refKeys[j].title + }) + + for _, refKey := range refKeys { + if _, isImage := imageDestinations[refKey]; !isImage { + continue // only use this reference if it's a previously found image (ast.Image and dest/title match) + } + + for _, pcRef := range refList[refKey] { + // here we rebuild a `[image-id]: image.png "Optional Title Here"` line and replace it inside src. We're happy as long as there's a preceding space + refLine := append([]byte{'['}, pcRef.Label()...) + refLine = append(refLine, []byte("]: ")...) + refLine = append(refLine, pcRef.Destination()...) + if len(pcRef.Title()) > 0 { + refLine = append(refLine, []byte(` "`)...) + refLine = append(refLine, pcRef.Title()...) + refLine = append(refLine, []byte{'"'}...) + } + + if idx := bytes.Index(src, refLine); idx > 0 { + check := bytes.TrimSpace(src[idx-1 : idx+len(refLine)]) // make sure it has some kind of space before + if bytes.Equal(check, refLine) { + allImgs = append(allImgs, reference{ + ref: string(pcRef.Destination()), + startPos: idx, + endPos: idx + len(refLine), + }) + } + } + } + } + + // process all matches here + for _, img := range allImgs { + absFile, err := ensureValidFilename(img.ref, f.docDir) + if err != nil { + return err + } + if absFile == "" { + continue // skip + } + s, err := sha1sum(absFile) + if err != nil { + return fmt.Errorf("error processing image %q: %w", img.ref, err) + } + fileRef := filepath.Base(absFile) + key := listKey{name: fileRef, sum: s} + f.images[key] = append(f.images[key], reference{ + ref: img.ref, + absFile: absFile, + startPos: img.startPos, + endPos: img.endPos, + }) + } + return nil + }() +} + +func parseHTMLImages(htmlBytes []byte, htmlOffset int) ([]reference, error) { + htmldoc, err := html.Parse(bytes.NewReader(htmlBytes)) + if err != nil { + return nil, err + } + + var imgs []reference + var f func(*html.Node) int + offset := 0 + + f = func(n *html.Node) int { + if n.Type == html.ElementNode && n.Data == "img" { + for _, a := range n.Attr { + if a.Key != "src" { + continue + } + searchBytes := htmlBytes[offset:] + startPos := bytes.Index(searchBytes, []byte(a.Val)) + offset + endPos := startPos + len(a.Val) + imgs = append(imgs, reference{ + ref: a.Val, + startPos: htmlOffset + startPos, + endPos: htmlOffset + endPos, + }) + offset = endPos + return offset + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + offset = f(c) + } + return offset + } + + _ = f(htmldoc) + return imgs, nil +} + +var _ parser.ASTTransformer = &imageFinder{} diff --git a/cli/internal/publish/images/images_test.go b/cli/internal/publish/images/images_test.go new file mode 100644 index 00000000000000..fe1d3be589a70c --- /dev/null +++ b/cli/internal/publish/images/images_test.go @@ -0,0 +1,368 @@ +package images + +import ( + "os" + "path/filepath" + "sort" + "strings" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestFindMarkdownImages(t *testing.T) { + cases := []struct { + name string + contents string + expect map[string][]reference + expectError string + + endPosAdjustBy int // used for file:/// links where the file reference is absolute, applies to all imageReference.endPos in expect + }{ + { + name: "no images", + contents: `# Title +`, + expect: nil, + }, + { + name: "basic", + contents: `# Title +![](image.png)`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 22}}}, + }, + { + name: "basic with alt", + contents: `# Title +![Alt text](image.png)`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 30}}}, + }, + { + name: "html with alt and width", + contents: `# Title +Alt text`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 18, endPos: 27}}}, + }, + { + name: "html with single quotes", + contents: `# Title +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 18, endPos: 27}}}, + }, + { + name: "double html with alt and width", + contents: `# Title +Alt text Alt text2`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 18, endPos: 27}, {ref: "image.png", startPos: 68, endPos: 77}}}, + }, + { + name: "double html in div", + contents: `# Title +
`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 23, endPos: 32}, {ref: "assets/images/image.png", startPos: 57, endPos: 80}}}, + }, + { + name: "double html in div with newlines", + contents: `# Title + +
+ + +
`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 26, endPos: 35}, {ref: "assets/images/image.png", startPos: 62, endPos: 85}}}, + }, + { + name: "tricky html", + contents: `# Title +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 18, endPos: 27}}}, + }, + { + name: "tricky html alt", + contents: `# Title +<oops>`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 31, endPos: 40}}}, + }, + { + name: "tricky html alt multiline", + contents: `# Title +<oops>`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 31, endPos: 40}}}, + }, + { + name: "quoted html", + contents: `# Title +` + "```" + ` +Alt text +` + "```" + ` +`, + expect: nil, + }, + { + name: "quoted image", + contents: `# Title +` + "```" + ` +![Alt text](image.png "Title Here") +` + "```" + ` +`, + expect: nil, + }, + { + name: "single quoted html", + contents: `# Title +` + "`" + `Alt text` + "`" + ` +`, + expect: nil, + }, + { + name: "single quoted image", + contents: `# Title +` + "`" + `![Alt text](image.png "Title Here")` + "`" + ` +`, + expect: nil, + }, + { + name: "basic with alt and title", + contents: `# Title +![Alt text](image.png "Title Here") +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 43}}}, + }, + { + name: "basic with title", + contents: `# Title +![](image.png "Title Here") +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 35}}}, + }, + { + name: "basic with title or alt, multiple", + contents: `# Title +![](image.png "Title Here") +More test +![alt](image.png) +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 36}, {ref: "image.png", startPos: 46, endPos: 63}}}, + }, + { + name: "ref", + contents: `# Title +![Alt text][image-id] + +[image-id]: image.png "Optional Title Here" +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 31, endPos: 74}}}, + }, + { + name: "ref multiple", + contents: `# Title +![Alt text][image-id] + +text + +![Same text][image-id] + +[image-id]: image.png "Optional Title Here" +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 61, endPos: 104}}}, + }, + { + name: "ref multiple with same image", + contents: `# Title +![Alt text][image-id] + +text + +![Same text][image-ip] + +[image-id]: image.png "Optional Title Here" +[image-ip]: image.png "Some Title Here" +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 61, endPos: 104}, {ref: "image.png", startPos: 105, endPos: 144}}}, + }, + { + name: "ref multiple with same image title and id", + contents: `# Title +![Alt text][image-id] + +text + +![Same text][image-id] + +[image-id]: image.png "Title Here" +[image-id]: image.png "Title Here" +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 61, endPos: 95}}}, // expect a single match + }, + { + name: "ref multiple with same image and title", + contents: `# Title +![Alt text][image-id] + +text + +![Same text][image-ip] + +[image-id]: image.png "Optional Title Here" +[image-ip]: image.png "Optional Title Here" +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 61, endPos: 104}, {ref: "image.png", startPos: 105, endPos: 148}}}, + }, + { + name: "href", + contents: `# Title +[![Alt text](image.png)](http://example.com/) +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "image.png", startPos: 8, endPos: 53}}}, // includes full href + }, + { + name: "subdir", + contents: `# Title +![Alt text](assets/images/image.png) +`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:image.png": {{ref: "assets/images/image.png", startPos: 8, endPos: 44}}}, + }, + { + name: "basic file://", + contents: `# Title +![](file://${ABS_IMAGE})`, + expect: map[string][]reference{"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3:my special@image.png": {{ref: "file://${ABS_IMAGE}", startPos: 8, endPos: 0 /* special zero */}}}, + endPosAdjustBy: 12, // number of extra characters except the placeholder/filename + }, + { + name: "external image urls", + contents: `# Title +![](http://path.to/img/image.png) or ![Alt text](https://path.to/img/image.png) + + +`, + expect: nil, + expectError: `error processing image "path.to/img2/image.png": open`, + }, + } + + tempdir := t.TempDir() + data := []byte("test") + require.NoError(t, os.WriteFile(filepath.Join(tempdir, "image.png"), data, 0644)) + require.NoError(t, os.MkdirAll(filepath.Join(tempdir, "assets", "images"), 0755)) + require.NoError(t, os.WriteFile(filepath.Join(tempdir, "assets", "images", "image.png"), data, 0644)) + + special := filepath.Join(tempdir, "my special@image.png") + require.NoError(t, os.WriteFile(special, data, 0644)) + specialAbs, err := filepath.Abs(special) + require.NoError(t, err) + specialAbsEscaped := strings.NewReplacer(" ", "%20", "@", "%40", string(filepath.Separator), "/").Replace(specialAbs) + if filepath.Separator == '\\' { + specialAbsEscaped = "/" + specialAbsEscaped // absolute paths in file:// mode start with "/", not C:\ (`file:///C:/`, not `file://C:/`) + } + + const mockURL = "https://example.com/file.ext" + for _, tc := range cases { + tc := tc + t.Run(tc.name, func(t *testing.T) { + tc.contents = strings.ReplaceAll(tc.contents, "${ABS_IMAGE}", specialAbsEscaped) + out, err := findMarkdownImages(tc.contents, tempdir) + if tc.expectError != "" { + require.ErrorContains(t, err, tc.expectError) + return + } + require.NoError(t, err) + + // clean up for successful comparison, also set mock URL + for k, v := range out { + for i := range v { + v[i].absFile = "" + v[i].url = mockURL + } + out[k] = v + } + if len(out) == 0 { + out = nil + } + + expect := convertStringToRefKey(tc.expect) + + // adjust end position for special case + for k, v := range expect { + for i := range v { + if strings.Contains(v[i].ref, "${ABS_IMAGE}") { + v[i].ref = strings.ReplaceAll(v[i].ref, "${ABS_IMAGE}", specialAbsEscaped) + v[i].endPos = v[i].startPos + len(specialAbsEscaped) + tc.endPosAdjustBy + } + v[i].url = mockURL + } + expect[k] = v + } + + for k := range out { + sort.Slice(out[k], func(i, j int) bool { + return out[k][i].startPos < out[k][j].startPos + }) + } + + require.EqualValues(t, expect, out) + + replaced, err := replaceMarkdownImages(tc.contents, out) + require.NoError(t, err) + + if len(tc.expect) > 0 { + require.Contains(t, replaced, mockURL) + } + }) + } +} + +func TestConvertMarkdownReferencesOverlaps(t *testing.T) { + cases := []struct { + name string + refs map[string][]reference + expectError bool + }{ + { + name: "no overlaps", + refs: map[string][]reference{"a:b": {{ref: "a", startPos: 0, endPos: 1}, {ref: "a", startPos: 1, endPos: 3}}}, + }, + { + name: "overlaps by 1 byte", + refs: map[string][]reference{"a:b": {{ref: "a", startPos: 0, endPos: 2}, {ref: "a", startPos: 1, endPos: 3}}}, + expectError: true, + }, + { + name: "invalid range", + refs: map[string][]reference{"a:b": {{ref: "a", startPos: 0, endPos: 2}, {ref: "a", startPos: 3, endPos: 1}}}, + expectError: true, + }, + { + name: "overlapping last elem with first", + refs: map[string][]reference{"a:b": {{ref: "a", startPos: 0, endPos: 2}, {ref: "a", startPos: 2, endPos: 3}, {ref: "a", startPos: 0, endPos: 1}}}, + expectError: true, + }, + } + for _, tc := range cases { + tc := tc + t.Run(tc.name, func(t *testing.T) { + _, err := convertMarkdownReferences(convertStringToRefKey(tc.refs)) + if tc.expectError { + require.Error(t, err) + return + } + require.NoError(t, err) + }) + } +} + +func convertStringToRefKey(input map[string][]reference) map[listKey][]reference { + if input == nil { + return nil + } + ret := make(map[listKey][]reference, len(input)) + for k := range input { + parts := strings.SplitN(k, ":", 2) + key := listKey{name: parts[1], sum: parts[0]} + ret[key] = input[k] + } + return ret +} diff --git a/cli/internal/publish/plugins.go b/cli/internal/publish/plugins.go index 2f35bfe4273233..9ce21735306036 100644 --- a/cli/internal/publish/plugins.go +++ b/cli/internal/publish/plugins.go @@ -18,6 +18,7 @@ import ( cloudquery_api "github.com/cloudquery/cloudquery-api-go" "github.com/cloudquery/cloudquery/cli/internal/hub" + "github.com/cloudquery/cloudquery/cli/internal/publish/images" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" @@ -195,6 +196,12 @@ func UploadPluginDocs(ctx context.Context, c *cloudquery_api.ClientWithResponses return fmt.Errorf("failed to read docs file: %w", err) } contentStr := hub.NormalizeContent(string(content)) + + contentStr, err = images.ProcessDocument(ctx, c, teamName, docsDir, contentStr) + if err != nil { + return fmt.Errorf("failed to process doc images for %s: %w", dirEntry.Name(), err) + } + pages = append(pages, cloudquery_api.PluginDocsPageCreate{ Content: contentStr, Name: strings.TrimSuffix(dirEntry.Name(), fileExt), From 6284e148dca66989f94c33ddbfb29a9768c0baaf Mon Sep 17 00:00:00 2001 From: Catena cyber <35799796+catenacyber@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:31:08 +0100 Subject: [PATCH 161/166] refactor: Apply perfsprint linter (#16122) #### Summary Optimization: applies perfsprint linter for better performance happy new year @yevgenypats ;-) 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 | 6 +++--- cli/go.sum | 4 ++-- scaffold/cmd/templates/source/go.mod.tpl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 72153fb19a982e..afaf6a74c7f695 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -8,7 +8,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/cloudquery/cloudquery-api-go v1.6.4 github.com/cloudquery/codegen v0.3.12 - github.com/cloudquery/plugin-pb-go v1.16.3 + github.com/cloudquery/plugin-pb-go v1.16.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible @@ -27,6 +27,8 @@ require ( github.com/thoas/go-funk v0.9.3 github.com/wk8/go-ordered-map/v2 v2.1.8 github.com/yuin/goldmark v1.6.0 + golang.org/x/exp v0.0.0-20231226003508-02704c960a9b + golang.org/x/net v0.19.0 golang.org/x/sync v0.5.0 golang.org/x/term v0.15.0 google.golang.org/grpc v1.60.1 @@ -129,9 +131,7 @@ require ( github.com/zeebo/xxh3 v1.0.2 // 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/mod v0.14.0 // indirect - golang.org/x/net v0.19.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 diff --git a/cli/go.sum b/cli/go.sum index 11b5bb5445714b..2ccf3c9c4bc879 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.3 h1:iez4DzIXXKEIRZKy69bCKqENtGqgFg1xuSbio+Z9Bzg= -github.com/cloudquery/plugin-pb-go v1.16.3/go.mod h1:winMV3mFQT1KaLPSLYsvJABi4gNWUmSY+cxRvWUp5so= +github.com/cloudquery/plugin-pb-go v1.16.4 h1:F+sqacjbD6qJiUrj5OhcE58gjdoIRFg2XbiZTMoujpY= +github.com/cloudquery/plugin-pb-go v1.16.4/go.mod h1:AcjdnSbv3f/atz4MsvJIpYJJJA2wOWffWPvfNJGTQSw= github.com/cloudquery/plugin-sdk/v4 v4.25.1 h1:Mdhv88t4W82koA75x9uSOJaQQih8n1JDQMDSFmeFdYQ= github.com/cloudquery/plugin-sdk/v4 v4.25.1/go.mod h1:OHGaeCkIHyPDtnVzQjyUwSIEs8eYHLz4rj3qt9sGb4w= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index dedaf7f4edbf50..7822e007a67a7c 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.3 + github.com/cloudquery/plugin-pb-go v1.16.4 github.com/cloudquery/plugin-sdk/v4 v4.25.1 github.com/rs/zerolog v1.29.0 ) From 02c9364277e0f633796d2e5cd5d955a7ca19afa1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:35:27 +0200 Subject: [PATCH 164/166] chore(main): Release scaffold v2.1.23 (#16105) :robot: I have created a release *beep* *boop* --- ## [2.1.23](https://github.com/cloudquery/cloudquery/compare/scaffold-v2.1.22...scaffold-v2.1.23) (2024-01-12) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.4 ([#16126](https://github.com/cloudquery/cloudquery/issues/16126)) ([6a776ae](https://github.com/cloudquery/cloudquery/commit/6a776ae5e26acf417f5d7f1aa9db72da4a3a8af1)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) --- 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 +- scaffold/CHANGELOG.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 28422a76f5d711..e2b3a8e6e0df08 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -53,7 +53,7 @@ "plugins/destination/kafka+FILLER": "0.0.0", "plugins/source/hackernews": "3.0.20", "plugins/source/hackernews+FILLER": "0.0.0", - "scaffold": "2.1.22", + "scaffold": "2.1.23", "scaffold+FILLER": "0.0.0", "plugins/source/oracle": "4.2.9", "plugins/source/oracle+FILLER": "0.0.0", diff --git a/scaffold/CHANGELOG.md b/scaffold/CHANGELOG.md index 7c3786c75b0638..76eba7875f8048 100644 --- a/scaffold/CHANGELOG.md +++ b/scaffold/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.1.23](https://github.com/cloudquery/cloudquery/compare/scaffold-v2.1.22...scaffold-v2.1.23) (2024-01-12) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.4 ([#16126](https://github.com/cloudquery/cloudquery/issues/16126)) ([6a776ae](https://github.com/cloudquery/cloudquery/commit/6a776ae5e26acf417f5d7f1aa9db72da4a3a8af1)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) + ## [2.1.22](https://github.com/cloudquery/cloudquery/compare/scaffold-v2.1.21...scaffold-v2.1.22) (2024-01-04) From b2acb2555c6d850f13c59912a1fabbdb480b8871 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:39:24 +0200 Subject: [PATCH 165/166] chore: Update Scaffold version to v2.1.23 (#16127) Updates Scaffold latest version to v2.1.23 --- website/versions/scaffold.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/scaffold.json b/website/versions/scaffold.json index 0bc557cf31f68f..5a26ecc6d64c2d 100644 --- a/website/versions/scaffold.json +++ b/website/versions/scaffold.json @@ -1 +1 @@ -{ "latest": "scaffold-v2.1.22" } +{ "latest": "scaffold-v2.1.23" } From 2f87551c7c49f4e49f90f386668d5ef219df44c1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:47:23 +0200 Subject: [PATCH 166/166] chore(main): Release cli v5.0.0 (#15962) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [5.0.0](https://github.com/cloudquery/cloudquery/compare/cli-v4.4.0...cli-v5.0.0) (2024-01-12) ### ⚠ BREAKING CHANGES * Remove deprecated top level spec options (https://github.com/cloudquery/cloudquery/pull/15999). The following deprecated spec options were removed: * source plugin top level spec: * `concurrency` * `table_concurrency` * `resource_concurrency` * `backend` * `backend_spec` * destination plugin top level spec: * `batch_size` * `batch_size_bytes` **For most users this shouldn't be a breaking change**. We've deprecated these options a while ago and some were moved to the plugin level spec. If you were using the deprecated options on a CLI version lower than `v5.0.0` you should have gotten a warning about it. ### Features * Add JSON schema for CLI specs ([#15998](https://github.com/cloudquery/cloudquery/issues/15998)) ([da02049](https://github.com/cloudquery/cloudquery/commit/da020491c5901a1f775515bd86eaaed2950c3b93)) * Remove deprecated spec options (https://github.com/cloudquery/cloudquery/pull/15999) ([9e25f4a](https://github.com/cloudquery/cloudquery/commit/9e25f4a6171c46ed0e09f13a8d4216120e57007f)) * Upload images from markdown files to CDN when publishing ([#16033](https://github.com/cloudquery/cloudquery/issues/16033)) ([cf7cdb1](https://github.com/cloudquery/cloudquery/commit/cf7cdb15219651de2a8195f02799b4e4f1114fe1)) ### Bug Fixes * Add `X-Meta-User-Team-Name` during docker push ([#16013](https://github.com/cloudquery/cloudquery/issues/16013)) ([129b7c2](https://github.com/cloudquery/cloudquery/commit/129b7c2d92db70bb782177cdaa26abc0c8e83d3e)) * Add missing `X-Meta-User-Team-Name` header and manifest types option ([#16113](https://github.com/cloudquery/cloudquery/issues/16113)) ([9d8899e](https://github.com/cloudquery/cloudquery/commit/9d8899ee6e0a06a7b4ad3b64a5169da6e4cdf379)) * **deps:** Update github.com/apache/arrow/go/v15 digest to 6d44906 ([#16115](https://github.com/cloudquery/cloudquery/issues/16115)) ([8b0ae62](https://github.com/cloudquery/cloudquery/commit/8b0ae6266d19a10fe84102837802358f0b9bb1bc)) * **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.6.4 ([#16067](https://github.com/cloudquery/cloudquery/issues/16067)) ([2e7b7d6](https://github.com/cloudquery/cloudquery/commit/2e7b7d67ee28cb3b393455accd10e664c7fff62e)) * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.2 ([#15948](https://github.com/cloudquery/cloudquery/issues/15948)) ([2def2ef](https://github.com/cloudquery/cloudquery/commit/2def2ef6268352fb7b229d55d27fd84f7e8bba1c)) * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.3 ([#16002](https://github.com/cloudquery/cloudquery/issues/16002)) ([e2d5605](https://github.com/cloudquery/cloudquery/commit/e2d5605c7cb5239303f0844b1fd9e5aab6cdf2cd)) * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.4 ([#16126](https://github.com/cloudquery/cloudquery/issues/16126)) ([6a776ae](https://github.com/cloudquery/cloudquery/commit/6a776ae5e26acf417f5d7f1aa9db72da4a3a8af1)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) --- 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 | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e2b3a8e6e0df08..5fb089396ec9b0 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "cli": "4.4.0", + "cli": "5.0.0", "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 188be703f5b306..11d8ece55e8e4f 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -5,6 +5,43 @@ 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.0.0](https://github.com/cloudquery/cloudquery/compare/cli-v4.4.0...cli-v5.0.0) (2024-01-12) + + +### ⚠ BREAKING CHANGES + +* Remove deprecated top level spec options (https://github.com/cloudquery/cloudquery/pull/15999). The following deprecated spec options were removed: + * source plugin top level spec: + * `concurrency` + * `table_concurrency` + * `resource_concurrency` + * `backend` + * `backend_spec` + * destination plugin top level spec: + * `batch_size` + * `batch_size_bytes` + + **For most users this shouldn't be a breaking change**. We've deprecated these options a while ago and some were moved to the plugin level spec. If you were using the deprecated options on a CLI version lower than `v5.0.0` you should have gotten a warning about it. + +### Features + +* Add JSON schema for CLI specs ([#15998](https://github.com/cloudquery/cloudquery/issues/15998)) ([da02049](https://github.com/cloudquery/cloudquery/commit/da020491c5901a1f775515bd86eaaed2950c3b93)) +* Remove deprecated spec options (https://github.com/cloudquery/cloudquery/pull/15999) ([9e25f4a](https://github.com/cloudquery/cloudquery/commit/9e25f4a6171c46ed0e09f13a8d4216120e57007f)) +* Upload images from markdown files to CDN when publishing ([#16033](https://github.com/cloudquery/cloudquery/issues/16033)) ([cf7cdb1](https://github.com/cloudquery/cloudquery/commit/cf7cdb15219651de2a8195f02799b4e4f1114fe1)) + + +### Bug Fixes + +* Add `X-Meta-User-Team-Name` during docker push ([#16013](https://github.com/cloudquery/cloudquery/issues/16013)) ([129b7c2](https://github.com/cloudquery/cloudquery/commit/129b7c2d92db70bb782177cdaa26abc0c8e83d3e)) +* Add missing `X-Meta-User-Team-Name` header and manifest types option ([#16113](https://github.com/cloudquery/cloudquery/issues/16113)) ([9d8899e](https://github.com/cloudquery/cloudquery/commit/9d8899ee6e0a06a7b4ad3b64a5169da6e4cdf379)) +* **deps:** Update github.com/apache/arrow/go/v15 digest to 6d44906 ([#16115](https://github.com/cloudquery/cloudquery/issues/16115)) ([8b0ae62](https://github.com/cloudquery/cloudquery/commit/8b0ae6266d19a10fe84102837802358f0b9bb1bc)) +* **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.6.4 ([#16067](https://github.com/cloudquery/cloudquery/issues/16067)) ([2e7b7d6](https://github.com/cloudquery/cloudquery/commit/2e7b7d67ee28cb3b393455accd10e664c7fff62e)) +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.2 ([#15948](https://github.com/cloudquery/cloudquery/issues/15948)) ([2def2ef](https://github.com/cloudquery/cloudquery/commit/2def2ef6268352fb7b229d55d27fd84f7e8bba1c)) +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.3 ([#16002](https://github.com/cloudquery/cloudquery/issues/16002)) ([e2d5605](https://github.com/cloudquery/cloudquery/commit/e2d5605c7cb5239303f0844b1fd9e5aab6cdf2cd)) +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.16.4 ([#16126](https://github.com/cloudquery/cloudquery/issues/16126)) ([6a776ae](https://github.com/cloudquery/cloudquery/commit/6a776ae5e26acf417f5d7f1aa9db72da4a3a8af1)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.0 ([#15932](https://github.com/cloudquery/cloudquery/issues/15932)) ([2292b5a](https://github.com/cloudquery/cloudquery/commit/2292b5a2aa5936f2529238a05708de0b3bde9a35)) +* **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.25.1 ([#16069](https://github.com/cloudquery/cloudquery/issues/16069)) ([edda65c](https://github.com/cloudquery/cloudquery/commit/edda65c238b2cb78a7a2078b62557a7d8d822e49)) + ## [4.4.0](https://github.com/cloudquery/cloudquery/compare/cli-v4.3.6...cli-v4.4.0) (2024-01-02)