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

Jump to bottom

Cherry-pick #23277 to 7.x: [Filebeat] Use new JsonBlob type in CredentialsJSON #23291

Merged
merged 2 commits into from
Dec 28, 2020
Merged

Cherry-pick #23277 to 7.x: [Filebeat] Use new JsonBlob type in CredentialsJSON #23291

merged 2 commits into from
Dec 28, 2020

Commits on Dec 28, 2020

  1. Use new JsonBlob type in CredentialsJSON (elastic#23277) 

    Both inputs gcp-pubsub and httpjson used []byte fields as part of their configurations to receive json blobs. This caused issues because the config values never get parsed properly since literal JSON strings arrived as string and objects as maps, causing errors similar to can not convert 'string' into 'uint8' accessing 'auth.oauth2.google.credentials_json' or can not convert 'object' into 'uint8' accessing 'auth.oauth2.google.credentials_json'.

This creates a JSONBlob type that can be unpacked from literal json strings or from config objects into a raw json message.

(cherry picked from commit 9022e19)
    @marc-gr @adriansr
    marc-gr authored and adriansr committed Dec 28, 2020
    Configuration menu
    Copy the full SHA
    8b6174d View commit details
    Browse the repository at this point in the history

  2. Merge branch '7.x' into backport_23277_7.x

    @adriansr
    adriansr authored Dec 28, 2020
    Configuration menu
    Copy the full SHA
    cf65438 View commit details
    Browse the repository at this point in the history