Skip to content
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

resource/alicloud_gpdb_db_instance_plan: add new attribute scale_up, scale_down; resource/alicloud_gpdb_instance: add new attribute parameters. #7698

Merged
merged 1 commit into from
Sep 27, 2024
Merged

resource/alicloud_gpdb_db_instance_plan: add new attribute scale_up, scale_down; resource/alicloud_gpdb_instance: add new attribute parameters. #7698

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
223 changes: 221 additions & 2 deletions alicloud/resource_alicloud_gpdb_db_instance_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: StringInSlice([]string{"PauseResume", "Resize"}, false),
ValidateFunc: StringInSlice([]string{"PauseResume", "Resize", "ModifySpec"}, false),
},
"plan_schedule_type": {
Type: schema.TypeString,
Expand Down Expand Up @@ -69,7 +69,6 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
"plan_config": {
Type: schema.TypeList,
Required: true,
MaxItems: 1,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里现在可以配置多个了吗

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

确切来说，如果计划为postpone类型，属于一次性计划，那么pause，resume，scale_in，scale_out，scale_up，scale_down只能有1个

如果计划为regular类型，属于周期计划，那么pause/resume结对出现，scale_in/scale_out结对出现，scale_up/scale_down结对出现

Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"resume": {
Expand All @@ -87,6 +86,10 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand All @@ -105,6 +108,10 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand All @@ -127,6 +134,10 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand All @@ -149,6 +160,62 @@ func resourceAliCloudGpdbDbInstancePlan() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"scale_up": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"instance_spec": {
Type: schema.TypeString,
Optional: true,
},
"execute_time": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"plan_cron_time": {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"scale_down": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"instance_spec": {
Type: schema.TypeString,
Optional: true,
},
"execute_time": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"plan_cron_time": {
Type: schema.TypeString,
Optional: true,
},
"plan_task_status": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand Down Expand Up @@ -271,6 +338,48 @@ func resourceAliCloudGpdbDbInstancePlanCreate(d *schema.ResourceData, meta inter

planConfigMap["scaleOut"] = scaleOutMap
}

if scaleUp, ok := planConfigArg["scale_up"]; ok && len(scaleUp.([]interface{})) > 0 {
scaleUpMap := map[string]interface{}{}
for _, scaleUpList := range scaleUp.([]interface{}) {
scaleUpArg := scaleUpList.(map[string]interface{})

if instanceSpec, ok := scaleUpArg["instance_spec"]; ok {
scaleUpMap["instanceSpec"] = instanceSpec
}

if executeTime, ok := scaleUpArg["execute_time"]; ok {
scaleUpMap["executeTime"] = executeTime
}

if planCronTime, ok := scaleUpArg["plan_cron_time"]; ok {
scaleUpMap["planCronTime"] = planCronTime
}
}

planConfigMap["scaleUp"] = scaleUpMap
}

if scaleDown, ok := planConfigArg["scale_down"]; ok && len(scaleDown.([]interface{})) > 0 {
scaleDownMap := map[string]interface{}{}
for _, scaleDownList := range scaleDown.([]interface{}) {
scaleDownArg := scaleDownList.(map[string]interface{})

if instanceSpec, ok := scaleDownArg["instance_spec"]; ok {
scaleDownMap["instanceSpec"] = instanceSpec
}

if executeTime, ok := scaleDownArg["execute_time"]; ok {
scaleDownMap["executeTime"] = executeTime
}

if planCronTime, ok := scaleDownArg["plan_cron_time"]; ok {
scaleDownMap["planCronTime"] = planCronTime
}
}

planConfigMap["scaleDown"] = scaleDownMap
}
}

planConfigJson, err := convertMaptoJsonString(planConfigMap)
Expand Down Expand Up @@ -356,6 +465,10 @@ func resourceAliCloudGpdbDbInstancePlanRead(d *schema.ResourceData, meta interfa
resumeMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := resumeArg["planTaskStatus"]; ok {
resumeMap["plan_task_status"] = planTaskStatus
}

resumeMaps = append(resumeMaps, resumeMap)

planConfigMap["resume"] = resumeMaps
Expand All @@ -374,6 +487,10 @@ func resourceAliCloudGpdbDbInstancePlanRead(d *schema.ResourceData, meta interfa
pauseMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := pauseArg["planTaskStatus"]; ok {
pauseArg["plan_task_status"] = planTaskStatus
}

pauseMaps = append(pauseMaps, pauseMap)

planConfigMap["pause"] = pauseMaps
Expand All @@ -396,6 +513,10 @@ func resourceAliCloudGpdbDbInstancePlanRead(d *schema.ResourceData, meta interfa
scaleInMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := scaleInArg["planTaskStatus"]; ok {
scaleInArg["plan_task_status"] = planTaskStatus
}

scaleInMaps = append(scaleInMaps, scaleInMap)

planConfigMap["scale_in"] = scaleInMaps
Expand All @@ -418,11 +539,67 @@ func resourceAliCloudGpdbDbInstancePlanRead(d *schema.ResourceData, meta interfa
scaleOutMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := scaleOutArg["planTaskStatus"]; ok {
scaleOutArg["plan_task_status"] = planTaskStatus
}

scaleOutMaps = append(scaleOutMaps, scaleOutMap)

planConfigMap["scale_out"] = scaleOutMaps
}

if scaleUp, ok := planConfigArg["scaleUp"]; ok {
scaleUpMaps := make([]map[string]interface{}, 0)
scaleUpArg := scaleUp.(map[string]interface{})
scaleUpMap := map[string]interface{}{}

if instanceSpec, ok := scaleUpArg["instanceSpec"]; ok {
scaleUpMap["instance_spec"] = instanceSpec
}

if executeTime, ok := scaleUpArg["executeTime"]; ok {
scaleUpMap["execute_time"] = executeTime
}

if planCronTime, ok := scaleUpArg["planCronTime"]; ok {
scaleUpMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := scaleUpArg["planTaskStatus"]; ok {
scaleUpArg["plan_task_status"] = planTaskStatus
}

scaleUpMaps = append(scaleUpMaps, scaleUpMap)

planConfigMap["scale_up"] = scaleUpMaps
}

if scaleDown, ok := planConfigArg["scaleDown"]; ok {
scaleDownMaps := make([]map[string]interface{}, 0)
scaleDownArg := scaleDown.(map[string]interface{})
scaleDownMap := map[string]interface{}{}

if instanceSpec, ok := scaleDownArg["instanceSpec"]; ok {
scaleDownMap["instance_spec"] = instanceSpec
}

if executeTime, ok := scaleDownArg["executeTime"]; ok {
scaleDownMap["execute_time"] = executeTime
}

if planCronTime, ok := scaleDownArg["planCronTime"]; ok {
scaleDownMap["plan_cron_time"] = planCronTime
}

if planTaskStatus, ok := scaleDownArg["planTaskStatus"]; ok {
scaleDownArg["plan_task_status"] = planTaskStatus
}

scaleDownMaps = append(scaleDownMaps, scaleDownMap)

planConfigMap["scale_down"] = scaleDownMaps
}

planConfigMaps = append(planConfigMaps, planConfigMap)

d.Set("plan_config", planConfigMaps)
Expand Down Expand Up @@ -557,6 +734,48 @@ func resourceAliCloudGpdbDbInstancePlanUpdate(d *schema.ResourceData, meta inter

planConfigMap["scaleOut"] = scaleOutMap
}

if scaleUp, ok := planConfigArg["scale_up"]; ok && len(scaleUp.([]interface{})) > 0 {
scaleUpMap := map[string]interface{}{}
for _, scaleUpList := range scaleUp.([]interface{}) {
scaleUpArg := scaleUpList.(map[string]interface{})

if instanceSpec, ok := scaleUpArg["instance_spec"]; ok {
scaleUpMap["instanceSpec"] = instanceSpec
}

if executeTime, ok := scaleUpArg["execute_time"]; ok {
scaleUpMap["executeTime"] = executeTime
}

if planCronTime, ok := scaleUpArg["plan_cron_time"]; ok {
scaleUpMap["planCronTime"] = planCronTime
}
}

planConfigMap["scaleUp"] = scaleUpMap
}

if scaleDown, ok := planConfigArg["scale_down"]; ok && len(scaleDown.([]interface{})) > 0 {
scaleDownMap := map[string]interface{}{}
for _, scaleDownList := range scaleDown.([]interface{}) {
scaleDownArg := scaleDownList.(map[string]interface{})

if instanceSpec, ok := scaleDownArg["instance_spec"]; ok {
scaleDownMap["instanceSpec"] = instanceSpec
}

if executeTime, ok := scaleDownArg["execute_time"]; ok {
scaleDownMap["executeTime"] = executeTime
}

if planCronTime, ok := scaleDownArg["plan_cron_time"]; ok {
scaleDownMap["planCronTime"] = planCronTime
}
}

planConfigMap["scaleDown"] = scaleDownMap
}
}

planConfigJson, err := convertMaptoJsonString(planConfigMap)
Expand Down
Loading
Loading