Skip to content

chore: Add useEffectiveInstanceFields header #3881

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

Draft
wants to merge 1 commit into
base: CLOUDP-313272-dev-effective-fields
Choose a base branch
from
Draft

chore: Add useEffectiveInstanceFields header #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/service/advancedcluster/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/service/advancedcluster/common_admin_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/service/advancedcluster/common_await_changes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
7 changes: 3 additions & 4 deletions internal/service/advancedcluster/plural_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, &params)
request = request.PageNum(pageNum)
return request.Execute()
return api.ListClustersWithParams(ctx, &params).PageNum(pageNum).Execute()
})
if err != nil {
diags.AddError(errorList, fmt.Sprintf(errorListDetail, projectID, err.Error()))
Expand Down
Loading