chore: Implements extra API Calls for AdvancedCluster TPF (#2852)

* chore: Add support for ExtraAPIInfo in TFModel to find replication_specs.*.container_id * feat: Initial /tenantUpgrade logic * refactor: Fix zoneName default for legacy schema * address PR comments part 1 * use explicit code instead of comments Co-authored-by: Leo Antoli <[email protected]> * chore: remove comments and fix suggested change commit * chore: remove comment * address PR comments 2 * test: hard code extra container response --------- Co-authored-by: Leo Antoli <[email protected]>
mongodb · Dec 4, 2024 · 9d341b0 · 9d341b0
1 parent 539e9e6
commit 9d341b0
Show file tree

Hide file tree

Showing 18 changed files with 539 additions and 116 deletions.
diff --git a/internal/common/constant/cloud_provider.go b/internal/common/constant/cloud_provider.go
@@ -1,7 +1,8 @@
 package constant
 
 const (
-	AWS   = "AWS"
-	AZURE = "AZURE"
-	GCP   = "GCP"
+	AWS    = "AWS"
+	AZURE  = "AZURE"
+	GCP    = "GCP"
+	TENANT = "TENANT"
 )
diff --git a/internal/service/advancedclustertpf/model_ClusterDescription20240805.go b/internal/service/advancedclustertpf/model_ClusterDescription20240805.go
@@ -25,11 +25,15 @@ type LegacySchemaInfo struct {
 	RootDiskSize               *float64
 }
 
-func NewTFModel(ctx context.Context, input *admin.ClusterDescription20240805, timeout timeouts.Value, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo) *TFModel {
+type ExtraAPIInfo struct {
+	ContainerIDs map[string]string
+}
+
+func NewTFModel(ctx context.Context, input *admin.ClusterDescription20240805, timeout timeouts.Value, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo, apiInfo ExtraAPIInfo) *TFModel {
 	biConnector := NewBiConnectorConfigObjType(ctx, input.BiConnector, diags)
 	connectionStrings := NewConnectionStringsObjType(ctx, input.ConnectionStrings, diags)
 	labels := NewLabelsObjType(ctx, input.Labels, diags)
-	replicationSpecs := NewReplicationSpecsObjType(ctx, input.ReplicationSpecs, diags, legacyInfo)
+	replicationSpecs := NewReplicationSpecsObjType(ctx, input.ReplicationSpecs, diags, legacyInfo, apiInfo)
 	tags := NewTagsObjType(ctx, input.Tags, diags)
 	if diags.HasError() {
 		return nil
@@ -112,15 +116,15 @@ func NewLabelsObjType(ctx context.Context, input *[]admin.ComponentLabel, diags
 	return setType
 }
 
-func NewReplicationSpecsObjType(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo) types.List {
+func NewReplicationSpecsObjType(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo, apiInfo ExtraAPIInfo) types.List {
 	if input == nil {
 		return types.ListNull(ReplicationSpecsObjType)
 	}
 	var tfModels *[]TFReplicationSpecsModel
 	if legacyInfo == nil {
-		tfModels = convertReplicationSpecs(ctx, input, diags)
+		tfModels = convertReplicationSpecs(ctx, input, diags, apiInfo)
 	} else {
-		tfModels = convertReplicationSpecsLegacy(ctx, input, diags, legacyInfo)
+		tfModels = convertReplicationSpecsLegacy(ctx, input, diags, legacyInfo, apiInfo)
 	}
 	if diags.HasError() {
 		return types.ListNull(ReplicationSpecsObjType)
@@ -130,15 +134,15 @@ func NewReplicationSpecsObjType(ctx context.Context, input *[]admin.ReplicationS
 	return listType
 }
 
-func convertReplicationSpecs(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics) *[]TFReplicationSpecsModel {
+func convertReplicationSpecs(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics, apiInfo ExtraAPIInfo) *[]TFReplicationSpecsModel {
 	tfModels := make([]TFReplicationSpecsModel, len(*input))
 	for i, item := range *input {
 		regionConfigs := NewRegionConfigsObjType(ctx, item.RegionConfigs, diags)
 		tfModels[i] = TFReplicationSpecsModel{
 			Id:            types.StringPointerValue(item.Id),
 			ExternalId:    types.StringPointerValue(item.Id),
-			NumShards:     types.Int64Value(1),                         // TODO: Static
-			ContainerId:   conversion.ToTFMapOfString(ctx, diags, nil), // TODO: Static
+			NumShards:     types.Int64Value(1), // TODO: Static
+			ContainerId:   conversion.ToTFMapOfString(ctx, diags, &apiInfo.ContainerIDs),
 			RegionConfigs: regionConfigs,
 			ZoneId:        types.StringPointerValue(item.ZoneId),
 			ZoneName:      types.StringPointerValue(item.ZoneName),
@@ -147,7 +151,7 @@ func convertReplicationSpecs(ctx context.Context, input *[]admin.ReplicationSpec
 	return &tfModels
 }
 
-func convertReplicationSpecsLegacy(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo) *[]TFReplicationSpecsModel {
+func convertReplicationSpecsLegacy(ctx context.Context, input *[]admin.ReplicationSpec20240805, diags *diag.Diagnostics, legacyInfo *LegacySchemaInfo, apiInfo ExtraAPIInfo) *[]TFReplicationSpecsModel {
 	tfModels := []TFReplicationSpecsModel{}
 	tfModelsSkipIndexes := []int{}
 	for i, item := range *input {
@@ -179,7 +183,7 @@ func convertReplicationSpecsLegacy(ctx context.Context, input *[]admin.Replicati
 			}
 		}
 		tfModels = append(tfModels, TFReplicationSpecsModel{
-			ContainerId:   conversion.ToTFMapOfString(ctx, diags, nil), // TODO: Static
+			ContainerId:   conversion.ToTFMapOfString(ctx, diags, &apiInfo.ContainerIDs),
 			ExternalId:    types.StringPointerValue(item.Id),
 			Id:            types.StringValue(legacyID),
 			RegionConfigs: regionConfigs,

diff --git a/internal/service/advancedclustertpf/model_to_ClusterDescription20240805.go b/internal/service/advancedclustertpf/model_to_ClusterDescription20240805.go
@@ -11,6 +11,8 @@ import (
 	"go.mongodb.org/atlas-sdk/v20241113001/admin"
 )
 
+const defaultZoneName = "ZoneName managed by Terraform"
+
 func NewAtlasReq(ctx context.Context, input *TFModel, diags *diag.Diagnostics) *admin.ClusterDescription20240805 {
 	acceptDataRisksAndForceReplicaSetReconfig, ok := conversion.StringPtrToTimePtr(input.AcceptDataRisksAndForceReplicaSetReconfig.ValueStringPointer())
 	if !ok {
@@ -93,11 +95,20 @@ func newReplicationSpec20240805(ctx context.Context, input types.List, diags *di
 			Id:            conversion.NilForUnknown(item.Id, item.Id.ValueStringPointer()),
 			ZoneId:        conversion.NilForUnknown(item.ZoneId, item.ZoneId.ValueStringPointer()),
 			RegionConfigs: newCloudRegionConfig20240805(ctx, item.RegionConfigs, diags),
-			ZoneName:      item.ZoneName.ValueStringPointer(),
+			ZoneName:      conversion.StringPtr(resolveZoneNameOrUseDefault(item)),
 		}
 	}
 	return &resp
 }
+
+func resolveZoneNameOrUseDefault(item *TFReplicationSpecsModel) string {
+	zoneName := conversion.NilForUnknown(item.ZoneName, item.ZoneName.ValueStringPointer())
+	if zoneName == nil {
+		return defaultZoneName
+	}
+	return *zoneName
+}
+
 func newResourceTag(ctx context.Context, input types.Set, diags *diag.Diagnostics) *[]admin.ResourceTag {
 	if input.IsUnknown() || input.IsNull() {
 		return nil

diff --git a/internal/service/advancedclustertpf/move_state.go b/internal/service/advancedclustertpf/move_state.go
@@ -73,7 +73,7 @@ func setMoveStateResponse(ctx context.Context, projectID, clusterName string, re
 	model := NewTFModel(ctx, &admin.ClusterDescription20240805{
 		GroupId: conversion.StringPtr(projectID),
 		Name:    conversion.StringPtr(clusterName),
-	}, validTimeout, &resp.Diagnostics, nil)
+	}, validTimeout, &resp.Diagnostics, nil, ExtraAPIInfo{})
 	if resp.Diagnostics.HasError() {
 		return
 	}

diff --git a/internal/service/advancedclustertpf/resource.go b/internal/service/advancedclustertpf/resource.go
@@ -101,7 +101,24 @@ func (r *rs) Update(ctx context.Context, req resource.UpdateRequest, resp *resou
 	if diags.HasError() {
 		return
 	}
-	cluster := r.applyClusterChanges(ctx, diags, &state, &plan)
+	stateReq := normalizeFromTFModel(ctx, &state, diags, false)
+	planReq := normalizeFromTFModel(ctx, &plan, diags, false)
+	if diags.HasError() {
+		return
+	}
+	normalizePatchState(stateReq)
+	patchReq, err := update.PatchPayload(stateReq, planReq)
+	if err != nil {
+		diags.AddError("errorPatchPayload", err.Error())
+		return
+	}
+	upgradeRequest := getTenantUpgradeRequest(stateReq, patchReq)
+	var cluster *admin.ClusterDescription20240805
+	if upgradeRequest != nil {
+		cluster = r.applyTenantUpgrade(ctx, &plan, upgradeRequest, diags)
+	} else {
+		cluster = r.applyClusterChanges(ctx, diags, &state, &plan, patchReq)
+	}
 	if diags.HasError() {
 		return
 	}
@@ -233,18 +250,7 @@ func (r *rs) applyAdvancedConfigurationChanges(ctx context.Context, diags *diag.
 	return legacyAdvConfig, advConfig
 }
 
-func (r *rs) applyClusterChanges(ctx context.Context, diags *diag.Diagnostics, state, plan *TFModel) *admin.ClusterDescription20240805 {
-	stateReq := normalizeFromTFModel(ctx, state, diags, false)
-	planReq := normalizeFromTFModel(ctx, plan, diags, false)
-	if diags.HasError() {
-		return nil
-	}
-	normalizePatchState(stateReq)
-	patchReq, err := update.PatchPayload(stateReq, planReq)
-	if err != nil {
-		diags.AddError("errorPatchPayload", err.Error())
-		return nil
-	}
+func (r *rs) applyClusterChanges(ctx context.Context, diags *diag.Diagnostics, state, plan *TFModel, patchReq *admin.ClusterDescription20240805) *admin.ClusterDescription20240805 {
 	var cluster *admin.ClusterDescription20240805
 	if usingLegacySchema(ctx, plan.ReplicationSpecs, diags) {
 		// Only updates of replication specs will be done with legacy API
@@ -344,6 +350,19 @@ func (r *rs) updateAndWaitLegacy(ctx context.Context, patchReq *admin20240805.Cl
 	return AwaitChanges(ctx, r.Client.AtlasV2.ClustersApi, &tfModel.Timeouts, diags, projectID, clusterName, changeReasonUpdate)
 }
 
+func (r *rs) applyTenantUpgrade(ctx context.Context, plan *TFModel, upgradeRequest *admin.LegacyAtlasTenantClusterUpgradeRequest, diags *diag.Diagnostics) *admin.ClusterDescription20240805 {
+	api := r.Client.AtlasV2.ClustersApi
+	projectID := plan.ProjectID.ValueString()
+	clusterName := plan.Name.ValueString()
+	upgradeRequest.Name = clusterName
+	_, _, err := api.UpgradeSharedCluster(ctx, projectID, upgradeRequest).Execute()
+	if err != nil {
+		diags.AddError("errorTenantUpgrade", fmt.Sprintf(errorUpdate, clusterName, err.Error()))
+		return nil
+	}
+	return AwaitChanges(ctx, api, &plan.Timeouts, diags, projectID, clusterName, changeReasonUpdate)
+}
+
 func (r *rs) convertClusterAddAdvConfig(ctx context.Context, legacyAdvConfig *admin20240530.ClusterDescriptionProcessArgs, advConfig *admin.ClusterDescriptionProcessArgs20240805, cluster *admin.ClusterDescription20240805, modelIn *TFModel, diags *diag.Diagnostics) *TFModel {
 	api := r.Client.AtlasV2.ClustersApi
 	api20240530 := r.Client.AtlasV220240530.ClustersApi
@@ -365,7 +384,12 @@ func (r *rs) convertClusterAddAdvConfig(ctx context.Context, legacyAdvConfig *ad
 		}
 	}
 	legacyInfo := resolveLegacyInfo(ctx, modelIn, diags, cluster, api20240530)
-	modelOut := NewTFModel(ctx, cluster, modelIn.Timeouts, diags, legacyInfo)
+	apiInfo, err := resolveExtraAPIInfo(ctx, projectID, cluster, r.Client.AtlasV2.NetworkPeeringApi)
+	if err != nil {
+		diags.AddError("errorExtraApiInfo", err.Error())
+		return nil
+	}
+	modelOut := NewTFModel(ctx, cluster, modelIn.Timeouts, diags, legacyInfo, *apiInfo)
 	if diags.HasError() {
 		return nil
 	}

diff --git a/internal/service/advancedclustertpf/resource_compatibility_reuse.go b/internal/service/advancedclustertpf/resource_compatibility_reuse.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
 	"github.com/spf13/cast"
 	admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"
 	"go.mongodb.org/atlas-sdk/v20241113001/admin"
@@ -17,6 +18,52 @@ func FormatMongoDBMajorVersion(version string) string {
 	return fmt.Sprintf("%.1f", cast.ToFloat32(version))
 }
 
+// based on flattenAdvancedReplicationSpecRegionConfigs in model_advanced_cluster.go
+func resolveExtraAPIInfo(ctx context.Context, projectID string, cluster *admin.ClusterDescription20240805, api admin.NetworkPeeringApi) (*ExtraAPIInfo, error) {
+	containerIDs := map[string]string{}
+	for _, spec := range cluster.GetReplicationSpecs() {
+		for _, regionConfig := range spec.GetRegionConfigs() {
+			providerName := regionConfig.GetProviderName()
+			if providerName == constant.TENANT {
+				continue
+			}
+			params := &admin.ListPeeringContainerByCloudProviderApiParams{
+				GroupId:      projectID,
+				ProviderName: &providerName,
+			}
+			containerIDKey := fmt.Sprintf("%s:%s", providerName, regionConfig.GetRegionName())
+			if _, ok := containerIDs[containerIDKey]; ok {
+				continue
+			}
+			containers, _, err := api.ListPeeringContainerByCloudProviderWithParams(ctx, params).Execute()
+			if err != nil {
+				return nil, err
+			}
+			if results := getAdvancedClusterContainerID(containers.GetResults(), &regionConfig); results != "" {
+				containerIDs[containerIDKey] = results
+			} else {
+				return nil, fmt.Errorf("container id not found for %s", containerIDKey)
+			}
+		}
+	}
+	return &ExtraAPIInfo{
+		ContainerIDs: containerIDs,
+	}, nil
+}
+
+// copied from model_advanced_cluster.go
+func getAdvancedClusterContainerID(containers []admin.CloudProviderContainer, cluster *admin.CloudRegionConfig20240805) string {
+	for i, container := range containers {
+		gpc := cluster.GetProviderName() == constant.GCP
+		azure := container.GetProviderName() == cluster.GetProviderName() && container.GetRegion() == cluster.GetRegionName()
+		aws := container.GetRegionName() == cluster.GetRegionName()
+		if gpc || azure || aws {
+			return containers[i].GetId()
+		}
+	}
+	return ""
+}
+
 func getReplicationSpecIDsFromOldAPI(ctx context.Context, projectID, clusterName string, api admin20240530.ClustersApi) (map[string]string, error) {
 	clusterOldAPI, _, err := api.GetCluster(ctx, projectID, clusterName).Execute()
 	if err != nil {

diff --git a/internal/service/advancedclustertpf/resource_compatiblity.go b/internal/service/advancedclustertpf/resource_compatiblity.go
@@ -161,7 +161,8 @@ func numShardsMap(ctx context.Context, input types.List, diags *diag.Diagnostics
 	counts := map[string]int64{}
 	for i := range elements {
 		e := elements[i]
-		counts[e.ZoneName.ValueString()] = e.NumShards.ValueInt64()
+		zoneName := resolveZoneNameOrUseDefault(&e)
+		counts[zoneName] = e.NumShards.ValueInt64()
 	}
 	return counts
 }

diff --git a/internal/service/advancedclustertpf/resource_schema.go b/internal/service/advancedclustertpf/resource_schema.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/setdefault"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/schemafunc"
@@ -128,10 +127,7 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 				},
 			},
 			"create_date": schema.StringAttribute{
-				Computed: true,
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.UseStateForUnknown(),
-				},
+				Computed:            true,
 				MarkdownDescription: "Date and time when MongoDB Cloud created this cluster. This parameter expresses its value in ISO 8601 format in UTC.",
 			},
 			"encryption_at_rest_provider": schema.StringAttribute{
@@ -149,10 +145,7 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 				MarkdownDescription: "Unique 24-hexadecimal digit string that identifies your project. Use the [/groups](#tag/Projects/operation/listProjects) endpoint to retrieve all projects to which the authenticated user has access.\n\n**NOTE**: Groups and projects are synonymous terms. Your group id is the same as your project id. For existing groups, your group/project id remains the same. The resource and corresponding endpoints use the term groups.",
 			},
 			"cluster_id": schema.StringAttribute{ // TODO: was generated as id
-				Computed: true,
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.UseStateForUnknown(),
-				},
+				Computed:            true,
 				MarkdownDescription: "Unique 24-hexadecimal digit string that identifies the cluster.",
 			},
 			"labels": schema.SetNestedAttribute{
@@ -276,9 +269,8 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 							MarkdownDescription: "Unique 24-hexadecimal digit string that identifies the zone in a Global Cluster. This value can be used to configure Global Cluster backup policies.",
 						},
 						"zone_name": schema.StringAttribute{
-							Computed:            true, // must be computed to have a Default
+							Computed:            true,
 							Optional:            true,
-							Default:             stringdefault.StaticString("ZoneName managed by Terraform"), // TODO: as in current resource
 							MarkdownDescription: "Human-readable label that describes the zone this shard belongs to in a Global Cluster. Provide this value only if \"clusterType\" : \"GEOSHARDED\" but not \"selfManagedSharding\" : true.",
 						},
 					},