Skip to content

Commit 9f85896

Browse files
committed
adv config change
1 parent 8e9ab05 commit 9f85896

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

internal/service/advancedclustertpf/common_admin_sdk.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func updateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.
6767
return AwaitChanges(ctx, client, waitParams, operationName, diags)
6868
}
6969

70-
func UpdateAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, reqLegacy *admin20240530.ClusterDescriptionProcessArgs, reqNew *admin.ClusterDescriptionProcessArgs20240805, waitParams *ClusterWaitParams) (legacy *admin20240530.ClusterDescriptionProcessArgs, latest *admin.ClusterDescriptionProcessArgs20240805, changed bool) {
70+
func UpdateAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, reqLegacy *admin20240530.ClusterDescriptionProcessArgs, reqNew *admin.ClusterDescriptionProcessArgs20240805, clusterAdvConfig *admin.ApiAtlasClusterAdvancedConfiguration, waitParams *ClusterWaitParams) (legacy *admin20240530.ClusterDescriptionProcessArgs, latest *admin.ClusterDescriptionProcessArgs20240805, changed bool) {
7171
var (
7272
err error
7373
advConfig *admin.ClusterDescriptionProcessArgs20240805
@@ -100,6 +100,9 @@ func UpdateAdvancedConfiguration(ctx context.Context, diags *diag.Diagnostics, c
100100
return nil, nil, false
101101
}
102102
}
103+
if !update.IsZeroValues(clusterAdvConfig) {
104+
changed = true
105+
}
103106
return legacyAdvConfig, advConfig, changed
104107
}
105108

internal/service/advancedclustertpf/resource.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func (r *rs) Create(ctx context.Context, req resource.CreateRequest, resp *resou
158158
if diags.HasError() {
159159
return
160160
}
161-
legacyAdvConfig, advConfig, _ := UpdateAdvancedConfiguration(ctx, diags, r.Client, patchReqProcessArgsLegacy, patchReqProcessArgs, waitParams)
161+
legacyAdvConfig, advConfig, _ := UpdateAdvancedConfiguration(ctx, diags, r.Client, patchReqProcessArgsLegacy, patchReqProcessArgs, clusterResp.AdvancedConfiguration, waitParams)
162162
if diags.HasError() {
163163
return
164164
}
@@ -268,7 +268,7 @@ func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resou
268268
if diags.HasError() {
269269
return
270270
}
271-
legacyAdvConfig, advConfig, advConfigChanged := UpdateAdvancedConfiguration(ctx, diags, r.Client, patchReqProcessArgsLegacy, patchReqProcessArgs, waitParams)
271+
legacyAdvConfig, advConfig, advConfigChanged := UpdateAdvancedConfiguration(ctx, diags, r.Client, patchReqProcessArgsLegacy, patchReqProcessArgs, clusterResp.AdvancedConfiguration, waitParams)
272272
if diags.HasError() {
273273
return
274274
}
@@ -283,6 +283,7 @@ func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resou
283283
}
284284
}
285285
if advConfigChanged {
286+
// TODO: this is not called if only change is in cluster advConfig attrs
286287
updateModelAdvancedConfig(ctx, diags, r.Client, modelOut, legacyAdvConfig, advConfig, clusterResp.AdvancedConfiguration)
287288
if diags.HasError() {
288289
return

0 commit comments

Comments
 (0)