Skip to content

Commit 54b8f99

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
feat(emr): [119728750]support lite hbase (#2836)
* support lite hbase * add changelog && update test case * update --------- Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 0f2656f commit 54b8f99

21 files changed

+9048
-2329
lines changed

‎.changelog/2836.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
```release-note:new-resource
3+
tencentcloud_lite_hbase_instance
4+
```
5+
6+
```release-note:new-data-source
7+
tencentcloud_lite_hbase_instances
8+
```

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.984
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1004
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -59,7 +59,7 @@ require (
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760
62-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.811
62+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1004
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod
932932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001 h1:uX1xklZMQkTj/JAcn++AVwf5nf9ocrkionqz9diO2j8=
934934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1004 h1:ErJuCtb6/7GtunW3N3Ps2IJ9c8KK6zjcrZX/S1Oo8sU=
936+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1004/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
936938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
937939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
@@ -968,6 +970,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760 h1:IKP2LFgJ
968970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760/go.mod h1:pSQXTeuC6BahiUIfssVqvL1/BoXccLkyD7nJ+tKgygw=
969971
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.811 h1:/HojA6v+3M4qrAqd+UcYsud8OUVsEsjB1zDCjM+X+cs=
970972
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.811/go.mod h1:CRgsaEYMxEclRWGX/qPIsJzSanv1cNyhQTeqZc/2CKQ=
973+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1004 h1:PbKCgIXZSwX0eraNZGG+AqVjgLZwW/C+up/6mL9FP3o=
974+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1004/go.mod h1:6H1XZ2TIVV6VHdjkdQQl611NsIJkeTqugZ1jaUfPop4=
971975
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777 h1:G1eX/DkiznhSjNVF97BAQyycFXOiPHxeTxgOadp5J/o=
972976
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777/go.mod h1:ehbc9eaNknF/VU/kPTFLZbIUmkL06vQ/JYydu6yeXp4=
973977
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970 h1:Z82LbcEnE2m4CGvcOY024N7REhAN++xdEyE88HG2YBA=

‎tencentcloud/connectivity/client.go‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ type TencentCloudClient struct {
210210
controlcenterConn *controlcenter.Client
211211
thpcConn *thpc.Client
212212
//omit nil client
213-
omitNilConn *common.Client
213+
omitNilConn *common.Client
214+
emrv20190103Conn *emr.Client
214215
}
215216

216217
// NewClientProfile returns a new ClientProfile
@@ -1735,3 +1736,16 @@ func (me *TencentCloudClient) UseThpcV20230321Client() *thpc.Client {
17351736

17361737
return me.thpcConn
17371738
}
1739+
1740+
// UseEmrV20190103Client return EMR client for service
1741+
func (me *TencentCloudClient) UseEmrV20190103Client() *emr.Client {
1742+
if me.emrv20190103Conn != nil {
1743+
return me.emrv20190103Conn
1744+
}
1745+
cpf := me.NewClientProfile(300)
1746+
cpf.Language = "zh-CN"
1747+
me.emrv20190103Conn, _ = emr.NewClient(me.Credential, me.Region, cpf)
1748+
me.emrv20190103Conn.WithHttpTransport(&LogRoundTripper{})
1749+
1750+
return me.emrv20190103Conn
1751+
}

‎tencentcloud/provider.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ func Provider() *schema.Provider {
11081108
"tencentcloud_cdc_dedicated_cluster_instance_types": cdc.DataSourceTencentCloudCdcDedicatedClusterInstanceTypes(),
11091109
"tencentcloud_cdc_dedicated_cluster_orders": cdc.DataSourceTencentCloudCdcDedicatedClusterOrders(),
11101110
"tencentcloud_cdwdoris_instances": cdwdoris.DataSourceTencentCloudCdwdorisInstances(),
1111-
},
1111+
"tencentcloud_lite_hbase_instances": emr.DataSourceTencentCloudLiteHbaseInstances()},
11121112

11131113
ResourcesMap: map[string]*schema.Resource{
11141114
"tencentcloud_project": project.ResourceTencentCloudProject(),
@@ -2128,7 +2128,8 @@ func Provider() *schema.Provider {
21282128
//"tencentcloud_cdwdoris_user": cdwdoris.ResourceTencentCloudCdwdorisUser(),
21292129
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
21302130
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
2131-
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy()},
2131+
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy(),
2132+
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance()},
21322133

21332134
ConfigureFunc: providerConfigure,
21342135
}

‎tencentcloud/provider.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,10 +1301,12 @@ MapReduce(EMR)
13011301
tencentcloud_emr_auto_scale_records
13021302
tencentcloud_emr_nodes
13031303
tencentcloud_emr_cvm_quota
1304+
tencentcloud_lite_hbase_instances
13041305

13051306
Resource
13061307
tencentcloud_emr_cluster
13071308
tencentcloud_emr_user_manager
1309+
tencentcloud_lite_hbase_instance
13081310

13091311
DNSPOD
13101312
Resource

0 commit comments

Comments
 (0)