Skip to content

Commit

Permalink
review(mongodb): Refactoring function and comment
Browse files Browse the repository at this point in the history
  • Loading branch information
youngmn committed Apr 3, 2024
1 parent 734b5e5 commit 661fe62
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 21 deletions.
20 changes: 17 additions & 3 deletions internal/common/convert_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"reflect"
"strings"

"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/terraform-providers/terraform-provider-ncloud/internal/conn"
Expand Down Expand Up @@ -237,18 +238,31 @@ func ExpandStringList(configured []interface{}) []*string {
return vs
}

// value is nil. set null.
// Int64ValueFromInt32 converts an int32 pointer to a Framework Int64 value.
// A nil int32 pointer is converted to a null Int64.
func Int64ValueFromInt32(value *int32) basetypes.Int64Value {
if value == nil {
return basetypes.NewInt64Null()
}
return basetypes.NewInt64Value(int64(*value))
}

// value is nil. set 0.
func Int64ZeroFromInt32(value *int32) basetypes.Int64Value {
// Int64FromInt32OrDefault converts an int32 pointer to a Framework Int64 value.
// A nil int32 pointer is converted to a zero Int64.
// Used when the optional and computed attribute have no response value
func Int64FromInt32OrDefault(value *int32) basetypes.Int64Value {
if value == nil {
return basetypes.NewInt64Value(0)
}
return basetypes.NewInt64Value(int64(*value))
}

// StringFrameworkOrDefault converts a Framework StringValue struct to a same Framework StringValue.
// A null or unknown state is converted to a default(not aloocated) string.
// Used when the optional and computed attribute have no response value
func StringFrameworkOrDefault(value types.String) basetypes.StringValue {
if value.IsNull() || value.IsUnknown() {
return types.StringValue("not allocated")
}
return value
}
26 changes: 8 additions & 18 deletions internal/service/mongodb/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,6 @@ func (m *mongodbResource) Read(ctx context.Context, req resource.ReadRequest, re
func (m *mongodbResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
var plan, state mongodbResourceModel

// plan is NEW, state is OLD
resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
resp.Diagnostics.Append(req.State.Get(ctx, &state)...)

Expand Down Expand Up @@ -1009,10 +1008,10 @@ func (m *mongodbResourceModel) refreshFromOutput(ctx context.Context, output *vm
m.ShardCount = common.Int64ValueFromInt32(output.ShardCount)
m.BackupFileRetentionPeriod = common.Int64ValueFromInt32(output.BackupFileRetentionPeriod)
m.BackupTime = types.StringPointerValue(output.BackupTime)
m.ArbiterPort = common.Int64ZeroFromInt32(output.ArbiterPort)
m.MemberPort = common.Int64ZeroFromInt32(output.MemberPort)
m.MongosPort = common.Int64ZeroFromInt32(output.MongosPort)
m.ConfigPort = common.Int64ZeroFromInt32(output.ConfigPort)
m.ArbiterPort = common.Int64FromInt32OrDefault(output.ArbiterPort)
m.MemberPort = common.Int64FromInt32OrDefault(output.MemberPort)
m.MongosPort = common.Int64FromInt32OrDefault(output.MongosPort)
m.ConfigPort = common.Int64FromInt32OrDefault(output.ConfigPort)
m.EngineVersion = types.StringPointerValue(output.EngineVersion)
m.RegionCode = types.StringPointerValue(output.CloudMongoDbServerInstanceList[0].RegionCode)
m.ZoneCode = types.StringPointerValue(output.CloudMongoDbServerInstanceList[0].ZoneCode)
Expand All @@ -1027,10 +1026,7 @@ func (m *mongodbResourceModel) refreshFromOutput(ctx context.Context, output *vm
acgList, _ := types.ListValueFrom(ctx, types.StringType, output.AccessControlGroupNoList)
m.AccessControlGroupNoList = acgList

var memberCount int64
var arbiterCount int64
var mongosCount int64
var configCount int64
var memberCount, arbiterCount, mongosCount, configCount int64
var serverList []mongoServer
for _, server := range output.CloudMongoDbServerInstanceList {
mongoServerInstance := mongoServer{
Expand Down Expand Up @@ -1082,15 +1078,9 @@ func (m *mongodbResourceModel) refreshFromOutput(ctx context.Context, output *vm
m.ArbiterServerCount = types.Int64Value(arbiterCount)
m.MongosServerCount = types.Int64Value(mongosCount)
m.ConfigServerCount = types.Int64Value(configCount)
if arbiterCount == 0 {
m.ArbiterProductCode = types.StringValue("not allocated")
}
if mongosCount == 0 {
m.MongosProductCode = types.StringValue("not allocated")
}
if configCount == 0 {
m.ConfigProductCode = types.StringValue("not allocated")
}
m.ArbiterProductCode = common.StringFrameworkOrDefault(m.ArbiterProductCode)
m.MongosProductCode = common.StringFrameworkOrDefault(m.MongosProductCode)
m.ConfigProductCode = common.StringFrameworkOrDefault(m.ConfigProductCode)

mongoServers, _ := types.ListValueFrom(ctx, types.ObjectType{AttrTypes: mongoServer{}.attrTypes()}, serverList)

Expand Down

0 comments on commit 661fe62

Please sign in to comment.