Skip to content

Commit 245b975

Browse files
sdk-liuzhaoliangsdk-liuzhaoliang
committed
Merge 'publish/v0.0.17' into 'main'
feat:v0.0.17 publish See merge request: !25
2 parents 749a351 + 179732a commit 245b975

65 files changed

Lines changed: 502 additions & 229 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PULUMI_MISSING_DOCS_ERROR := false
1717

1818
# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
1919
# Local & branch builds will just used this fixed default version unless specified
20-
PROVIDER_VERSION ?= 0.0.16
20+
PROVIDER_VERSION ?= 0.0.17
2121

2222
# Check version doesn't start with a "v" - this is a common mistake
2323
ifeq ($(shell echo $(PROVIDER_VERSION) | cut -c1),v)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ This package is available in many languages in the standard packaging formats.
1212

1313
To use from JavaScript or TypeScript in Node.js, install using either `npm`:
1414

15-
$ npm install @pulumi/pulumi-volcenginecc
15+
$ npm install @volcengine/pulumi-volcenginecc
1616

1717
or `yarn`:
1818

19-
$ yarn add @pulumi/pulumi-volcenginecc
19+
$ yarn add @volcengine/pulumi-volcenginecc
2020

2121
### Python
2222

‎provider/cmd/pulumi-resource-volcenginecc/schema.json‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5966,7 +5966,7 @@
59665966
},
59675967
"protocol": {
59685968
"type": "string",
5969-
"description": "监听器的协议。\n"
5969+
"description": "监听器的协议。包括 TCP、UDP、HTTP、HTTPS。\n"
59705970
}
59715971
},
59725972
"type": "object",
@@ -6006,10 +6006,12 @@
60066006
"volcenginecc:clb/CertificateTag:CertificateTag": {
60076007
"properties": {
60086008
"key": {
6009-
"type": "string"
6009+
"type": "string",
6010+
"description": "用户标签的标签键。\n"
60106011
},
60116012
"value": {
6012-
"type": "string"
6013+
"type": "string",
6014+
"description": "用户标签的标签值。\n"
60136015
}
60146016
},
60156017
"type": "object",
@@ -6794,7 +6796,7 @@
67946796
},
67956797
"protocol": {
67966798
"type": "string",
6797-
"description": "监听器的协议。\n"
6799+
"description": "监听器的协议。包括 TCP、UDP、HTTP、HTTPS。\n"
67986800
}
67996801
},
68006802
"type": "object",
@@ -6836,10 +6838,12 @@
68366838
"volcenginecc:clb/getCertificateTag:getCertificateTag": {
68376839
"properties": {
68386840
"key": {
6839-
"type": "string"
6841+
"type": "string",
6842+
"description": "用户标签的标签键。\n"
68406843
},
68416844
"value": {
6842-
"type": "string"
6845+
"type": "string",
6846+
"description": "用户标签的标签值。\n"
68436847
}
68446848
},
68456849
"type": "object",
@@ -8713,7 +8717,7 @@
87138717
},
87148718
"type": {
87158719
"type": "string",
8716-
"description": "自定义参数类型。\n"
8720+
"description": "自定义参数类型。取值：String：表示自定义参数类型为String（字符串）类型。Digit：表示自定义参数类型为Digit（数值）类型。\n"
87178721
}
87188722
},
87198723
"type": "object",
@@ -8736,10 +8740,12 @@
87368740
"volcenginecc:ecs/CommandTag:CommandTag": {
87378741
"properties": {
87388742
"key": {
8739-
"type": "string"
8743+
"type": "string",
8744+
"description": "用户标签的标签键。命名规则如下：不能以volc:或sys:的任意大小写组合开头。只能包含语言字符、数字、空格和英文符号“_”、“.”、“:”、“/”、“=”、“+”、“-”、“@”。长度限制在1～128个字符之间。\n"
87408745
},
87418746
"value": {
8742-
"type": "string"
8747+
"type": "string",
8748+
"description": "用户标签的标签值。命名规则如下：只能包含语言字符、数字、空格和英文符号“_”、“.”、“:”、“/”、“=”、“+”、“-”、“@”。允许为空，长度限制在0～256个字符之间。\n"
87438749
}
87448750
},
87458751
"type": "object",
@@ -9430,7 +9436,7 @@
94309436
},
94319437
"type": {
94329438
"type": "string",
9433-
"description": "自定义参数类型。\n"
9439+
"description": "自定义参数类型。取值：String：表示自定义参数类型为String（字符串）类型。Digit：表示自定义参数类型为Digit（数值）类型。\n"
94349440
}
94359441
},
94369442
"type": "object",
@@ -9454,10 +9460,12 @@
94549460
"volcenginecc:ecs/getCommandTag:getCommandTag": {
94559461
"properties": {
94569462
"key": {
9457-
"type": "string"
9463+
"type": "string",
9464+
"description": "用户标签的标签键。命名规则如下：不能以volc:或sys:的任意大小写组合开头。只能包含语言字符、数字、空格和英文符号“_”、“.”、“:”、“/”、“=”、“+”、“-”、“@”。长度限制在1～128个字符之间。\n"
94589465
},
94599466
"value": {
9460-
"type": "string"
9467+
"type": "string",
9468+
"description": "用户标签的标签值。命名规则如下：只能包含语言字符、数字、空格和英文符号“_”、“.”、“:”、“/”、“=”、“+”、“-”、“@”。允许为空，长度限制在0～256个字符之间。\n"
94619469
}
94629470
},
94639471
"type": "object",
@@ -15455,10 +15463,6 @@
1545515463
"type": "string",
1545615464
"description": "授予的账号权限类型，取值：ReadWrite：读写权限。ReadOnly：只读权限。DDLOnly：仅 DDL 权限。DMLOnly：仅 DML 权限。Custom：自定义权限。\n"
1545715465
},
15458-
"accountPrivilegeDetail": {
15459-
"type": "string",
15460-
"description": "数据库权限字符串。作为请求参数时，当 AccountPrivilege 取值为 Custom 时必填，取值：SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,REFERENCES,INDEX,ALTER,CREATE TEMPORARY TABLES,LOCK TABLES,EXECUTE,CREATE VIEW,SHOW VIEW,CREATE ROUTINE,ALTER ROUTINE,EVENT,TRIGGER,作为返回结果时，不管 AccountPrivilege 的值是否为 Custom，都会展示 AccountPrivilege 的详细权限。\n"
15461-
},
1546215466
"host": {
1546315467
"type": "string",
1546415468
"description": "指定的数据库账号可以访问数据库的 IP 地址。默认值为 %。若指定 Host 为 %，允许该账号从任意 IP 地址访问数据库。若指定 Host 为 192.10.10.%，则表示该账号可从 192.10.10.0~192.10.10.255 之间的 IP 地址访问数据库。指定的 Host 需要添加在实例所绑定的白名单中，\n"
@@ -15470,7 +15474,6 @@
1547015474
"requiredOutputs": [
1547115475
"accountName",
1547215476
"accountPrivilege",
15473-
"accountPrivilegeDetail",
1547415477
"host"
1547515478
]
1547615479
}
@@ -41339,7 +41342,8 @@
4133941342
"description": "数据库名称。命名规则如下：名称唯一。长度为 2~64 个字符。以字母开头，以字母或数字结尾。由字母、数字、下划线（_）或中划线（-）组成。不能使用某些预留字，包括 root、admin 等。\n"
4134041343
},
4134141344
"status": {
41342-
"type": "string"
41345+
"type": "string",
41346+
"description": "数据库状态。取值为：Unavailable：不可用。Available：可用。\n"
4134341347
}
4134441348
},
4134541349
"required": [
@@ -41404,7 +41408,8 @@
4140441408
"description": "数据库名称。命名规则如下：名称唯一。长度为 2~64 个字符。以字母开头，以字母或数字结尾。由字母、数字、下划线（_）或中划线（-）组成。不能使用某些预留字，包括 root、admin 等。\n"
4140541409
},
4140641410
"status": {
41407-
"type": "string"
41411+
"type": "string",
41412+
"description": "数据库状态。取值为：Unavailable：不可用。Available：可用。\n"
4140841413
}
4140941414
},
4141041415
"type": "object"
@@ -61137,6 +61142,7 @@
6113761142
"type": "string"
6113861143
},
6113961144
"status": {
61145+
"description": "数据库状态。取值为：Unavailable：不可用。Available：可用。\n",
6114061146
"type": "string"
6114161147
}
6114261148
},

‎provider/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ require (
158158
github.com/ulikunitz/xz v0.5.11 // indirect
159159
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
160160
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
161-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24 // indirect
161+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25 // indirect
162162
github.com/volcengine/volc-sdk-golang v1.0.23 // indirect
163163
github.com/volcengine/volcengine-go-sdk v1.1.18 // indirect
164164
github.com/xanzy/ssh-agent v0.3.3 // indirect

‎provider/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
834834
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
835835
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
836836
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
837-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24 h1:Q8gtHIYllmTGYb2oypXPPmiroMTNiND1q3sGMfRXbyU=
838-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24/go.mod h1:MiFbOqABmGHSDJnYfTyO03lCBqdozmL+paqUCrKHN9c=
837+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25 h1:x8/1OTaOOSq00Madbo1qEXx2FIYXGLcypOlbdzd7Q2U=
838+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25/go.mod h1:MiFbOqABmGHSDJnYfTyO03lCBqdozmL+paqUCrKHN9c=
839839
github.com/volcengine/volc-sdk-golang v1.0.23 h1:anOslb2Qp6ywnsbyq9jqR0ljuO63kg9PY+4OehIk5R8=
840840
github.com/volcengine/volc-sdk-golang v1.0.23/go.mod h1:AfG/PZRUkHJ9inETvbjNifTDgut25Wbkm2QoYBTbvyU=
841841
github.com/volcengine/volcengine-go-sdk v1.1.18 h1:tVcp1m6R8fgwZFb/MaltrpZY7b2+vYNbmO1MHlDSXIs=

‎provider/shim/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
github.com/hashicorp/terraform-plugin-framework v1.15.0
7-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24
7+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25
88
)
99

1010
require (

‎provider/shim/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
150150
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
151151
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
152152
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
153-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24 h1:Q8gtHIYllmTGYb2oypXPPmiroMTNiND1q3sGMfRXbyU=
154-
github.com/volcengine/terraform-provider-volcenginecc v0.0.24/go.mod h1:MiFbOqABmGHSDJnYfTyO03lCBqdozmL+paqUCrKHN9c=
153+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25 h1:x8/1OTaOOSq00Madbo1qEXx2FIYXGLcypOlbdzd7Q2U=
154+
github.com/volcengine/terraform-provider-volcenginecc v0.0.25/go.mod h1:MiFbOqABmGHSDJnYfTyO03lCBqdozmL+paqUCrKHN9c=
155155
github.com/volcengine/volc-sdk-golang v1.0.23 h1:anOslb2Qp6ywnsbyq9jqR0ljuO63kg9PY+4OehIk5R8=
156156
github.com/volcengine/volc-sdk-golang v1.0.23/go.mod h1:AfG/PZRUkHJ9inETvbjNifTDgut25Wbkm2QoYBTbvyU=
157157
github.com/volcengine/volcengine-go-sdk v1.1.18 h1:tVcp1m6R8fgwZFb/MaltrpZY7b2+vYNbmO1MHlDSXIs=

‎sdk/dotnet/Volcenginecc/Clb/Inputs/AclListenerArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class AclListenerArgs : global::Pulumi.ResourceArgs
3838
public Input<int>? Port { get; set; }
3939

4040
/// <summary>
41-
/// 监听器的协议。
41+
/// 监听器的协议。包括 TCP、UDP、HTTP、HTTPS。
4242
/// </summary>
4343
[Input("protocol")]
4444
public Input<string>? Protocol { get; set; }

‎sdk/dotnet/Volcenginecc/Clb/Inputs/AclListenerGetArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public sealed class AclListenerGetArgs : global::Pulumi.ResourceArgs
3838
public Input<int>? Port { get; set; }
3939

4040
/// <summary>
41-
/// 监听器的协议。
41+
/// 监听器的协议。包括 TCP、UDP、HTTP、HTTPS。
4242
/// </summary>
4343
[Input("protocol")]
4444
public Input<string>? Protocol { get; set; }

‎sdk/dotnet/Volcenginecc/Clb/Inputs/CertificateTagArgs.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ namespace Volcengine.Pulumi.Volcenginecc.Clb.Inputs
1313

1414
public sealed class CertificateTagArgs : global::Pulumi.ResourceArgs
1515
{
16+
/// <summary>
17+
/// 用户标签的标签键。
18+
/// </summary>
1619
[Input("key")]
1720
public Input<string>? Key { get; set; }
1821

22+
/// <summary>
23+
/// 用户标签的标签值。
24+
/// </summary>
1925
[Input("value")]
2026
public Input<string>? Value { get; set; }
2127

0 commit comments

Comments
 (0)