From 9766cacaf789377731184247e3755da97a737245 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:42:31 +0200 Subject: [PATCH 1/5] .github: Bump docker/build-push-action from 6.6.1 to 6.7.0 (#1773) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.6.1 to 6.7.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.6.1...v6.7.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2395bc3a..edbf5b760 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: org.opencontainers.image.vendor=ConduitIO - name: Build and push Docker image - uses: docker/build-push-action@v6.6.1 + uses: docker/build-push-action@v6.7.0 with: context: . push: true From d84537df92de310d6016c213dfbf966338a24d8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 09:48:29 +0000 Subject: [PATCH 2/5] go.mod: bump github.com/docker/docker (#1776) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.1.0+incompatible to 27.1.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.1.0...v27.1.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4de843e4a..3fd7d39f9 100644 --- a/go.mod +++ b/go.mod @@ -134,7 +134,7 @@ require ( github.com/dlclark/regexp2 v1.11.4 // indirect github.com/docker/cli v26.1.4+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v27.1.0+incompatible // indirect + github.com/docker/docker v27.1.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.2 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect diff --git a/go.sum b/go.sum index 603d2f632..216356d2e 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwen github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v27.1.0+incompatible h1:rEHVQc4GZ0MIQKifQPHSFGV/dVgaZafgRf8fCPtDYBs= -github.com/docker/docker v27.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= +github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 53d0bd27703bac1fa26dc88e4c81f2bc8bc61c09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:02:00 +0000 Subject: [PATCH 3/5] go.mod: bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 (#1774) Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.59.1 to 1.60.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/golangci/golangci-lint/compare/v1.59.1...v1.60.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 21 ++++++++++----------- go.sum | 44 ++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 3fd7d39f9..3e0e3673f 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/dop251/goja_nodejs v0.0.0-20231122114759-e84d9a924c5c github.com/gammazero/deque v0.2.1 github.com/goccy/go-json v0.10.3 - github.com/golangci/golangci-lint v1.59.1 + github.com/golangci/golangci-lint v1.60.1 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 @@ -69,8 +69,8 @@ require ( github.com/Antonboom/nilnil v0.1.9 // indirect github.com/Antonboom/testifylint v1.4.3 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/BurntSushi/toml v1.4.0 // indirect - github.com/Crocmagnon/fatcontext v0.3.0 // indirect + github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect + github.com/Crocmagnon/fatcontext v0.4.0 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -163,7 +163,7 @@ require ( github.com/go-viper/mapstructure/v2 v2.0.0 // indirect github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/gofrs/flock v0.8.1 // indirect + github.com/gofrs/flock v0.12.1 // indirect github.com/gofrs/uuid/v5 v5.2.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.2.1 // indirect @@ -232,7 +232,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/mgechev/revive v1.3.7 // indirect + github.com/mgechev/revive v1.3.9 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect @@ -242,7 +242,7 @@ require ( github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/moricho/tparallel v0.3.1 // indirect + github.com/moricho/tparallel v0.3.2 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nakabonne/nestif v0.3.1 // indirect @@ -261,7 +261,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pkg/profile v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/polyfloyd/go-errorlint v1.5.2 // indirect + github.com/polyfloyd/go-errorlint v1.6.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/quasilyte/go-ruleguard v0.4.2 // indirect github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect @@ -272,7 +272,7 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/rs/cors v1.11.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/ryancurrah/gomodguard v1.3.2 // indirect + github.com/ryancurrah/gomodguard v1.3.3 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -300,7 +300,6 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect github.com/tetafro/godot v1.4.16 // indirect github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a // indirect @@ -311,7 +310,7 @@ require ( github.com/twmb/franz-go/pkg/kmsg v1.8.0 // indirect github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.1.1 // indirect - github.com/uudashr/gocognit v1.1.2 // indirect + github.com/uudashr/gocognit v1.1.3 // indirect github.com/vbatts/tar-split v0.11.5 // indirect github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/xitongsys/parquet-go v1.6.2 // indirect @@ -347,7 +346,7 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.4.7 // indirect + honnef.co/go/tools v0.5.0 // indirect modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect modernc.org/libc v1.55.3 // indirect modernc.org/mathutil v1.6.0 // indirect diff --git a/go.sum b/go.sum index 216356d2e..ed0c01c8d 100644 --- a/go.sum +++ b/go.sum @@ -57,11 +57,11 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= -github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/Crocmagnon/fatcontext v0.3.0 h1:S6gNUYNSN9V76Tu017OFgoaOpybmMhwe6Ewh1cYd0jg= -github.com/Crocmagnon/fatcontext v0.3.0/go.mod h1:x3F9YW5CFE7vo+FGA5GzBD1SBXU4FQI0+y1ReG4Q+pY= +github.com/Crocmagnon/fatcontext v0.4.0 h1:4ykozu23YHA0JB6+thiuEv7iT6xq995qS1vcuWZq0tg= +github.com/Crocmagnon/fatcontext v0.4.0/go.mod h1:ZtWrXkgyfsYPzS6K3O88va6t2GEglG93vnII/F94WC0= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= @@ -360,8 +360,8 @@ github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= -github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM= github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -401,8 +401,8 @@ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= github.com/golangci/gofmt v0.0.0-20231019111953-be8c47862aaa h1:L0Zq43Px2HrLroRKEgfCsQLMJUkjskJBB1kd1Zjcvvc= github.com/golangci/gofmt v0.0.0-20231019111953-be8c47862aaa/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= -github.com/golangci/golangci-lint v1.59.1 h1:CRRLu1JbhK5avLABFJ/OHVSQ0Ie5c4ulsOId1h3TTks= -github.com/golangci/golangci-lint v1.59.1/go.mod h1:jX5Oif4C7P0j9++YB2MMJmoNrb01NJ8ITqKWNLewThg= +github.com/golangci/golangci-lint v1.60.1 h1:DRKNqNTQRLBJZ1il5u4fvgLQCjQc7QFs0DbhksJtVJE= +github.com/golangci/golangci-lint v1.60.1/go.mod h1:jDIPN1rYaIA+ijp9OZcUmUCoQOtZ76pOlFbi15FlLJY= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA= @@ -612,8 +612,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE= -github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA= +github.com/mgechev/revive v1.3.9 h1:18Y3R4a2USSBF+QZKFQwVkBROUda7uoBlkEuBD+YD1A= +github.com/mgechev/revive v1.3.9/go.mod h1:+uxEIr5UH0TjXWHTno3xh4u7eg6jDpXKzQccA9UGhHU= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= @@ -635,8 +635,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= -github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= +github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI= +github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -695,8 +695,8 @@ github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDj github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV7U5xFdA= -github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= +github.com/polyfloyd/go-errorlint v1.6.0 h1:tftWV9DE7txiFzPpztTAwyoRLKNj9gpVm2cg8/OwcYY= +github.com/polyfloyd/go-errorlint v1.6.0/go.mod h1:HR7u8wuP1kb1NeN1zqTd1ZMlqUKPPHF+Id4vIPvDqVw= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= @@ -733,8 +733,8 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.3.2 h1:CuG27ulzEB1Gu5Dk5gP8PFxSOZ3ptSdP5iI/3IXxM18= -github.com/ryancurrah/gomodguard v1.3.2/go.mod h1:LqdemiFomEjcxOqirbQCb3JFvSxH2JUYMerTFd3sF2o= +github.com/ryancurrah/gomodguard v1.3.3 h1:eiSQdJVNr9KTNxY2Niij8UReSwR8Xrte3exBrAZfqpg= +github.com/ryancurrah/gomodguard v1.3.3/go.mod h1:rsKQjj4l3LXe8N344Ow7agAy5p9yjsWOtRzUMYmA0QY= github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= @@ -810,8 +810,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= -github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= @@ -844,8 +842,8 @@ github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81v github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ= github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= -github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= -github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= +github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM= +github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= @@ -1064,7 +1062,6 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1154,7 +1151,6 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= @@ -1259,8 +1255,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= -honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.5.0 h1:29uoiIormS3Z6R+t56STz/oI4v+mB51TSmEOdJPgRnE= +honnef.co/go/tools v0.5.0/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs= modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ= modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y= From d4e617775fb05e20261389da31a7506566e8b47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haris=20Osmanagi=C4=87?= Date: Wed, 14 Aug 2024 15:31:56 +0200 Subject: [PATCH 4/5] Regularly check for updates in Buf dependencies (#1772) --- .github/workflows/buf-update.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/buf-update.yaml diff --git a/.github/workflows/buf-update.yaml b/.github/workflows/buf-update.yaml new file mode 100644 index 000000000..ba8f1c304 --- /dev/null +++ b/.github/workflows/buf-update.yaml @@ -0,0 +1,27 @@ +name: "Run 'buf update'" + +on: + workflow_dispatch: + schedule: + - cron: '30 10 * * 1' + +jobs: + update-buf-dependencies: + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ github.token }} + steps: + - uses: actions/checkout@v4 + + - name: Run 'buf update' + run: | + export PATH=$PATH:$(go env GOPATH)/bin + make install-tools proto-update + + - name: Create pull request + uses: peter-evans/create-pull-request@v6.0.2 + with: + title: Update Buf dependencies + body: Automatic pull request for updating Buf dependencies + branch: update-buf-dependencies + commit-message: "[automated] Update Buf dependencies" From 891178b002a7260cdfd8ec21cfe272834dedd6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haris=20Osmanagi=C4=87?= Date: Wed, 14 Aug 2024 20:21:39 +0200 Subject: [PATCH 5/5] Update Buf actions (#1739) --- .github/workflows/buf-push.yaml | 33 ++ .github/workflows/buf-validate.yaml | 33 ++ .github/workflows/buf.yml | 45 --- .../workflows/validate-generated-files.yml | 2 + proto/README.md | 8 +- proto/api/v1/api.pb.go | 26 +- proto/api/v1/api.proto | 366 ++++++++---------- proto/buf.lock | 8 +- 8 files changed, 243 insertions(+), 278 deletions(-) create mode 100644 .github/workflows/buf-push.yaml create mode 100644 .github/workflows/buf-validate.yaml delete mode 100644 .github/workflows/buf.yml diff --git a/.github/workflows/buf-push.yaml b/.github/workflows/buf-push.yaml new file mode 100644 index 000000000..b08540981 --- /dev/null +++ b/.github/workflows/buf-push.yaml @@ -0,0 +1,33 @@ +name: buf-push + +on: + push: + branches: + - main + paths: + - 'proto/**' + +jobs: + push: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # This step sets up the variable steps.buf-version.outputs.v + # to contain the version of Buf (e.g. v1.36.0) from go.mod. + - name: Get Buf version + id: buf-version + run: | + BUF_VERSION=$( go list -m -f '{{.Version}}' github.com/bufbuild/buf ) + # remove the leading 'v' in front of the version + BUF_VERSION=${BUF_VERSION#v} + echo "v=$BUF_VERSION" >> "$GITHUB_OUTPUT" + - uses: bufbuild/buf-action@v1 + with: + version: ${{ steps.buf-version.outputs.v }} + token: ${{ secrets.BUF_TOKEN }} + input: 'proto' + # The repository should already exist. + # If it can be automatically created, that's a sign that it was deleted, + # which is likely a major issue, which we want to be aware of. + push_disable_create: true diff --git a/.github/workflows/buf-validate.yaml b/.github/workflows/buf-validate.yaml new file mode 100644 index 000000000..56b336122 --- /dev/null +++ b/.github/workflows/buf-validate.yaml @@ -0,0 +1,33 @@ +name: buf-validate + +on: + pull_request: + # 'labeled' and 'unlabeled' are included so we can use the 'Buf Skip Breaking' label + # and skip a breaking change if that's required. + # See: https://github.com/bufbuild/buf-action?tab=readme-ov-file#skip-the-breaking-change-detection-step + types: [opened, synchronize, reopened, labeled, unlabeled] + paths: + - 'proto/**' + +jobs: + validate: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + # This step sets up the variable steps.buf-version.outputs.v + # to contain the version of Buf (e.g. v1.36.0) from go.mod. + - name: Get Buf version + id: buf-version + run: | + BUF_VERSION=$( go list -m -f '{{.Version}}' github.com/bufbuild/buf ) + # remove the leading 'v' in front of the version + BUF_VERSION=${BUF_VERSION#v} + echo "v=$BUF_VERSION" >> "$GITHUB_OUTPUT" + - uses: bufbuild/buf-action@v1 + with: + version: ${{ steps.buf-version.outputs.v }} + token: ${{ secrets.BUF_TOKEN }} + input: 'proto' + push: false + breaking_against: '${{ github.event.repository.clone_url }}#branch=main,subdir=proto' diff --git a/.github/workflows/buf.yml b/.github/workflows/buf.yml deleted file mode 100644 index 80657da57..000000000 --- a/.github/workflows/buf.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: buf - -on: - push: - branches: - - main - paths: - - 'proto/**' - pull_request: - paths: - - 'proto/**' - -jobs: - validate: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: bufbuild/buf-setup-action@v1 - - uses: bufbuild/buf-lint-action@v1 - with: - input: 'proto' - - # We need to fetch main so we can compare breaking changes against whatever is in main right now. - - name: Fetch origin/main - run: git fetch --no-tags --prune --depth=1 origin +refs/heads/main:refs/remotes/origin/main - - - uses: bufbuild/buf-breaking-action@v1 - with: - input: 'proto' - against: '.git#branch=origin/main,subdir=proto' - - # Push buf module to the buf schema registry, but only if the validate action succeeded and if the action is running - # on branch main. - push: - runs-on: ubuntu-latest - needs: validate - if: ${{ github.ref == 'refs/heads/main' }} - steps: - - uses: actions/checkout@v4 - - uses: bufbuild/buf-setup-action@v1 - - uses: bufbuild/buf-push-action@v1 - with: - input: 'proto' - buf_token: ${{ secrets.BUF_TOKEN }} - diff --git a/.github/workflows/validate-generated-files.yml b/.github/workflows/validate-generated-files.yml index 623ae6058..3f8a0967e 100644 --- a/.github/workflows/validate-generated-files.yml +++ b/.github/workflows/validate-generated-files.yml @@ -17,6 +17,8 @@ jobs: go-version-file: 'go.mod' - name: Check generated files + env: + BUF_TOKEN: ${{ secrets.BUF_TOKEN }} run: | export PATH=$PATH:$(go env GOPATH)/bin make install-tools generate proto-generate diff --git a/proto/README.md b/proto/README.md index 288a8cd26..0cf6342dc 100644 --- a/proto/README.md +++ b/proto/README.md @@ -6,8 +6,12 @@ the [grpc-gateway](https://github.com/grpc-ecosystem/grpc-gateway). ## Client code -The client code for Conduit's API is available as a [Buf remote package](https://docs.buf.build/bsr/remote-packages/go). -Proto files are pushed to the Buf Schema Registry via a GitHub workflow defined [here](/.github/workflows/buf.yml). +The client code for Conduit's API is available as +a [Buf remote package](https://docs.buf.build/bsr/remote-packages/go). Proto +files are validates through the GitHub workflow defined +in [buf-validate.yaml](/.github/workflows/buf-validate.yaml) and pushed to the +Buf Schema Registry via the workflow defined +in [buf-push](/.github/workflows/buf-push.yaml). To use the client code, firstly run: diff --git a/proto/api/v1/api.pb.go b/proto/api/v1/api.pb.go index 8c892a9e2..dbc703b57 100644 --- a/proto/api/v1/api.pb.go +++ b/proto/api/v1/api.pb.go @@ -4416,19 +4416,19 @@ var File_api_v1_api_proto protoreflect.FileDescriptor var file_api_v1_api_proto_rawDesc = []byte{ 0x0a, 0x10, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x06, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x1a, 0x18, 0x6f, 0x70, 0x65, 0x6e, - 0x63, 0x64, 0x63, 0x2f, 0x76, 0x31, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x64, 0x63, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x66, 0x69, 0x65, 0x6c, - 0x64, 0x5f, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, - 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, - 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, - 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x74, 0x6f, 0x12, 0x06, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x1a, 0x19, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x64, 0x63, 0x2f, 0x76, + 0x31, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x64, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, + 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, + 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa9, 0x06, 0x0a, 0x08, 0x50, 0x69, 0x70, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x13, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, diff --git a/proto/api/v1/api.proto b/proto/api/v1/api.proto index b1a9c003a..e62ca597c 100644 --- a/proto/api/v1/api.proto +++ b/proto/api/v1/api.proto @@ -2,12 +2,41 @@ syntax = "proto3"; package api.v1; -import "opencdc/v1/opencdc.proto"; import "config/v1/parameter.proto"; -import "google/api/field_behavior.proto"; import "google/api/annotations.proto"; -import "protoc-gen-openapiv2/options/annotations.proto"; +import "google/api/field_behavior.proto"; import "google/protobuf/timestamp.proto"; +import "opencdc/v1/opencdc.proto"; +import "protoc-gen-openapiv2/options/annotations.proto"; + +option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { + info: { + title: "Conduit REST API" + version: "v0.1.0" + contact: { + name: "Conduit project" + url: "https://github.com/conduitio/conduit" + email: "" + } + license: { + name: "Apache License Version 2.0" + url: "https://github.com/ConduitIO/conduit/blob/main/LICENSE.md" + } + } + + responses: { + key: "500" + value: { + schema: { + json_schema: {ref: ".google.rpc.Status"} + } + examples: { + key: "application/json" + value: '{ "code": 13, "message": "server error", "details": [] }' + } + } + } +}; message Pipeline { // Status describes the pipeline status. @@ -124,8 +153,10 @@ message Processor { } string id = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; - reserved 2; reserved "state"; // message does not track state - reserved 4; reserved "type"; + reserved 2; + reserved "state"; // message does not track state + reserved 4; + reserved "type"; Config config = 3; // Condition is a goTemplate formatted string, the value provided to the template is a sdk.Record, it should evaluate // to a boolean value, indicating a condition to run the processor for a specific record or not. (template functions @@ -142,7 +173,7 @@ message Processor { } // ConnectorPluginSpecifications describes the specifications of a connector plugin. -message ConnectorPluginSpecifications{ +message ConnectorPluginSpecifications { // Name is the name of the plugin. string name = 1; // Summary is a brief description of the plugin and what it does, @@ -166,7 +197,7 @@ message ConnectorPluginSpecifications{ } // ProcessorPluginSpecifications describes the specifications of a processor plugin. -message ProcessorPluginSpecifications{ +message ProcessorPluginSpecifications { // Name is the name of the plugin. string name = 1; // Summary is a brief description of the plugin and what it does, @@ -187,7 +218,7 @@ message ProcessorPluginSpecifications{ } // Deprecated: use ConnectorPluginSpecifications instead. -message PluginSpecifications{ +message PluginSpecifications { option deprecated = true; // Deprecated: use config.v1.Parameter instead. @@ -195,7 +226,7 @@ message PluginSpecifications{ option deprecated = true; // Deprecated: use config.v1.Validation instead. - message Validation{ + message Validation { option deprecated = true; // Deprecated: use config.v1.Validation.Type instead. @@ -269,7 +300,7 @@ service PipelineService { get: "/v1/pipelines" response_body: "pipelines" }; - }; + } rpc CreatePipeline(CreatePipelineRequest) returns (CreatePipelineResponse) { option (google.api.http) = { @@ -279,35 +310,31 @@ service PipelineService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } responses: { - key: "409"; + key: "409" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 6, "message": "already exists error", "details": [] }'; + value: '{ "code": 6, "message": "already exists error", "details": [] }' } } } }; - }; + } rpc GetPipeline(GetPipelineRequest) returns (GetPipelineResponse) { option (google.api.http) = { @@ -316,21 +343,19 @@ service PipelineService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } }; - }; + } rpc UpdatePipeline(UpdatePipelineRequest) returns (UpdatePipelineResponse) { option (google.api.http) = { @@ -340,121 +365,103 @@ service PipelineService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } responses: { - key: "409"; + key: "409" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 6, "message": "already exists error", "details": [] }'; + value: '{ "code": 6, "message": "already exists error", "details": [] }' } } } }; - }; + } rpc DeletePipeline(DeletePipelineRequest) returns (DeletePipelineResponse) { - option (google.api.http) = { - delete: "/v1/pipelines/{id}" - }; + option (google.api.http) = {delete: "/v1/pipelines/{id}"}; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "failed precondition error", "details": [] }'; + value: '{ "code": 9, "message": "failed precondition error", "details": [] }' } } } }; - }; + } rpc StartPipeline(StartPipelineRequest) returns (StartPipelineResponse) { - option (google.api.http) = { - post: "/v1/pipelines/{id}/start" - }; + option (google.api.http) = {post: "/v1/pipelines/{id}/start"}; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "failed precondition error", "details": [] }'; + value: '{ "code": 9, "message": "failed precondition error", "details": [] }' } } } }; - }; + } rpc StopPipeline(StopPipelineRequest) returns (StopPipelineResponse) { option (google.api.http) = { @@ -463,42 +470,38 @@ service PipelineService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "failed precondition error", "details": [] }'; + value: '{ "code": 9, "message": "failed precondition error", "details": [] }' } } } }; - }; + } rpc GetDLQ(GetDLQRequest) returns (GetDLQResponse) { option (google.api.http) = { get: "/v1/pipelines/{id}/dead-letter-queue" response_body: "dlq" }; - }; + } rpc UpdateDLQ(UpdateDLQRequest) returns (UpdateDLQResponse) { option (google.api.http) = { @@ -506,14 +509,14 @@ service PipelineService { body: "dlq" response_body: "dlq" }; - }; + } rpc ExportPipeline(ExportPipelineRequest) returns (ExportPipelineResponse) { option (google.api.http) = { post: "/v1/pipelines/{id}/export" response_body: "pipeline" }; - }; + } rpc ImportPipeline(ImportPipelineRequest) returns (ImportPipelineResponse) { option (google.api.http) = { @@ -521,7 +524,7 @@ service PipelineService { body: "pipeline" response_body: "pipeline" }; - }; + } } message ListPipelinesRequest { @@ -604,7 +607,7 @@ service ConnectorService { get: "/v1/connectors" response_body: "connectors" }; - }; + } rpc InspectConnector(InspectConnectorRequest) returns (stream InspectConnectorResponse) { option (google.api.http) = { @@ -620,21 +623,19 @@ service ConnectorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } }; - }; + } rpc CreateConnector(CreateConnectorRequest) returns (CreateConnectorResponse) { option (google.api.http) = { @@ -644,21 +645,19 @@ service ConnectorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } }; - }; + } rpc ValidateConnector(ValidateConnectorRequest) returns (ValidateConnectorResponse) { option (google.api.http) = { post: "/v1/connectors/validate" @@ -666,30 +665,26 @@ service ConnectorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "500"; + key: "500" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 13, "message": "could not dispense destination", "details": [] }'; + value: '{ "code": 13, "message": "could not dispense destination", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "validation error: `aws.accessKeyId` config value must be set", "details": [] }'; + value: '{ "code": 9, "message": "validation error: `aws.accessKeyId` config value must be set", "details": [] }' } } } @@ -704,78 +699,68 @@ service ConnectorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } }; - }; + } rpc DeleteConnector(DeleteConnectorRequest) returns (DeleteConnectorResponse) { - option (google.api.http) = { - delete: "/v1/connectors/{id}" - }; + option (google.api.http) = {delete: "/v1/connectors/{id}"}; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "failed precondition error", "details": [] }'; + value: '{ "code": 9, "message": "failed precondition error", "details": [] }' } } } }; - }; + } rpc ListConnectorPlugins(ListConnectorPluginsRequest) returns (ListConnectorPluginsResponse) { option (google.api.http) = { get: "/v1/connectors/plugins" response_body: "plugins" }; - }; + } } message CreateConnectorRequest { @@ -804,8 +789,7 @@ message ValidateConnectorRequest { Connector.Config config = 4; } -message ValidateConnectorResponse { -} +message ValidateConnectorResponse {} message ListConnectorsRequest { string pipeline_id = 1; @@ -847,7 +831,7 @@ message ListConnectorPluginsRequest { string name = 1; } -message ListConnectorPluginsResponse{ +message ListConnectorPluginsResponse { repeated ConnectorPluginSpecifications plugins = 1; } @@ -858,7 +842,7 @@ service ProcessorService { get: "/v1/processors" response_body: "processors" }; - }; + } // InspectProcessorIn streams records coming into the specified processor rpc InspectProcessorIn(InspectProcessorInRequest) returns (stream InspectProcessorInResponse) { @@ -883,21 +867,19 @@ service ProcessorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } }; - }; + } rpc CreateProcessor(CreateProcessorRequest) returns (CreateProcessorResponse) { option (google.api.http) = { @@ -907,21 +889,19 @@ service ProcessorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } }; - }; + } rpc UpdateProcessor(UpdateProcessorRequest) returns (UpdateProcessorResponse) { option (google.api.http) = { @@ -931,78 +911,68 @@ service ProcessorService { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 3, "message": "invalid arguments error", "details": [] }'; + value: '{ "code": 3, "message": "invalid arguments error", "details": [] }' } } } }; - }; + } rpc DeleteProcessor(DeleteProcessorRequest) returns (DeleteProcessorResponse) { - option (google.api.http) = { - delete: "/v1/processors/{id}" - }; + option (google.api.http) = {delete: "/v1/processors/{id}"}; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { responses: { - key: "404"; + key: "404" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 5, "message": "resource not found error", "details": [] }'; + value: '{ "code": 5, "message": "resource not found error", "details": [] }' } } } responses: { - key: "400"; + key: "400" value: { schema: { - json_schema: { - ref: ".google.rpc.Status"; - } + json_schema: {ref: ".google.rpc.Status"} } examples: { key: "application/json" - value: '{ "code": 9, "message": "failed precondition error", "details": [] }'; + value: '{ "code": 9, "message": "failed precondition error", "details": [] }' } } } }; - }; + } rpc ListProcessorPlugins(ListProcessorPluginsRequest) returns (ListProcessorPluginsResponse) { option (google.api.http) = { get: "/v1/processors/plugins" response_body: "plugins" }; - }; + } } message ListProcessorsRequest { @@ -1026,7 +996,6 @@ message InspectProcessorOutResponse { opencdc.v1.Record record = 1; } - message CreateProcessorRequest { string type = 1 [deprecated = true]; Processor.Parent parent = 3; @@ -1063,17 +1032,17 @@ message ListProcessorPluginsRequest { string name = 1; } -message ListProcessorPluginsResponse{ +message ListProcessorPluginsResponse { repeated ProcessorPluginSpecifications plugins = 1; } service InformationService { - rpc GetInfo (GetInfoRequest) returns (GetInfoResponse) { + rpc GetInfo(GetInfoRequest) returns (GetInfoResponse) { option (google.api.http) = { get: "/info" response_body: "info" }; - }; + } } message GetInfoRequest {} @@ -1088,37 +1057,6 @@ message Info { string arch = 3; } -option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { - info: { - title: "Conduit REST API"; - version: "v0.1.0"; - contact: { - name: "Conduit project"; - url: "https://github.com/conduitio/conduit"; - email: ""; - } - license: { - name: "Apache License Version 2.0"; - url: "https://github.com/ConduitIO/conduit/blob/main/LICENSE.md"; - } - } - - responses: { - key: "500"; - value: { - schema: { - json_schema: { - ref: ".google.rpc.Status"; - } - } - examples: { - key: "application/json" - value: '{ "code": 13, "message": "server error", "details": [] }'; - } - } - } -}; - // Deprecated: use ConnectorService and ProcessorService instead. service PluginService { // Deprecated: use ConnectorService.ListConnectorPlugins instead. @@ -1128,7 +1066,7 @@ service PluginService { get: "/v1/plugins" response_body: "plugins" }; - }; + } } // Deprecated: use ConnectorService.ListConnectorPlugins instead. @@ -1139,7 +1077,7 @@ message ListPluginsRequest { } // Deprecated: use ConnectorService.ListConnectorPlugins instead. -message ListPluginsResponse{ +message ListPluginsResponse { option deprecated = true; repeated PluginSpecifications plugins = 1; } diff --git a/proto/buf.lock b/proto/buf.lock index 64f11225a..4acfdb0e9 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -4,13 +4,13 @@ deps: - remote: buf.build owner: conduitio repository: conduit-commons - commit: e990b17e93ed46918d583f3a86ae2ce6 - digest: shake256:c04156587387580d084096e8fdc6d75c2382ff79f456677b7d40ddf216aa8f09898e9f1a5e442e23c55c7dccb3347666e5095fe299d0d54802d1144b7a111e67 + commit: 11464f8c698f416da0641fdaff2cd45c + digest: shake256:9dd5ce71529da7ae268ef521b0252aad49712d6214e383c0d8da039ad2103b0e44c6ac597f5b83d93808a32c65926317999f9c4be39765688737ce3fe804eb21 - remote: buf.build owner: googleapis repository: googleapis - commit: f0e53af8f2fc4556b94f482688b57223 - digest: shake256:de26a277fc28b8b411ecf58729d78d32fcf15090ffd998a4469225b17889bfb51442eaab04bb7a8d88d203ecdf0a9febd4ffd52c18ed1c2229160c7bd353ca95 + commit: 8bc2c51e08c447cd8886cdea48a73e14 + digest: shake256:a969155953a5cedc5b2df5b42c368f2bc66ff8ce1804bc96e0f14ff2ee8a893687963058909df844d1643cdbc98ff099d2daa6bc9f9f5b8886c49afdc60e19af - remote: buf.build owner: grpc-ecosystem repository: grpc-gateway