[datadog_monitor] Allow default_tags values to contain colons. #2703
+495
−156
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Amaury-Behague
force-pushed
the
fix-default-tags-colon-values
branch
from
af4f4e5 to
e58ffb0
Compare
Amaury-Behague
changed the title
LorisFriedel
reviewed
Dec 4, 2024
datadog/provider.go
Outdated
| @@ -470,12 +470,14 @@ func tagDiff(ctx context.Context, d *schema.ResourceDiff, meta interface{}) erro | |||
| kv := strings.Split(tag.(string), ":") | |||
There was a problem hiding this comment.
You could probably use strings.Cut (or even strings.SplitN) and avoid having to strings.Join afterwards. This would probably allow to simplify the whole check logic!
There was a problem hiding this comment.
Like so:
tagStr := tag.(string)
if tagStr == "" {
return fmt.Errorf("invalid tag: '%s'", tag)
}
key, value, found := strings.Cut(tagStr, ":")
if !found {
value = ""
}
tags[key] = valueOr even omit the check if !found given that the default value of a string is "" anyway!
There was a problem hiding this comment.
Good point - I always forget about this function.
There was a problem hiding this comment.
Done - I've even removed the special case for empty tags because it does not break the code.
Only separate the key before the first colon, all subsequent colons are considered to be part of the value as stated in datadog docs.
Amaury-Behague
force-pushed
the
fix-default-tags-colon-values
branch
from
da8db65 to
1a580f5
Compare
urseberry
approved these changes
Dec 4, 2024
nkzou
approved these changes
Dec 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only separate the key before the first colon, all subsequent colons are
considered to be part of the value as stated in datadog docs.