Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows: bump google-github-actions/auth from 0 to 1 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

workflows: bump google-github-actions/auth from 0 to 1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
561bdc0
Fix https://github.com/fluent/fluent-bit-go/issues/49
jan-zajic Nov 3, 2022
cfdc1a1
workflows: bump google-github-actions/auth from 0 to 1
dependabot[bot] Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/call-run-integration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down
6 changes: 3 additions & 3 deletions src/flb_plugin_proxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/proxy/go/go.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/go/go.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down