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.

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

Fix: Correct fluentd prase TimeFormat config key #780

Merged
merged 3 commits into from Jun 9, 2023

Conversation

Jakob3xD
Copy link
Contributor

@Jakob3xD Jakob3xD commented Jun 7, 2023

What this PR does / why we need it:

It changes the TimeFormat config value from time_type to time_format as it should be.

Which issue(s) this PR fixes:

Fixes #778
Fixes #781

Does this PR introduced a user-facing change?

Fix: Correct fluentd prase TimeFormat config key
Fix: Correct Kubebuilder validation for TimeType from *string to string

Additional documentation, usage docs, etc.:


TimeType *string `json:"timeType,omitempty"`
// Process value according to the specified format. This is available only when time_type is *string
// Process value according to the specified format. This is available only when time_type is string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should change like this?

Suggested change
// Process value according to the specified format. This is available only when time_type is string
// Process value according to the specified format. This is available only when time_format is string

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is correct how it is right now. The time_format only applies when time_type is set to the value string.

@wenchajun
Copy link
Member

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
@Jakob3xD
Copy link
Contributor Author

Jakob3xD commented Jun 8, 2023

Yes, the CI error also needs to be fixed @Jakob3xD

Should be fixed now. I updated the key and removed the new line at the end of file which was added by my vim.

@benjaminhuo benjaminhuo merged commit 4896e5a into fluent:master Jun 9, 2023
6 checks passed
@benjaminhuo
Copy link
Member

@Jakob3xD Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: TimeType wants *string instead of string bug: Parser - TimeFormat is written to time_type
3 participants