resource/alicloud_db_instance: fix_add_ModifyDBInstanceConfig #7944
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
2 times, most recently
from
5e18672 to
2bd60d2
Compare
chaitiansheng0524
changed the title
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
2 times, most recently
from
23bbda7 to
95e2679
Compare
alicloud/diff_suppress_funcs.go
Outdated
| engine := d.Get("engine").(string) | ||
| encryptionKey := d.Get("encryption_key").(string) | ||
|
|
||
| // 检查 engine 不是 PostgreSQL、MySQL 或 SQLServer |
There was a problem hiding this comment.
无效的注释去掉；工具类函数需要增加单测覆盖
There was a problem hiding this comment.
无效注释已去掉，已放回资源类。
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
3 times, most recently
from
02110e7 to
f3ac1e2
Compare
chaitiansheng0524
changed the title
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
from
f3ac1e2 to
6bf98c6
Compare
MrWolong
reviewed
Dec 11, 2024
| @@ -1017,6 +1017,16 @@ func TestAccAliCloudRdsDBInstance_SQLServer(t *testing.T) { | |||
| }), | |||
| ), | |||
| }, | |||
| { | |||
There was a problem hiding this comment.
新增字段recovery_model和pg_bouncer_enabled，当前只覆盖了更新操作，没有在创建操作指定的单测，需要在别的单测里面指定覆盖一下。
| @@ -397,7 +397,20 @@ func resourceAliCloudDBInstance() *schema.Resource { | |||
| Type: schema.TypeString, | |||
| Optional: true, | |||
| DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { | |||
| return d.Get("engine").(string) != "PostgreSQL" && d.Get("engine").(string) != "MySQL" && d.Get("engine").(string) != "SQLServer" | |||
| engine := d.Get("engine").(string) | |||
| encryptionKey := d.Get("encryption_key").(string) | |||
There was a problem hiding this comment.
encryption_key 是非必填的，这里直接断言会不会异常？
There was a problem hiding this comment.
encryption_key参数是非必填的且在未启用加密时，查询实例接口并不会返回这个参数，但是经过本地测试，不会出现断言异常：
| @@ -1763,6 +1853,8 @@ func resourceAliCloudDBInstanceRead(d *schema.ResourceData, meta interface{}) er | |||
| } else if len(slaveZones) == 1 { | |||
| d.Set("zone_id_slave_a", slaveZones[0].(map[string]interface{})["ZoneId"]) | |||
| } | |||
| recoveryModel := instance["Extra"].(map[string]interface{})["RecoveryModel"] | |||
There was a problem hiding this comment.
接口上一定会返回这个结构吗，不返回的情况下这里的断言会直接抛出异常
| * `encryption_key` - (Optional, Available since 1.109.0) The key id of the KMS. Used for encrypting a disk if not null. Only for PostgreSQL, MySQL and SQLServer. | ||
| When the instance is PostgreSQL, this parameter can be used to enable, modify, and disable cloud disk encryption.Value range: | ||
| - ServiceKey: Enable disk encryption using the service-managed key (Default Service CMK) automatically generated by Alibaba Cloud RDS. | ||
| - <密钥>: Use a custom key to enable cloud disk encryption or change the current key. For example: 494c98ce-f2b5-48ab-96ab-36c986b6****. |
There was a problem hiding this comment.
本意想代表此处可以填自定义密钥
已翻译成英文。
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
2 times, most recently
from
65a5204 to
0ef5412
Compare
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
3 times, most recently
from
878a2ef to
e20b5fb
Compare
MrWolong
reviewed
Dec 18, 2024
| @@ -3179,6 +3212,7 @@ func TestAccAliCloudRdsDBInstance_SQLServer_2019_ServerlessHA(t *testing.T) { | |||
| "serverless_config.#": "1", | |||
| "serverless_config.0.max_capacity": "8", | |||
| "serverless_config.0.min_capacity": "2", | |||
| "recovery_model": "simple", | |||
There was a problem hiding this comment.
单测不完善，既然现在encryption_key是可查的，那就应该在ImportStateVerifyIgnore中将encryption_key删掉，并在每个单测步骤中，只要Config涉及到encryption_key设置的，都应该在Check中CHECKSET的encryption_key值
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
from
e20b5fb to
8ccc958
Compare
chaitiansheng0524
force-pushed
the
fix_add_ModifyDBInstanceConfig
branch
from
8ccc958 to
41d48c0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.