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

[datadog_service_definition_yaml] Fix panic when contact attributes exists but are empty (nil) #2802

Merged
merged 2 commits into from
Feb 5, 2025
Merged

[datadog_service_definition_yaml] Fix panic when contact attributes exists but are empty (nil) #2802

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dcaf02
[datadog_service_definition_yaml] Fix panic when contact attributes e…
ecdatadog Jan 24, 2025
9b24ae3
Fix
ecdatadog Jan 24, 2025
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
39 changes: 23 additions & 16 deletions datadog/resource_datadog_service_definition_yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ func flattenYAMLToString(input map[string]interface{}) (string, error) {
return string(result), nil
}

func compareNullableStringArg(left map[string]interface{}, right map[string]interface{}, key string) *bool {
valueLVal, valueLOk := left[key]
valueRVal, valueROk := right[key]
if valueLVal != valueRVal && valueLOk && valueROk {
lv, lok := valueLVal.(string)
rv, rok := valueRVal.(string)
if lok && rok {
v := lv == rv
return &v
}
}
return nil
}

func prepServiceDefinitionResource(attrMap map[string]interface{}) map[string]interface{} {
if isBackstageSchema(attrMap) {
// Don't prepare 3rd party schemas
Expand Down Expand Up @@ -161,22 +175,13 @@ func prepServiceDefinitionResource(attrMap map[string]interface{}) map[string]in
for _, contact := range contacts {
sortedContacts = append(sortedContacts, contact.(map[string]interface{}))
}

sort.SliceStable(sortedContacts, func(i, j int) bool {
typeLVal, typeLOk := sortedContacts[i]["type"]
typeRVal, typeROk := sortedContacts[j]["type"]
if typeLVal != typeRVal && typeLOk && typeROk {
return typeLVal.(string) < typeRVal.(string)
}
contactLVal, contactLOk := sortedContacts[i]["contact"]
contactRVal, contactROk := sortedContacts[j]["contact"]
if contactLVal != contactRVal && contactLOk && contactROk {
return contactLVal.(string) < contactRVal.(string)
}
nameLVal, nameLOk := sortedContacts[i]["name"]
nameRVal, nameROk := sortedContacts[j]["name"]
if nameLOk && nameROk {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The last field has different condition as it doesn't test the (in)equality but it has no impact for the logic of the compare.

return nameLVal.(string) < nameRVal.(string)
attrs := []string{"type", "contact", "name"}
for _, attr := range attrs {
v := compareNullableStringArg(sortedContacts[i], sortedContacts[j], attr)
if v != nil {
return *v
}
}
return false
})
Expand Down Expand Up @@ -232,7 +237,9 @@ func normalizeArrayField(attrMap map[string]interface{}, key string) {
func getNameField(data interface{}) string {
if stringMap, ok := data.(map[string]interface{}); ok {
if name, ok := stringMap["name"]; ok {
return name.(string)
if v, ok := name.(string); ok {
return v
}
}
}
return ""
Expand Down
Loading