From 561bdc04fe9cf22a310ea60e42c0b6ef8b1b590f Mon Sep 17 00:00:00 2001 From: jzajic Date: Thu, 3 Nov 2022 15:21:14 +0100 Subject: [PATCH 1/2] Fix https://github.com/fluent/fluent-bit-go/issues/49 Signed-off-by: jzajic --- src/flb_plugin_proxy.c | 6 +++--- src/proxy/go/go.c | 4 ++-- src/proxy/go/go.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/flb_plugin_proxy.c b/src/flb_plugin_proxy.c index e7ab2429455..ce4c8332121 100644 --- a/src/flb_plugin_proxy.c +++ b/src/flb_plugin_proxy.c @@ -183,13 +183,13 @@ static void flb_proxy_input_cb_resume(void *data, struct flb_config *config) } static void flb_plugin_proxy_destroy(struct flb_plugin_proxy *proxy); -static int flb_proxy_output_cb_exit(void *data, struct flb_config *config) +static int flb_proxy_output_cb_exit(void *data, void *out_context) { struct flb_output_plugin *instance = data; struct flb_plugin_proxy *proxy = (instance->proxy); - + struct flb_plugin_proxy_context *ctx = out_context; if (proxy->def->proxy == FLB_PROXY_GOLANG) { - proxy_go_output_destroy(proxy->data); + proxy_go_output_destroy(ctx, proxy->data); } flb_plugin_proxy_destroy(proxy); return 0; diff --git a/src/proxy/go/go.c b/src/proxy/go/go.c index 1568835b221..c419d0b508c 100644 --- a/src/proxy/go/go.c +++ b/src/proxy/go/go.c @@ -145,7 +145,7 @@ int proxy_go_output_flush(struct flb_plugin_proxy_context *ctx, return ret; } -int proxy_go_output_destroy(void *data) +int proxy_go_output_destroy(struct flb_plugin_proxy_context *ctx, void *data) { int ret = 0; struct flbgo_output_plugin *plugin; @@ -154,7 +154,7 @@ int proxy_go_output_destroy(void *data) flb_debug("[GO] running exit callback"); if (plugin->cb_exit_ctx) { - ret = plugin->cb_exit_ctx(plugin->context->remote_context); + ret = plugin->cb_exit_ctx(ctx->remote_context); } else if (plugin->cb_exit) { ret = plugin->cb_exit(); diff --git a/src/proxy/go/go.h b/src/proxy/go/go.h index 1cc0cc141e7..256b9bd8db2 100644 --- a/src/proxy/go/go.h +++ b/src/proxy/go/go.h @@ -56,7 +56,7 @@ int proxy_go_output_init(struct flb_plugin_proxy *proxy); int proxy_go_output_flush(struct flb_plugin_proxy_context *ctx, const void *data, size_t size, const char *tag, int tag_len); -int proxy_go_output_destroy(void *data); +int proxy_go_output_destroy(struct flb_plugin_proxy_context *ctx, void *data); int proxy_go_input_register(struct flb_plugin_proxy *proxy, struct flb_plugin_proxy_def *def); From cfdc1a190993236c54bd74c50f62cdbc154267be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 06:08:03 +0000 Subject: [PATCH 2/2] workflows: bump google-github-actions/auth from 0 to 1 Bumps [google-github-actions/auth](https://github.com/google-github-actions/auth) from 0 to 1. - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/auth/compare/v0...v1) --- updated-dependencies: - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/call-run-integration-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/call-run-integration-test.yaml b/.github/workflows/call-run-integration-test.yaml index 60ff37b1091..cb446022b43 100644 --- a/.github/workflows/call-run-integration-test.yaml +++ b/.github/workflows/call-run-integration-test.yaml @@ -78,7 +78,7 @@ jobs: cli_config_credentials_token: ${{ secrets.terraform_api_token }} - id: 'auth' - uses: 'google-github-actions/auth@v0' + uses: 'google-github-actions/auth@v1' with: credentials_json: ${{ secrets.gcp-service-account-key }} @@ -268,7 +268,7 @@ jobs: repository: fluent/fluent-bit-ci - if: matrix.cloud == 'gke' - uses: 'google-github-actions/auth@v0' + uses: 'google-github-actions/auth@v1' with: credentials_json: ${{ secrets.gcp-service-account-key }}