diff --git a/internal/service/advancedcluster/common.go b/internal/service/advancedcluster/common.go index ce1f19d223..579d7028d9 100644 --- a/internal/service/advancedcluster/common.go +++ b/internal/service/advancedcluster/common.go @@ -118,7 +118,7 @@ func GetPriorityOfFlexReplicationSpecs(replicationSpecs *[]admin.ReplicationSpec func ResourceClusterListAdvancedRefreshFunc(ctx context.Context, projectID string, clustersAPI admin.ClustersApi) retry.StateRefreshFunc { return func() (any, string, error) { - clusters, resp, err := clustersAPI.ListClusters(ctx, projectID).Execute() + clusters, resp, err := clustersAPI.ListClusters(ctx, projectID).UseEffectiveInstanceFields(true).Execute() if err != nil && strings.Contains(err.Error(), "reset by peer") { return nil, "REPEATING", nil diff --git a/internal/service/advancedcluster/common_admin_sdk.go b/internal/service/advancedcluster/common_admin_sdk.go index 593584b741..85bc716b9b 100644 --- a/internal/service/advancedcluster/common_admin_sdk.go +++ b/internal/service/advancedcluster/common_admin_sdk.go @@ -35,7 +35,7 @@ func CreateCluster(ctx context.Context, diags *diag.Diagnostics, client *config. } func createClusterLatest(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin.ClusterDescription20240805, waitParams *ClusterWaitParams) *admin.ClusterDescription20240805 { - _, _, err := client.AtlasV2.ClustersApi.CreateCluster(ctx, waitParams.ProjectID, req).Execute() + _, _, err := client.AtlasV2.ClustersApi.CreateCluster(ctx, waitParams.ProjectID, req).UseEffectiveInstanceFields(true).Execute() if err != nil { addErrorDiag(diags, operationCreate, defaultAPIErrorDetails(waitParams.ClusterName, err)) return nil @@ -44,7 +44,7 @@ func createClusterLatest(ctx context.Context, diags *diag.Diagnostics, client *c } func updateCluster(ctx context.Context, diags *diag.Diagnostics, client *config.MongoDBClient, req *admin.ClusterDescription20240805, waitParams *ClusterWaitParams, operationName string) *admin.ClusterDescription20240805 { - _, _, err := client.AtlasV2.ClustersApi.UpdateCluster(ctx, waitParams.ProjectID, waitParams.ClusterName, req).Execute() + _, _, err := client.AtlasV2.ClustersApi.UpdateCluster(ctx, waitParams.ProjectID, waitParams.ClusterName, req).UseEffectiveInstanceFields(true).Execute() if err != nil { addErrorDiag(diags, operationName, defaultAPIErrorDetails(waitParams.ClusterName, err)) return nil @@ -162,7 +162,7 @@ func DeleteClusterNoWait(client *config.MongoDBClient, projectID, clusterName st func GetClusterDetails(ctx context.Context, diags *diag.Diagnostics, projectID, clusterName string, client *config.MongoDBClient, fcvPresentInState bool) (clusterDesc *admin.ClusterDescription20240805, flexClusterResp *admin.FlexClusterDescription20241113) { isFlex := false - clusterDesc, resp, err := client.AtlasV2.ClustersApi.GetCluster(ctx, projectID, clusterName).Execute() + clusterDesc, resp, err := client.AtlasV2.ClustersApi.GetCluster(ctx, projectID, clusterName).UseEffectiveInstanceFields(true).Execute() if err != nil { if validate.StatusNotFound(resp) || admin.IsErrorCode(err, ErrorCodeClusterNotFound) { return nil, nil diff --git a/internal/service/advancedcluster/common_await_changes.go b/internal/service/advancedcluster/common_await_changes.go index 4104244cf4..008720300a 100644 --- a/internal/service/advancedcluster/common_await_changes.go +++ b/internal/service/advancedcluster/common_await_changes.go @@ -97,7 +97,7 @@ func createStateChangeConfig(ctx context.Context, api admin.ClustersApi, project func ResourceRefreshFunc(ctx context.Context, name, projectID string, api admin.ClustersApi) retry.StateRefreshFunc { return func() (any, string, error) { - cluster, resp, err := api.GetCluster(ctx, projectID, name).Execute() + cluster, resp, err := api.GetCluster(ctx, projectID, name).UseEffectiveInstanceFields(true).Execute() if err != nil && strings.Contains(err.Error(), "reset by peer") { return nil, retrystrategy.RetryStrategyRepeatingState, nil } diff --git a/internal/service/advancedcluster/plural_data_source.go b/internal/service/advancedcluster/plural_data_source.go index a914741afe..dd14373cdb 100644 --- a/internal/service/advancedcluster/plural_data_source.go +++ b/internal/service/advancedcluster/plural_data_source.go @@ -54,12 +54,11 @@ func (d *pluralDS) readClusters(ctx context.Context, diags *diag.Diagnostics, pl projectID := pluralModel.ProjectID.ValueString() api := d.Client.AtlasV2.ClustersApi params := admin.ListClustersApiParams{ - GroupId: projectID, + GroupId: projectID, + UseEffectiveInstanceFields: conversion.Pointer(true), } list, err := dsschema.AllPages(ctx, func(ctx context.Context, pageNum int) (dsschema.PaginateResponse[admin.ClusterDescription20240805], *http.Response, error) { - request := api.ListClustersWithParams(ctx, ¶ms) - request = request.PageNum(pageNum) - return request.Execute() + return api.ListClustersWithParams(ctx, ¶ms).PageNum(pageNum).Execute() }) if err != nil { diags.AddError(errorList, fmt.Sprintf(errorListDetail, projectID, err.Error()))