Skip to content

[WIP]fix(teo): [124818645] add new resource #3435

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions .changelog/3435.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
tencentcloud_teo_plan
```
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1196
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1198
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1153
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161
Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1182
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1198
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1196
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1191 h1:Zj8
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1191/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1196 h1:2pRWolqipwF5RBtpSKp9YAg9cIvIPnhFCkj5FFhv8V8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1196/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1198 h1:lIVEEZ1zvhmetBu+A00DTkqv5wWnv1TpiOTG7nHU3vU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1198/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
Expand Down Expand Up @@ -1115,6 +1117,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1129 h1:9zrLWq
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1129/go.mod h1:Upcwa9By8gGR8qNLEiAetIKGbe4LmZbtXw0muPWXYc8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1182 h1:usJ5oGRWXkOufePi9JRP+kz5s0lTKUazpLDJJzVaJrQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1182/go.mod h1:lR5rdTT9V5RO9c0hXlFqO0o/bHdxn+R1+JMnWILzne0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1198 h1:XFQb2+gH2OghSKwc+PlXLVOM8soqtGw6Hbu4HG5RlHs=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1198/go.mod h1:G2tzJ6atg+3Cti3pmcoOBMaoccgF4ZrZn1KGQDffkwk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038 h1:tmK0aSj8zJrTx7aubJR8DBvtySj1uO8UdFANUDFtbmo=
Expand Down
37 changes: 33 additions & 4 deletions tencentcloud/services/teo/resource_tc_teo_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func ResourceTencentCloudTeoPlan() *schema.Resource {
"period": {
Type: schema.TypeInt,
Optional: true,
Default: 1,
ValidateFunc: tccommon.ValidateAllowedIntValue([]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36}),
Description: "The subscription period of the prepaid package, in months, with possible values: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36. If not filled in, the default value 1 is used.",
},
Expand Down Expand Up @@ -73,7 +74,7 @@ func ResourceTencentCloudTeoPlan() *schema.Resource {
},

"pay_mode": {
Type: schema.TypeString,
Type: schema.TypeInt,
Computed: true,
Description: "Payment type, possible values: <li>0: post-payment; </li><li>1: pre-payment. </li>.",
},
Expand Down Expand Up @@ -175,7 +176,35 @@ func ResourceTencentCloudTeoPlanRead(d *schema.ResourceData, meta interface{}) e
}

if respData.PlanType != nil {
_ = d.Set("plan_type", respData.PlanType)
// need manual mapping
if *respData.PlanType == "plan-personal" {
_ = d.Set("plan_type", "personal")
} else if *respData.PlanType == "plan-basic" {
_ = d.Set("plan_type", "basic")
} else if *respData.PlanType == "plan-standard" {
_ = d.Set("plan_type", "standard")
} else if *respData.PlanType == "plan-enterprise-v2" {
_ = d.Set("plan_type", "enterprise")
} else {
_ = d.Set("plan_type", respData.PlanType)
}
}

if respData.AutoRenewal != nil {
tmpList := make([]map[string]interface{}, 0, 1)
dMap := make(map[string]interface{}, 0)
if *respData.AutoRenewal {
dMap["renew_flag"] = "on"
} else {
dMap["renew_flag"] = "off"
}

if v, ok := d.GetOkExists("prepaid_plan_param.0.period"); ok {
dMap["period"] = v.(int)
}

tmpList = append(tmpList, dMap)
_ = d.Set("prepaid_plan_param", tmpList)
}

if respData.PlanId != nil {
Expand Down Expand Up @@ -240,7 +269,7 @@ func ResourceTencentCloudTeoPlanUpdate(d *schema.ResourceData, meta interface{})

if d.HasChange("prepaid_plan_param.0.period") {
request := teov20220901.NewRenewPlanRequest()
if v, ok := d.GetOk("period"); ok {
if v, ok := d.GetOkExists("prepaid_plan_param.0.period"); ok {
request.Period = helper.IntInt64(v.(int))
}

Expand All @@ -263,7 +292,7 @@ func ResourceTencentCloudTeoPlanUpdate(d *schema.ResourceData, meta interface{})

if d.HasChange("prepaid_plan_param.0.renew_flag") {
request := teov20220901.NewModifyPlanRequest()
if v, ok := d.GetOk("renew_flag"); ok {
if v, ok := d.GetOk("prepaid_plan_param.0.renew_flag"); ok {
request.RenewFlag = &teov20220901.RenewFlag{
Switch: helper.String(v.(string)),
}
Expand Down
21 changes: 21 additions & 0 deletions tencentcloud/services/teo/resource_tc_teo_plan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Provides a resource to create a TEO plan

Example Usage

```hcl
resource "tencentcloud_teo_plan" "example" {
plan_type = "standard"
prepaid_plan_param {
period = 1
renew_flag = "on"
}
}
```

Import

TEO plan can be imported using the id, e.g.

```
terraform import tencentcloud_teo_plan.example edgeone-3dnkntfojm6o
```
65 changes: 65 additions & 0 deletions tencentcloud/services/teo/resource_tc_teo_plan_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package teo_test

import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"

tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
)

// go test -test.run TestAccTencentCloudTeoPlan_basic -v
func TestAccTencentCloudTeoPlan_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
tcacctest.AccPreCheck(t)
},
Providers: tcacctest.AccProviders,
Steps: []resource.TestStep{
{
Config: testAccTeoPlan,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_teo_plan.example", "id"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "plan_type", "basic"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "prepaid_plan_param.0.period", "1"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "prepaid_plan_param.0.renew_flag", "on"),
),
},
{
Config: testAccTeoPlanUpdate,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_teo_plan.example", "id"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "plan_type", "standard"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "prepaid_plan_param.0.period", "2"),
resource.TestCheckResourceAttr("tencentcloud_teo_plan.example", "prepaid_plan_param.0.renew_flag", "off"),
),
},
{
ResourceName: "tencentcloud_teo_plan.example",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

const testAccTeoPlan = `
resource "tencentcloud_teo_plan" "example" {
plan_type = "basic"
prepaid_plan_param {
period = 1
renew_flag = "on"
}
}
`

const testAccTeoPlanUpdate = `
resource "tencentcloud_teo_plan" "example" {
plan_type = "standard"
prepaid_plan_param {
period = 2
renew_flag = "off"
}
}
`

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading