Skip to content

[fit to project tag] #512

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.

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

Merged
merged 3 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ FEATURES:
* **New Resource**: `tencentcloud_ckafka_topic`
* **New Data Source**: `tencentcloud_ckafka_topics`

ENHANCEMENTS:

* Resource: `tencentcloud_mongodb_instance`, `tencentcloud_mongodb_sharding_instance` and `tencentcloud_mongodb_standby_instance` remove system reserved tag `project`.

## 1.41.3 (September 3, 2020)

ENHANCEMENTS:
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/extension_mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func TencentMongodbBasicInfo() map[string]*schema.Schema {
"tags": {
Type: schema.TypeMap,
Optional: true,
Description: "The tags of the Mongodb.",
Description: "The tags of the Mongodb. Value `project` is system reserved and can't be used.",
},
// payment
"charge_type": {
Expand Down
3 changes: 3 additions & 0 deletions tencentcloud/resource_tc_mongodb_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,9 @@ func resourceTencentCloudMongodbInstanceRead(d *schema.ResourceData, meta interf
if tag.TagValue == nil {
return errors.New("mongodb tag value is nil")
}
if *tag.TagKey == "project" {
continue
}

tags[*tag.TagKey] = *tag.TagValue
}
Expand Down
3 changes: 3 additions & 0 deletions tencentcloud/resource_tc_mongodb_sharding_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@ func resourceMongodbShardingInstanceRead(d *schema.ResourceData, meta interface{
if tag.TagValue == nil {
return errors.New("mongodb tag value is nil")
}
if *tag.TagKey == "project" {
continue
}

tags[*tag.TagKey] = *tag.TagValue
}
Expand Down
3 changes: 3 additions & 0 deletions tencentcloud/resource_tc_mongodb_standby_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@ func resourceTencentCloudMongodbStandbyInstanceRead(d *schema.ResourceData, meta
if tag.TagValue == nil {
return errors.New("mongodb tag value is nil")
}
if *tag.TagKey == "project" {
continue
}

tags[*tag.TagKey] = *tag.TagValue
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/mongodb_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following arguments are supported:
* `project_id` - (Optional) ID of the project which the instance belongs.
* `security_groups` - (Optional, ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.
* `subnet_id` - (Optional, ForceNew) ID of the subnet within this VPC. The value is required if `vpc_id` is set.
* `tags` - (Optional) The tags of the Mongodb.
* `tags` - (Optional) The tags of the Mongodb. Value `project` is system reserved and can't be used.
* `vpc_id` - (Optional, ForceNew) ID of the VPC.

## Attributes Reference
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/mongodb_sharding_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The following arguments are supported:
* `project_id` - (Optional) ID of the project which the instance belongs.
* `security_groups` - (Optional, ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.
* `subnet_id` - (Optional, ForceNew) ID of the subnet within this VPC. The value is required if `vpc_id` is set.
* `tags` - (Optional) The tags of the Mongodb.
* `tags` - (Optional) The tags of the Mongodb. Value `project` is system reserved and can't be used.
* `vpc_id` - (Optional, ForceNew) ID of the VPC.

## Attributes Reference
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/mongodb_standby_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ The following arguments are supported:
* `project_id` - (Optional) ID of the project which the instance belongs.
* `security_groups` - (Optional, ForceNew) ID of the security group. NOTE: for instance which `engine_version` is `MONGO_40_WT`, `security_groups` is not supported.
* `subnet_id` - (Optional, ForceNew) ID of the subnet within this VPC. The value is required if `vpc_id` is set.
* `tags` - (Optional) The tags of the Mongodb.
* `tags` - (Optional) The tags of the Mongodb. Value `project` is system reserved and can't be used.
* `vpc_id` - (Optional, ForceNew) ID of the VPC.

## Attributes Reference
Expand Down