Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix_Account_Modification' into f…
Browse files Browse the repository at this point in the history
…ix_Account_Modification

# Conflicts:
#	alicloud/resource_alicloud_db_instance.go
  • Loading branch information
chaitiansheng0524 committed Dec 31, 2024
2 parents f7aec23 + dc35b04 commit c8def7a
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions alicloud/resource_alicloud_db_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,11 @@ func resourceAliCloudDBInstance() *schema.Resource {
Optional: true,
Default: false,
},
"bursting_enabled": {

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / Compile

duplicate key "bursting_enabled" in map literal

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / runner / errcheck

[errcheck] reported by reviewdog 🐶 duplicate key "bursting_enabled" in map literal (typecheck) Raw Output: alicloud/resource_alicloud_db_instance.go:651:4: duplicate key "bursting_enabled" in map literal (typecheck) package alicloud

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / runner / errcheck

[errcheck] reported by reviewdog 🐶 duplicate key "bursting_enabled" in map literal) (typecheck) Raw Output: alicloud/resource_alicloud_db_instance.go:651:4: duplicate key "bursting_enabled" in map literal) (typecheck) "github.com/aliyun/terraform-provider-alicloud/alicloud" ^

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / Consistency

duplicate key "bursting_enabled" in map literal

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / TestingCoverageRate

duplicate key "bursting_enabled" in map literal

Check failure on line 651 in alicloud/resource_alicloud_db_instance.go

View workflow job for this annotation

GitHub Actions / Consistency

duplicate key "bursting_enabled" in map literal
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}
Expand Down Expand Up @@ -1830,6 +1835,7 @@ func resourceAliCloudDBInstanceRead(d *schema.ResourceData, meta interface{}) er
d.Set("status", instance["DBInstanceStatus"])
d.Set("create_time", instance["CreationTime"])
d.Set("bursting_enabled", instance["BurstingEnabled"])
d.Set("bursting_enabled", instance["BurstingEnabled"])
d.Set("pg_bouncer_enabled", instance["PGBouncerEnabled"])

// MySQL Serverless instance query PayType return SERVERLESS, need to be consistent with the participant.
Expand Down

0 comments on commit c8def7a

Please sign in to comment.