Skip to content

Commit 0f05020

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
support lighthouse firewall template (#2076)
* support lighthouse firewall template * add changelog * update --------- Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 297937f commit 0f05020

34 files changed

+4298
-220
lines changed

‎.changelog/2076.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:new-resource
2+
tencentcloud_lighthouse_firewall_template
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_lighthouse_instance: support param `firewall_template_id`
7+
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.699
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.514
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563
62-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656
62+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.729
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.651

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563 h1:FoX+MK4
898898
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0=
899899
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656 h1:g//msFpwifqXoHuSIara75o2NWs4lRYHJ5qWQuBcYEs=
900900
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656/go.mod h1:hvE2a3GX09BXRMTIsk0w0vkAJ4QcagMq+pXCLnFmPNM=
901+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.729 h1:WQpzm3x27Jo/5uh6/Yqe/gbJ7r2ui9hc9ST7Ml2eP9Y=
902+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.729/go.mod h1:lLoyD7Z6OQQDFxDGGTe8wmirhUFZ36l5OaxzP75853Y=
901903
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535 h1:hSwG4ZbcP2Ht+AWHI81EMCvJdDTyTT7zP/qjOe/VcZg=
902904
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535/go.mod h1:mYKqy56uKaI0aPySeUByymvwDerPTmdMJQPQKC/NU1s=
903905
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672 h1:sR3MyM9RBw1PNRdWoBrtK+2M9Qbb0i6DfQSrvZ4/4os=

‎tencentcloud/basic_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,11 +1053,11 @@ variable "subnet_id" {
10531053
// End of CRS
10541054

10551055
const (
1056-
defaultLighthouseInstanceId = "lhins-hwe21u91"
1056+
defaultLighthouseInstanceId = "lhins-g4bwdjbf"
10571057
defaultLighthoustDiskId = "lhdisk-do4p4hz6"
10581058
defaultLighthouseBackupDiskId = "lhdisk-cwodsc4q"
10591059
defaultLighthouseBackUpId = "lhbak-bpum3ygx"
1060-
defaultLighthouseSnapshotId = "lhsnap-9jaw9m17"
1060+
defaultLighthouseSnapshotId = "lhsnap-o2mvsvk3"
10611061
)
10621062

10631063
const DefaultLighthoustVariables = `

‎tencentcloud/data_source_tc_lighthouse_disks_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func TestAccTencentCloudLighthouseDisksDataSource_basic(t *testing.T) {
2020
})
2121
}
2222

23-
const testAccLighthouseDisksDataSource = `
23+
const testAccLighthouseDisksDataSource = DefaultLighthoustVariables + `
2424
2525
data "tencentcloud_lighthouse_disks" "disks" {
26-
disk_ids = ["lhdisk-cwodsc4q"]
26+
disk_ids = [var.lighthouse_backup_disk_id]
2727
}
2828
`

‎tencentcloud/data_source_tc_lighthouse_instance_blueprint_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func TestAccTencentCloudLighthouseInstanceBlueprintDataSource_basic(t *testing.T
2020
})
2121
}
2222

23-
const testAccLighthouseInstanceBlueprintDataSource = `
23+
const testAccLighthouseInstanceBlueprintDataSource = DefaultLighthoustVariables + `
2424
2525
data "tencentcloud_lighthouse_instance_blueprint" "instance_blueprint" {
26-
instance_ids = ["lhins-hwe21u91"]
26+
instance_ids = [var.lighthouse_id]
2727
}
2828
`

‎tencentcloud/data_source_tc_lighthouse_instance_disk_num_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func TestAccTencentCloudLighthouseInstanceDiskNumDataSource_basic(t *testing.T)
2020
})
2121
}
2222

23-
const testAccLighthouseInstanceDiskNumDataSource = `
23+
const testAccLighthouseInstanceDiskNumDataSource = DefaultLighthoustVariables + `
2424
2525
data "tencentcloud_lighthouse_instance_disk_num" "instance_disk_num" {
26-
instance_ids = ["lhins-hwe21u91"]
26+
instance_ids = [var.lighthouse_id]
2727
}
2828
`

‎tencentcloud/data_source_tc_lighthouse_instance_vnc_url_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ func TestAccTencentCloudLighthouseInstanceVncUrlDataSource_basic(t *testing.T) {
1919
})
2020
}
2121

22-
const testAccLighthouseInstanceVncUrlDataSource = `
22+
const testAccLighthouseInstanceVncUrlDataSource = DefaultLighthoustVariables + `
2323
2424
data "tencentcloud_lighthouse_instance_vnc_url" "instance_vnc_url" {
25-
instance_id = "lhins-hwe21u91"
25+
instance_id = var.lighthouse_id
2626
}
2727
`

‎tencentcloud/data_source_tc_lighthouse_modify_instance_bundle_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ func TestAccTencentCloudLighthouseModifyInstanceBundleDataSource_basic(t *testin
2020
})
2121
}
2222

23-
const testAccLighthouseModifyInstanceBundleDataSource = `
23+
const testAccLighthouseModifyInstanceBundleDataSource = DefaultLighthoustVariables + `
2424
2525
data "tencentcloud_lighthouse_modify_instance_bundle" "modify_instance_bundle" {
26-
instance_id = "lhins-hwe21u91"
26+
instance_id = var.lighthouse_id
2727
filters {
2828
name = "bundle-id"
2929
values = ["bundle_gen_mc_med2_02"]

‎tencentcloud/data_source_tc_lighthouse_reset_instance_blueprint_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ func TestAccTencentCloudLighthouseResetInstanceBlueprintDataSource_basic(t *test
2020
})
2121
}
2222

23-
const testAccLighthouseResetInstanceBlueprintDataSource = `
23+
const testAccLighthouseResetInstanceBlueprintDataSource = DefaultLighthoustVariables + `
2424
2525
data "tencentcloud_lighthouse_reset_instance_blueprint" "reset_instance_blueprint" {
26-
instance_id = "lhins-hwe21u91"
26+
instance_id = var.lighthouse_id
2727
offset = 0
2828
limit = 20
2929
}

0 commit comments

Comments
 (0)