fix: Fixes nil pointer dereference in mongodbatlas_alert_configuration
#2463
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:bug | ||
| resource/mongodbatlas_alert_configuration: Fixes an issue where the `terraform apply` command crashes if you attempt to edit an existing `mongodbatlas_alert_configuration` by adding a value to `threshold_config`. | ||
| ``` | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -200,28 +200,28 @@ func NewTFMetricThresholdConfigModel(t *admin.ServerlessMetricThreshold, currSta | |
| return []TfMetricThresholdConfigModel{ | ||
| { | ||
| MetricName: conversion.StringNullIfEmpty(t.MetricName), | ||
| Operator: conversion.StringNullIfEmpty(t.GetOperator()), | ||
| Threshold: types.Float64Value(t.GetThreshold()), | ||
| Units: conversion.StringNullIfEmpty(t.GetUnits()), | ||
| Mode: conversion.StringNullIfEmpty(t.GetMode()), | ||
|
Comment on lines
-203
to
+206
There was a problem hiding this comment. just to fully understand, how where you able to have the API respond with a MetricThreshold object that only had some fields defined? Which one was not being returned? There was a problem hiding this comment. The issue was for
There was a problem hiding this comment. in these cases it would be great to create a test that fails before the fix and passes after the fix is applied There was a problem hiding this comment. I have not been able to create a test for this because to reproduce this issue the resource has to be modified from outside TF. I don't think we currently are able to reproduce this cases in our tests. Open to suggestions though :) |
||
| }, | ||
| } | ||
| } | ||
| currState := currStateSlice[0] | ||
| newState := TfMetricThresholdConfigModel{ | ||
| Threshold: types.Float64Value(t.GetThreshold()), | ||
| } | ||
| if !currState.MetricName.IsNull() { | ||
| newState.MetricName = conversion.StringNullIfEmpty(t.MetricName) | ||
| } | ||
| if !currState.Operator.IsNull() { | ||
| newState.Operator = conversion.StringNullIfEmpty(t.GetOperator()) | ||
| } | ||
| if !currState.Units.IsNull() { | ||
| newState.Units = conversion.StringNullIfEmpty(t.GetUnits()) | ||
| } | ||
| if !currState.Mode.IsNull() { | ||
| newState.Mode = conversion.StringNullIfEmpty(t.GetMode()) | ||
| } | ||
| return []TfMetricThresholdConfigModel{newState} | ||
| } | ||
|
|
@@ -234,21 +234,21 @@ func NewTFThresholdConfigModel(t *admin.GreaterThanRawThreshold, currStateSlice | |
| if len(currStateSlice) == 0 { // threshold was created elsewhere from terraform, or import statement is being called | ||
| return []TfThresholdConfigModel{ | ||
| { | ||
| Operator: conversion.StringNullIfEmpty(t.GetOperator()), | ||
| Threshold: types.Float64Value(float64(t.GetThreshold())), // int in new SDK but keeping float64 for backward compatibility | ||
| Units: conversion.StringNullIfEmpty(t.GetUnits()), | ||
| }, | ||
| } | ||
| } | ||
| currState := currStateSlice[0] | ||
| newState := TfThresholdConfigModel{} | ||
| if !currState.Operator.IsNull() { | ||
| newState.Operator = conversion.StringNullIfEmpty(t.GetOperator()) | ||
| } | ||
| if !currState.Units.IsNull() { | ||
| newState.Units = conversion.StringNullIfEmpty(t.GetUnits()) | ||
| } | ||
| newState.Threshold = types.Float64Value(float64(t.GetThreshold())) | ||
|
|
||
| return []TfThresholdConfigModel{newState} | ||
| } | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't finish in period, e.g.: https://github.com/mongodb/terraform-provider-mongodbatlas/blob/master/CHANGELOG.md
same for #2462 in case you can also change its changelog period at the end
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, removing this period and other unreleased entries periods for consistency. CHANGELOG.md entries will be updated once this is merged. FYI @JuliaMongo