From 693618c836442dca7d717ec46a781c6f11f2b544 Mon Sep 17 00:00:00 2001 From: Aastha Mahendru Date: Thu, 11 Apr 2024 10:37:54 +0100 Subject: [PATCH 1/3] fix advance config update on error --- internal/service/cluster/resource_cluster.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/cluster/resource_cluster.go b/internal/service/cluster/resource_cluster.go index 479e185300..01a63dc42f 100644 --- a/internal/service/cluster/resource_cluster.go +++ b/internal/service/cluster/resource_cluster.go @@ -12,17 +12,19 @@ import ( "strings" "time" + matlas "go.mongodb.org/atlas/mongodbatlas" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/spf13/cast" + "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant" "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion" "github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate" "github.com/mongodb/terraform-provider-mongodbatlas/internal/config" "github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster" - "github.com/spf13/cast" - matlas "go.mongodb.org/atlas/mongodbatlas" ) const ( @@ -926,9 +928,9 @@ func resourceMongoDBAtlasClusterUpdate(ctx context.Context, d *schema.ResourceDa if aclist, ok1 := ac.([]any); ok1 && len(aclist) > 0 { advancedConfReq := expandProcessArgs(d, aclist[0].(map[string]any)) if !reflect.DeepEqual(advancedConfReq, matlas.ProcessArgs{}) { - argResp, _, err := conn.Clusters.UpdateProcessArgs(ctx, projectID, clusterName, advancedConfReq) + _, _, err := conn.Clusters.UpdateProcessArgs(ctx, projectID, clusterName, advancedConfReq) if err != nil { - return diag.FromErr(fmt.Errorf(errorAdvancedConfUpdate, clusterName+argResp.DefaultReadConcern, err)) + return diag.FromErr(fmt.Errorf(errorAdvancedConfUpdate, clusterName, err)) } } } From 1548447850c11bc27b580ee3ddc10f8a7f4c9693 Mon Sep 17 00:00:00 2001 From: Aastha Mahendru Date: Thu, 11 Apr 2024 10:55:32 +0100 Subject: [PATCH 2/3] changelog --- .changelog/2139.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2139.txt diff --git a/.changelog/2139.txt b/.changelog/2139.txt new file mode 100644 index 0000000000..6a75e49c2a --- /dev/null +++ b/.changelog/2139.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/mongodbatlas_cluster: Fixes nil pointer dereference if `advanced_configuration` update fails in `mongodbatlas_cluster` +``` From 90718f53f417a04ae20d93cfe7cfb4d2d2366323 Mon Sep 17 00:00:00 2001 From: maastha <122359335+maastha@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:11:29 +0100 Subject: [PATCH 3/3] Update .changelog/2139.txt Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com> --- .changelog/2139.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/2139.txt b/.changelog/2139.txt index 6a75e49c2a..36b88a9b4c 100644 --- a/.changelog/2139.txt +++ b/.changelog/2139.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/mongodbatlas_cluster: Fixes nil pointer dereference if `advanced_configuration` update fails in `mongodbatlas_cluster` +resource/mongodbatlas_cluster: Fixes nil pointer dereference if `advanced_configuration` update fails ```